Change the log messages for setsockopt(TCP_NODELAY) and

getsockname() failures to log the client IP address and to
change the log level to debug.

Reviewed by:	Roy Fielding, Jim Jagielski

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@98470 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index 0176c1ca1f6741c1db6737e01f0d0532db2a61ff..3da2d432dfdc63a5fcec1022368cdb3dcc891f78 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.28
 
+  *) Change the log messages for setsockopt(TCP_NODELAY) and
+     getsockname() failures to log the client IP address and to
+     change the log level to debug.  [Jeff Trawick]
+
   *) Correction to mod_negotation for Win32, OS2, Netware etc, where
      case insensitive requests such as the HEADER or README search
      from autoindex would fail to match HEADER.html (because the

diff --git a/src/main/http_main.c b/src/main/http_main.c
index 967ce941619ad8f354f73249c5758d6e30270d91..d841be9a1d4c463c68a8fe3102063f1b3f79567d 100644 (file)
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -3555,7 +3555,7 @@ static conn_rec *new_connection(pool *p, server_rec *server, BUFF *inout,
 }
 
 #if defined(TCP_NODELAY) && !defined(MPE) && !defined(TPF)
-static void sock_disable_nagle(int s)
+static void sock_disable_nagle(int s, struct sockaddr_in *sin_client)
 {
     /* The Nagle algorithm says that we should delay sending partial
      * packets in hopes of getting more data.  We don't want to do
@@ -3573,13 +3573,20 @@ static void sock_disable_nagle(int s)
 #ifdef NETWARE
         errno = WSAGetLastError();
 #endif
-       ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
-                   "setsockopt: (TCP_NODELAY)");
+        if (sin_client) {
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, server_conf,
+                         "setsockopt: (TCP_NODELAY), client %pA probably "
+                         "dropped the connection", &sin_client->sin_addr);
+        }
+        else {
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, server_conf,
+                         "setsockopt: (TCP_NODELAY)");
+        }
     }
 }
 
 #else
-#define sock_disable_nagle(s)  /* NOOP */
+#define sock_disable_nagle(s, c)       /* NOOP */
 #endif
 
 static int make_sock(pool *p, const struct sockaddr_in *server)
@@ -3663,7 +3670,7 @@ static int make_sock(pool *p, const struct sockaddr_in *server)
     }
 #endif
 
-    sock_disable_nagle(s);
+    sock_disable_nagle(s, NULL);
     sock_enable_linger(s);
 
     /*
@@ -4513,11 +4520,14 @@ static void child_main(int child_num_arg)
 
        clen = sizeof(sa_server);
        if (getsockname(csd, &sa_server, &clen) < 0) {
-           ap_log_error(APLOG_MARK, APLOG_ERR, server_conf, "getsockname");
+           ap_log_error(APLOG_MARK, APLOG_DEBUG, server_conf, 
+                         "getsockname, client %pA probably dropped the "
+                         "connection", 
+                         &((struct sockaddr_in *)&sa_client)->sin_addr);
            continue;
        }
 
-       sock_disable_nagle(csd);
+       sock_disable_nagle(csd, (struct sockaddr_in *)&sa_client);
 
        (void) ap_update_child_status(my_child_num, SERVER_BUSY_READ,
                                   (request_rec *) NULL);
@@ -5884,7 +5894,7 @@ static void child_sub_main(int child_num)
            memset(&sa_client, '\0', sizeof(sa_client));
        }
 
-       sock_disable_nagle(csd);
+       sock_disable_nagle(csd, (struct sockaddr_in *)&sa_client);
 
        (void) ap_update_child_status(child_num, SERVER_BUSY_READ,
                                   (request_rec *) NULL);