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

[gnunet]

Author: grothoff
Date: 2014-05-28 15:48:57 +0200 (Wed, 28 May 2014)
New Revision: 33434

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/connection.c
Log:
second attempt to properly commit patch for #3392

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2014-05-28 13:13:46 UTC (rev 33433)
+++ libmicrohttpd/ChangeLog     2014-05-28 13:48:57 UTC (rev 33434)
@@ -1,3 +1,8 @@
+Wed May 28 15:30:56 CEST 2014
+       Properly applying patch that was supposed to be
+       committed on "May  2 20:22:45 CEST 2014" to address
+       infinite loop (DoS) when HTTP connection is reset (#3392). -GM
+
 Sun May 25 20:18:27 CEST 2014
        Fixed W32 build issues. -EG
        Releasing 0.9.36. -CG

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2014-05-28 13:13:46 UTC (rev 
33433)
+++ libmicrohttpd/src/microhttpd/connection.c   2014-05-28 13:48:57 UTC (rev 
33434)
@@ -1620,9 +1620,13 @@
   if (bytes_read < 0)
     {
       const int err = MHD_socket_errno_;
-      if ((EINTR == err) || (EAGAIN == err) || (ECONNRESET == err)
-          || (EWOULDBLOCK == err))
+      if ((EINTR == err) || (EAGAIN == err) || (EWOULDBLOCK == err))
          return MHD_NO;
+      if (ECONNRESET == err)
+        {
+           CONNECTION_CLOSE_ERROR(connection, NULL);
+          return MHD_NO;
+       }
 #if HAVE_MESSAGES
 #if HTTPS_SUPPORT
       if (0 != (connection->daemon->options & MHD_USE_SSL))