[GNUnet-SVN] r6253 - libmicrohttpd/src/daemon

[gnunet]

Author: grothoff
Date: 2008-02-11 20:58:08 -0700 (Mon, 11 Feb 2008)
New Revision: 6253

Modified:
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/daemon/postprocessor.c
Log:
fx

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2008-02-11 07:54:54 UTC (rev 
6252)
+++ libmicrohttpd/src/daemon/connection.c       2008-02-12 03:58:08 UTC (rev 
6253)
@@ -1830,7 +1830,8 @@
       break;
     }
   timeout = connection->daemon->connection_timeout;
-  if ((timeout != 0) && (time (NULL) - timeout > connection->last_activity))
+  if ( (connection->socket_fd != -1) &&
+       (timeout != 0) && (time (NULL) - timeout > connection->last_activity))
     {
       connection_close_error (connection);
       return MHD_NO;

Modified: libmicrohttpd/src/daemon/postprocessor.c
===================================================================
--- libmicrohttpd/src/daemon/postprocessor.c    2008-02-11 07:54:54 UTC (rev 
6252)
+++ libmicrohttpd/src/daemon/postprocessor.c    2008-02-12 03:58:08 UTC (rev 
6253)
@@ -281,6 +281,8 @@
           (blen * 2 + 2 > buffer_size) )
        return NULL;  /* (will be) out of memory or invalid boundary */
     }
+  else
+    blen = 0;
   ret = malloc (sizeof (struct MHD_PostProcessor) + buffer_size + 1);
   if (ret == NULL)
     return NULL;