diff options
| author | Jeff Trawick <trawick@apache.org> | 2009-03-26 16:43:46 +0100 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2009-03-26 16:43:46 +0100 |
| commit | f2aefa329b7e3d1a7a651053acd3884ab1f63de7 (patch) | |
| tree | 9a08daf66df850bf0611bc983d6f1240a00cb3fe /server | |
| parent | prefork, worker, event: (diff) | |
| download | apache2-f2aefa329b7e3d1a7a651053acd3884ab1f63de7.tar.xz apache2-f2aefa329b7e3d1a7a651053acd3884ab1f63de7.zip | |
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758696 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/server/core.c b/server/core.c index 6d9bfad108..d363ee7f88 100644 --- a/server/core.c +++ b/server/core.c @@ -3860,7 +3860,6 @@ static int core_pre_connection(conn_rec *c, void *csd) 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 @@ static int core_pre_connection(conn_rec *c, void *csd) 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 |