* Fix PR38123 by adding the HTTP_IN filter also in the case of an invalid

  expect header.

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

diff --git a/CHANGES b/CHANGES
index 9db006ff264d6bf2475f683148f62f829f4d0832..a8faf7e95f40e70fe129b87b0038a12122cbc6fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) core: Reject invalid Expect header immediately. PR 38123.
+     [Ruediger Pluem]
+
   *) Authz: Add the new module mod_authn_core that will provide common
      authn directives such as 'AuthType', 'AuthName'.  Move the directives
      'AuthType' and 'AuthName' out of the core module and merge mod_authz_alias 

diff --git a/server/protocol.c b/server/protocol.c
index 27aa975561cf47b82ef9d9c81bf508b9554a9590..9934f0a66d5e88e875f1f1c3aad4ce2fe94b13f3 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -934,6 +934,8 @@ static request_rec *request_post_read(request_rec *r, conn_rec *conn)
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
                           "client sent an unrecognized expectation value of "
                           "Expect: %s", expect);
+            ap_add_input_filter_handle(ap_http_input_filter_handle,
+                                       NULL, r, r->connection);
             ap_send_error_response(r, 0);
             ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
             ap_run_log_transaction(r);