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

[gnunet]

Author: grothoff
Date: 2009-03-02 17:13:22 -0700 (Mon, 02 Mar 2009)
New Revision: 8310

Modified:
   libmicrohttpd/configure.ac
   libmicrohttpd/src/daemon/connection.c
Log:
fixing cork 1463

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2009-03-02 07:01:07 UTC (rev 8309)
+++ libmicrohttpd/configure.ac  2009-03-03 00:13:22 UTC (rev 8310)
@@ -173,7 +173,7 @@
 AC_MSG_RESULT($have_inet6)
 
 # TCP_CORK
-AC_CHECK_DECL([TCP_CORK], [], [], [[#include <netinet/tcp.h>]])
+AC_CHECK_DECLS([TCP_CORK], [], [], [[#include <netinet/tcp.h>]])
 
 # libcurl (required for testing)
 SAVE_LIBS=$LIBS

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2009-03-02 07:01:07 UTC (rev 
8309)
+++ libmicrohttpd/src/daemon/connection.c       2009-03-03 00:13:22 UTC (rev 
8310)
@@ -31,6 +31,11 @@
 #include "response.h"
 #include "reason_phrase.h"
 
+#if HAVE_NETINET_TCP_H
+/* for TCP_CORK */
+#include <netinet/tcp.h>
+#endif
+
 /**
  * Message to transmit when http 1.1 request is received
  */
@@ -1961,7 +1966,7 @@
             }
           connection->state = MHD_CONNECTION_HEADERS_SENDING;
 
-#if HAVE_TCP_CORK
+#if HAVE_DECL_TCP_CORK
           /* starting header send, set TCP cork */
           {
             const int val = 1;
@@ -2024,7 +2029,7 @@
           /* no default action */
           break;
         case MHD_CONNECTION_FOOTERS_SENT:
-#if HAVE_TCP_CORK
+#if HAVE_DECL_TCP_CORK
           /* done sending, uncork */
           {
             const int val = 0;