svn commit: r758696 - /httpd/httpd/trunk/server/core.c

[tr...@apache.org]

Author: trawick
Date: Thu Mar 26 15:43:46 2009
New Revision: 758696

URL: http://svn.apache.org/viewvc?rev=758696&view=rev
Log:
restore disable-nagle logic for connected sockets

Note: Prior to the MPM-as-DSO churn, the following MPMs did not enable this logic:

  WinNT       APR supports no-oping the setsockopt() based on inheriting Nagle from the 
              listening socket on this platform, so the new APR call will be a no-op.
  simple      same as WinNT for at least some Unix-y platforms
  BeOS        shrug


Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=758696&r1=758695&r2=758696&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Thu Mar 26 15:43:46 2009
@@ -3860,7 +3860,6 @@
     core_net_rec *net = apr_palloc(c->pool, sizeof(*net));
     apr_status_t rv;
 
-#ifdef AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
     /* The Nagle algorithm says that we should delay sending partial
      * packets in hopes of getting more data.  We don't want to do
      * this; we are not telnet.  There are bad interactions between
@@ -3876,7 +3875,6 @@
         ap_log_cerror(APLOG_MARK, APLOG_DEBUG, rv, c,
                       "apr_socket_opt_set(APR_TCP_NODELAY)");
     }
-#endif
 
     /* The core filter requires the timeout mode to be set, which
      * incidentally sets the socket to be nonblocking.  If this