Move the check of the Expect request header field after the hook

for ap_post_read_request, since that is the only opportunity for
modules to handle Expect extensions.

Obtained from: apache-1.3

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

diff --git a/CHANGES b/CHANGES
index 1589d8d3b6b0211488a159d2499441a31861d2c0..6e8aaf49329e12c2bf9ed5718ed62c9ce610e470 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Move the check of the Expect request header field after the hook
+     for ap_post_read_request, since that is the only opportunity for
+     modules to handle Expect extensions.  [Justin Erenkrantz]
+
   *) Rewrite of aaa modules to an authn/authz model.
      [Dirk-Willem van Gulik, Justin Erenkrantz]
 

diff --git a/server/protocol.c b/server/protocol.c
index baf8bded66ece9338ad221b9c89b95bf2b27abb0..b683f022115bf7c029101632a4e2fd6870a2bc5e 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1007,6 +1007,12 @@ request_rec *ap_read_request(conn_rec *conn)
         return r;
     }
 
+    if ((access_status = ap_run_post_read_request(r))) {
+        ap_die(access_status, r);
+        ap_run_log_transaction(r);
+        return NULL;
+    }
+
     if (((expect = apr_table_get(r->headers_in, "Expect")) != NULL)
         && (expect[0] != '\0')) {
         /*
@@ -1032,12 +1038,6 @@ request_rec *ap_read_request(conn_rec *conn)
     ap_add_input_filter_handle(ap_http_input_filter_handle,
                                NULL, r, r->connection);
 
-    if ((access_status = ap_run_post_read_request(r))) {
-        ap_die(access_status, r);
-        ap_run_log_transaction(r);
-        return NULL;
-    }
-
     return r;
 }