[GNUnet-SVN] r6133 - in libmicrohttpd: . src/daemon src/include

[gnunet]

Author: grothoff
Date: 2008-01-30 23:21:49 -0700 (Wed, 30 Jan 2008)
New Revision: 6133

Modified:
   libmicrohttpd/README
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/include/microhttpd.h
Log:
finished support for nested multiparts

Modified: libmicrohttpd/README
===================================================================
--- libmicrohttpd/README        2008-01-31 06:16:41 UTC (rev 6132)
+++ libmicrohttpd/README        2008-01-31 06:21:49 UTC (rev 6133)
@@ -50,14 +50,6 @@
 feature.
 
 
-For POST:
-=========
-- add support to decode multipart/form-data with 
-  nesting (used for files) -- #1221, TEST
-- http://en.wikipedia.org/wiki/HTTP_pipelining: 
-  "Only idempotent requests should be pipelined, such as GET and HEAD 
requests."
-  We should make sure that we force a close after POSTs, PUTs and DELETEs.
-
 For SSL:
 ========
 microhttpd.h:

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2008-01-31 06:16:41 UTC (rev 
6132)
+++ libmicrohttpd/src/daemon/connection.c       2008-01-31 06:21:49 UTC (rev 
6133)
@@ -1795,8 +1795,13 @@
           if (((MHD_YES == connection->read_closed) &&
                (0 == connection->read_buffer_offset)) ||
               (connection->version == NULL) ||
-              (0 != strcasecmp (MHD_HTTP_VERSION_1_1, connection->version)))
+             (connection->method == NULL) ||
+             ( (0 != strcasecmp (MHD_HTTP_METHOD_HEAD, connection->method)) &&
+               (0 != strcasecmp (MHD_HTTP_METHOD_GET, connection->method)) ) ||
+             (0 != strcasecmp (MHD_HTTP_VERSION_1_1, connection->version)))
             {
+             /* http 1.0, version-less or non-HEAD/GET requests cannot be
+                pipelined */
               connection->state = MHD_CONNECTION_CLOSED;
               MHD_pool_destroy (connection->pool);
               connection->pool = NULL;

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2008-01-31 06:16:41 UTC (rev 
6132)
+++ libmicrohttpd/src/include/microhttpd.h      2008-01-31 06:21:49 UTC (rev 
6133)
@@ -84,7 +84,7 @@
 /**
  * Current version of the library.
  */
-#define MHD_VERSION 0x00000201
+#define MHD_VERSION 0x00020100
 
 /**
  * MHD-internal return codes.