View Issue Details

IDProjectCategoryView StatusLast Update
0001463libmicrohttpdperformancepublic2009-08-25 06:19
ReporterMatthew Moore Assigned ToChristian Grothoff  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version0.4.0a 
Summary0001463: TCP_CORK functionality not working because its autoconf is broken
DescriptionThe choice of AC macro and preprocessor define used in testing for TCP_CORK functionality is broken, leading to it never actually being compiled in to libmicro.
Additional InformationI may have gotten this wrong in my initial patch. Sigh.

A patch is attached.
TagsNo tags attached.
Attached Files
cork.patch (1,486 bytes)   
diff -u -r ./libmicrohttpd-0.4.0a-orig/configure.ac ./libmicrohttpd-0.4.0a/configure.ac
--- ./libmicrohttpd-0.4.0a-orig/configure.ac	2009-02-20 09:35:33.000000000 -0800
+++ ./libmicrohttpd-0.4.0a/configure.ac	2009-03-02 12:05:24.000000000 -0800
@@ -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
diff -u -r ./libmicrohttpd-0.4.0a-orig/src/daemon/connection.c ./libmicrohttpd-0.4.0a/src/daemon/connection.c
--- ./libmicrohttpd-0.4.0a-orig/src/daemon/connection.c	2009-02-16 20:11:59.000000000 -0800
+++ ./libmicrohttpd-0.4.0a/src/daemon/connection.c	2009-03-02 12:07:49.000000000 -0800
@@ -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;
cork.patch (1,486 bytes)   

Activities

Christian Grothoff

2009-03-02 17:13

manager   ~0003831

Fixed in SVN 8310.

Issue History

Date Modified Username Field Change
2009-03-02 13:52 Matthew Moore New Issue
2009-03-02 13:52 Matthew Moore File Added: cork.patch
2009-03-02 17:11 Christian Grothoff Status new => assigned
2009-03-02 17:11 Christian Grothoff Assigned To => Christian Grothoff
2009-03-02 17:13 Christian Grothoff Status assigned => resolved
2009-03-02 17:13 Christian Grothoff Resolution open => fixed
2009-03-02 17:13 Christian Grothoff Note Added: 0003831
2009-08-25 06:19 Christian Grothoff Status resolved => closed