[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-275-g7a0cb3b

[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  7a0cb3b6917dbd92bb16b9bda3e92c5395937f07 (commit)
      from  4465064d83e08af1358e15a3679a125bc4ea99c6 (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 7a0cb3b6917dbd92bb16b9bda3e92c5395937f07
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Aug 5 17:03:51 2010 +0200

    Detect the CGI header correctly.

diff --git a/myserver/src/http_handler/cgi/cgi.cpp 
b/myserver/src/http_handler/cgi/cgi.cpp
index 5695687..9c1de7a 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -381,6 +381,7 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe 
&stdOutFile, FiltersChain &chai
   /* Parse initial chunks of data looking for the HTTP header.  */
   while (!headerCompleted && !nph)
     {
+      u_long headerChecked = 4;
       u_long timeout = td->http->getTimeout ();
       u_long ticks = getTicks () - procStartTime;
       bool term;
@@ -425,8 +426,7 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe 
&stdOutFile, FiltersChain &chai
           return 1;
         }
 
-      for (u_long i = std::max (0UL, (headerOffset - nBytesRead - 10));
-           i < headerOffset; i++)
+      for (u_long i = headerChecked; i < headerOffset; i++)
         {
           char *buff = td->auxiliaryBuffer->getBuffer ();
           if ((buff[i] == '\r') && (buff[i+1] == '\n')
@@ -443,6 +443,8 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe 
&stdOutFile, FiltersChain &chai
               break;
             }
         }
+
+      headerChecked = std::max (4UL, headerOffset);
     }
 
   /* Send the header.  */

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

Summary of changes:
 myserver/src/http_handler/cgi/cgi.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU MyServer