From 88a3f6c24d92f0a5df2cc38741877a5e4f8e2185 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Tue, 3 Dec 2002 08:38:45 +0000 Subject: [PATCH] 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 --- CHANGES | 4 ++++ server/protocol.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 1589d8d3b6..6e8aaf4932 100644 --- 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 baf8bded66..b683f02211 100644 --- 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; } -- 2.40.0