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

[gnunet]

Author: grothoff
Date: 2007-09-09 13:29:04 -0600 (Sun, 09 Sep 2007)
New Revision: 5626

Modified:
   libmicrohttpd/README
   libmicrohttpd/src/daemon/daemon.c
Log:
fix

Modified: libmicrohttpd/README
===================================================================
--- libmicrohttpd/README        2007-09-09 19:14:50 UTC (rev 5625)
+++ libmicrohttpd/README        2007-09-09 19:29:04 UTC (rev 5626)
@@ -18,7 +18,8 @@
 
 For POST:
 =========
-- add support to decode multipart/form-data (#1221, TEST)
+- add support to decode multipart/form-data with 
+  nesting (used for files) -- #1221, TEST
 
 For SSL:
 ========

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2007-09-09 19:14:50 UTC (rev 5625)
+++ libmicrohttpd/src/daemon/daemon.c   2007-09-09 19:29:04 UTC (rev 5626)
@@ -139,13 +139,12 @@
   struct MHD_Connection *pos;
   int fd;
 
-  fd = daemon->socket_fd;
   if ((daemon == NULL) ||
       (read_fd_set == NULL) ||
       (write_fd_set == NULL) ||
       (except_fd_set == NULL) ||
       (max_fd == NULL) ||
-      (fd == -1) ||
+      (-1 == (fd = daemon->socket_fd)) ||
       (daemon->shutdown == MHD_YES) ||
       ((daemon->options & MHD_USE_THREAD_PER_CONNECTION) != 0))
     return MHD_NO;