[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1_rc1-4-g5da9ce5

[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  5da9ce59597ba62c4296f6d20ca7f816fe265594 (commit)
      from  258dd00b39e6303bf859062a8bcc5d0d45a99094 (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 5da9ce59597ba62c4296f6d20ca7f816fe265594
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue Nov 17 20:41:08 2009 +0100

    Handle properly the `HttpDataRead::readPostData' return code.

diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index b0df006..44465e8 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -955,7 +955,7 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, 
u_long, u_long,
           (dynamicCommand && dynamicCommand->acceptData ()))
         {
           int httpErrorCode;
-
+          int readPostRet;
           /* Be sure that the client can handle the 100 status code.  */
           if (nbtr == td->nHeaderChars && td->request.contentLength.compare 
("0")
               && td->request.ver.compare ("HTTP/1.0"))
@@ -969,13 +969,13 @@ int Http::controlConnection (ConnectionPtr a, char*, 
char*, u_long, u_long,
               return ClientsThread::INCOMPLETE_REQUEST;
             }
 
-          ret = HttpDataRead::readPostData (td, &httpErrorCode);
-          if (ret == -1)
+          readPostRet = HttpDataRead::readPostData (td, &httpErrorCode);
+          if (readPostRet < 0)
             {
               logHTTPaccess ();
               return ClientsThread::DELETE_CONNECTION;
             }
-          else if (ret)
+          else if (readPostRet)
             ret = raiseHTTPError (httpErrorCode);
         }
       else
@@ -984,7 +984,7 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, 
u_long, u_long,
           td->request.uriOptsPtr = 0;
         }
 
-      /* If return value is not configured propertly.  */
+      /* If return value is not configured properly.  */
       if (ret < 0)
         {
           /*

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

Summary of changes:
 myserver/src/protocol/http/http.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU MyServer