Revert r1733054: spurious commit of being-worked mod_reqtimeout changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733055 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index 2fd44ba5e3090abf5cc804654588f1a32b81a22b..206e621796eadd1ab9a7b2b33d565d0a5f90c00a 100644 (file)
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -352,15 +352,6 @@ out:
     return rv;
 }
 
-static apr_status_t reqtimeout_pause(ap_filter_t *f, apr_bucket_brigade *bb)
-{
-    if (!APR_BRIGADE_EMPTY(bb) && AP_BUCKET_IS_EOR(APR_BRIGADE_LAST(bb))) {
-        reqtimeout_con_cfg *ccfg = f->ctx;
-        ccfg->timeout_at = 0;
-    }
-    return ap_pass_brigade(f->next, bb);
-}
-
 static int reqtimeout_init(conn_rec *c)
 {
     reqtimeout_con_cfg *ccfg;
@@ -378,7 +369,6 @@ static int reqtimeout_init(conn_rec *c)
     if (ccfg == NULL) {
         ccfg = apr_pcalloc(c->pool, sizeof(reqtimeout_con_cfg));
         ap_set_module_config(c->conn_config, &reqtimeout_module, ccfg);
-        ap_add_output_filter(reqtimeout_filter_name, ccfg, NULL, c);
         ap_add_input_filter(reqtimeout_filter_name, ccfg, NULL, c);
     }
 
@@ -616,14 +606,6 @@ static void reqtimeout_hooks(apr_pool_t *pool)
     ap_register_input_filter(reqtimeout_filter_name, reqtimeout_filter, NULL,
                              AP_FTYPE_CONNECTION + 8);
 
-    /*
-     * We need to pause timeout detection in between requests, for
-     * speculative and non-blocking reads, so between each outgoing EOR
-     * and the next pre_read_request call.
-     */
-    ap_register_output_filter(reqtimeout_filter_name, reqtimeout_pause, NULL,
-                              AP_FTYPE_CONNECTION);
-
     /*
      * mod_reqtimeout needs to be called before ap_process_http_request (which
      * is run at APR_HOOK_REALLY_LAST) but after all other protocol modules.

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 6af2457cbdd4cf052642686fa54c115d22179fad..c9eac3fdade63072350ec59a9cae21a5ea469ff2 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -349,11 +349,6 @@ PROXY_WORKER_HC_FAIL )
 #define PROXY_BALANCER_MAX_HOSTNAME_SIZE 64
 #define PROXY_BALANCER_MAX_STICKY_SIZE   64
 
-/* RFC-1035 mentions limits of 255 for host-names and 253 for domain-names,
- * dotted together(?) this would fit the below size (+ trailing NUL).
- */
-#define PROXY_WORKER_RFC1035_NAME_SIZE   512
-
 #define PROXY_MAX_PROVIDER_NAME_SIZE     16
 
 #define PROXY_STRNCPY(dst, src) ap_proxy_strncpy((dst), (src), (sizeof(dst)))

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 30d8785a3200254c9aab09e507303102814b9b4c..add981f4a6bc09db5887b381e907b4fb4b28b360 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2721,7 +2721,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
              * restore any ssl_hostname for this connection set earlier by
              * ap_proxy_determine_connection().
              */
-            char ssl_hostname[PROXY_WORKER_RFC1035_NAME_SIZE];
+            char ssl_hostname[512]; /* host+domain names max (rfc1035-2.3.4) */
             if (!conn->ssl_hostname || PROXY_STRNCPY(ssl_hostname,
                                                      conn->ssl_hostname)) {
                 ssl_hostname[0] = '\0';