[GNUnet-SVN] r36639 - in libmicrohttpd: . src/microhttpd

[gnunet]

Author: grothoff
Date: 2015-11-03 23:42:06 +0100 (Tue, 03 Nov 2015)
New Revision: 36639

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/connection.c
Log:
-add patch from Eugenio Perez

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-11-03 22:37:47 UTC (rev 36638)
+++ libmicrohttpd/ChangeLog     2015-11-03 22:42:06 UTC (rev 36639)
@@ -1,7 +1,9 @@
 Tue Nov  3 23:24:52 CET 2015
        Undoing change from Sun Oct 25 15:29:23 CET 2015
        as the original code was counter-intuitive but
-       correct, and the new code does break pipelining. -CG
+       correct, and the new code does break pipelining.
+       Ignore empty lines at the beginning of an HTTP
+       request (more tolerant implementation). -CG
        Releasing libmicrohttpd 0.9.45. -CG
 
 Sat Oct 31 15:52:52 CET 2015

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2015-11-03 22:37:47 UTC (rev 
36638)
+++ libmicrohttpd/src/microhttpd/connection.c   2015-11-03 22:42:06 UTC (rev 
36639)
@@ -2227,7 +2227,11 @@
         {
         case MHD_CONNECTION_INIT:
           line = get_next_header_line (connection);
-          if (NULL == line)
+          /* Check for empty string, as we might want
+             to tolerate 'spurious' empty lines; also
+             NULL means we didn't get a full line yet. */
+          if ( (NULL == line) ||
+               (0 == strlen (line) ) )
             {
               if (MHD_CONNECTION_INIT != connection->state)
                 continue;