httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r595075 - /httpd/sandbox/amsterdam/d/server/protocol.c
Date Wed, 14 Nov 2007 21:39:50 GMT
Author: pquerna
Date: Wed Nov 14 13:39:47 2007
New Revision: 595075

URL: http://svn.apache.org/viewvc?rev=595075&view=rev
Log:
disable per-vhost keepalive stuff that never worked in the event mpm, and doens't work at
all with serf anymore.

Modified:
    httpd/sandbox/amsterdam/d/server/protocol.c

Modified: httpd/sandbox/amsterdam/d/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/server/protocol.c?rev=595075&r1=595074&r2=595075&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/server/protocol.c (original)
+++ httpd/sandbox/amsterdam/d/server/protocol.c Wed Nov 14 13:39:47 2007
@@ -840,7 +840,9 @@
     const char *expect;
     int access_status;
     apr_bucket_brigade *tmp_bb;
+#if FIXME_SERF_KEEPALIVE_TIMEOUT
     apr_socket_t *csd;
+#endif
     apr_interval_time_t cur_timeout;
 
     apr_pool_create(&p, conn->pool);
@@ -902,6 +904,7 @@
         return NULL;
     }
 
+#if FIXME_SERF_KEEPALIVE_TIMEOUT
     /* We may have been in keep_alive_timeout mode, so toggle back
      * to the normal timeout mode as we fetch the header lines,
      * as necessary.
@@ -912,6 +915,7 @@
         apr_socket_timeout_set(csd, conn->base_server->timeout);
         cur_timeout = conn->base_server->timeout;
     }
+#endif
 
     if (!r->assbackwards) {
         ap_get_mime_headers_core(r, tmp_bb);
@@ -963,6 +967,7 @@
      */
     ap_update_vhost_from_headers(r);
 
+#if FIXME_SERF_KEEPALIVE_TIMEOUT
     /* Toggle to the Host:-based vhost's timeout mode to fetch the
      * request body and send the response body, if needed.
      */
@@ -970,6 +975,7 @@
         apr_socket_timeout_set(csd, r->server->timeout);
         cur_timeout = r->server->timeout;
     }
+#endif
 
     /* we may have switched to another server */
     r->per_dir_config = r->server->lookup_defaults;



Mime
View raw message