From: Stefan Eissing <icing@apache.org>
Date: Wed, 16 Mar 2016 13:00:37 +0000 (+0000)
Subject: reverting r1735176
X-Git-Tag: 2.5.0-alpha~1888
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4cf57c511776dd4baff17de6723cd0b3f78d6c2;p=apache

reverting r1735176

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

diff --git a/CHANGES b/CHANGES
index b2394beab7..71f00dce7d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_http: Make sure HTTP filters are added on HTTP requests only.
-     [Graham Leggett]
-     
   *) mod_rewrite: Don't implicitly URL-escape the original query string
      when no substitution has changed it (like PR50447 but server context)
      [Evgeny Kotkov <evgeny.kotkov visualsvn.com>]
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 429ed473fb..90ae92b6f2 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -34,8 +34,6 @@
 
 #include "mod_core.h"
 
-module AP_MODULE_DECLARE_DATA http_module;
-
 /* Handles for core filters */
 AP_DECLARE_DATA ap_filter_rec_t *ap_http_input_filter_handle;
 AP_DECLARE_DATA ap_filter_rec_t *ap_http_header_filter_handle;
@@ -50,10 +48,6 @@ AP_DECLARE_DATA const char *ap_multipart_boundary;
  */
 static int async_mpm = 0;
 
-typedef struct {
-    int is_http;
-} http_conn_conf;
-
 static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy,
                                           const char *arg)
 {
@@ -248,29 +242,9 @@ static int ap_process_http_sync_connection(conn_rec *c)
     return OK;
 }
 
-static int http_pre_connection(conn_rec *c, void *csd)
-{
-    const char *protocol = ap_get_protocol(c);
-
-    http_conn_conf *cconf = apr_pcalloc(c->pool, sizeof(*cconf));
-
-    if (!strcmp(AP_PROTOCOL_HTTP1, protocol)) {
-        cconf->is_http = 1;
-    }
-
-    ap_set_module_config(c->conn_config, &http_module, cconf);
-
-    return OK;
-}
-
 static int ap_process_http_connection(conn_rec *c)
 {
-    http_conn_conf *cconf = ap_get_module_config(c->conn_config, &http_module);
-
-    if (!cconf || !cconf->is_http) {
-        return DECLINED;
-    }
-    else if (async_mpm && !c->clogging_input_filters) {
+    if (async_mpm && !c->clogging_input_filters) {
         return ap_process_http_async_connection(c);
     }
     else {
@@ -280,6 +254,7 @@ static int ap_process_http_connection(conn_rec *c)
 
 static int http_create_request(request_rec *r)
 {
+    /* FIXME: we must only add these filters if we are an HTTP request */
     if (!r->main && !r->prev) {
         ap_add_output_filter_handle(ap_byterange_filter_handle,
                                     NULL, r, r->connection);
@@ -320,8 +295,6 @@ static int http_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
 static void register_hooks(apr_pool_t *p)
 {
     ap_hook_post_config(http_post_config, NULL, NULL, APR_HOOK_MIDDLE);
-    ap_hook_pre_connection(http_pre_connection, NULL, NULL,
-            APR_HOOK_REALLY_LAST);
     ap_hook_process_connection(ap_process_http_connection, NULL, NULL,
                                APR_HOOK_REALLY_LAST);
     ap_hook_map_to_storage(ap_send_http_trace,NULL,NULL,APR_HOOK_MIDDLE);