[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1_rc1-3-g258dd00

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  258dd00b39e6303bf859062a8bcc5d0d45a99094 (commit)
       via  4715f76587635d2d3aae61014c9d9a753c3c5768 (commit)
      from  5ac1fa5ac8e7155df31ad8fdb5d3e2288e317a52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 258dd00b39e6303bf859062a8bcc5d0d45a99094
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue Nov 17 20:23:39 2009 +0100

    Http header parser avoids to copy more bytes than needed.

diff --git a/myserver/src/protocol/http/http_headers.cpp 
b/myserver/src/protocol/http/http_headers.cpp
index d5e5dac..642e595 100644
--- a/myserver/src/protocol/http/http_headers.cpp
+++ b/myserver/src/protocol/http/http_headers.cpp
@@ -523,14 +523,14 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char 
*input,
            * If the version is not specified or it is too long store
            * some information for logging then return an invalid header value.
            */
-          if ((!j) || ( (i-j) == HTTP_REQUEST_VER_DIM ))
+          if (!j || ((i-j) == HTTP_REQUEST_VER_DIM))
             {
               request->ver.clear ();
               request->cmd.clear ();
               tokenOff = getEndLine (input, HTTP_REQUEST_URI_DIM);
               if (tokenOff > 0)
-                request->uri.assign (input,
-                                     min (HTTP_REQUEST_URI_DIM, tokenOff));
+                request->uri.assign (input, min (HTTP_REQUEST_URI_DIM,
+                                                 tokenOff));
               else
                 request->uri.assign (input, HTTP_REQUEST_URI_DIM );
               return 400;
@@ -547,14 +547,14 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char 
*input,
           request->uri=trimRight (request->uri, " /");
           request->uriOpts=trim (request->uriOpts, " ");
         }
-      else if (!strcmpi (command,"Authorization"))
+      else if (!strcmpi (command, "Authorization"))
         {
           int ret = readReqAuthLine (request, connection, token, &tokenOff);
           if (ret)
             return ret;
           lineControlled = 1;
         }
-      else if (!strcmpi (command, (char*)"Content-length"))
+      else if (!strcmpi (command, "Content-length"))
         {
           tokenOff = getEndLine (token, HTTP_REQUEST_CONTENT_LENGTH_DIM);
           if (tokenOff == -1)
@@ -562,7 +562,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char 
*input,
           lineControlled = 1;
           request->contentLength.assign (token,tokenOff);
         }
-      else if (!strcmpi (command, (char*)"Range"))
+      else if (!strcmpi (command, "Range"))
         {
           int ret = readReqRangeLine (request, connection, token, &tokenOff);
           if (ret)
@@ -588,13 +588,11 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char 
*input,
           else
             {
               HttpRequestHeader::Entry *e = new HttpRequestHeader::Entry ();
-              if (e)
-                {
-                  e->name->assign (command, HTTP_RESPONSE_OTHER_DIM);
-                  e->value->assign (token,
-                               std::min (HTTP_RESPONSE_OTHER_DIM, tokenOff));
-                  request->other.put (cmdStr, e);
-                }
+              e->name->assign (command, std::min (HTTP_RESPONSE_OTHER_DIM,
+                                                  tokenOff));
+              e->value->assign (token, std::min (HTTP_RESPONSE_OTHER_DIM,
+                                                 tokenOff));
+              request->other.put (cmdStr, e);
             }
         }
       token += tokenOff + 2;



commit 4715f76587635d2d3aae61014c9d9a753c3c5768
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue Nov 17 20:11:54 2009 +0100

    Under Windows configuration files can be only in the current directory.

diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index d044359..e9b138f 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -264,6 +264,7 @@ int loadConfFileLocation (string &outFile, string fileName, 
const char *dir)
 
 #ifdef WIN32
       outFile = fileName;
+      return FilesUtility::fileExists (fileName) ? 0 : -1;
 #else
 
       if (dir)

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/myserver.cpp                   |    1 +
 myserver/src/protocol/http/http_headers.cpp |   24 +++++++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU MyServer