Call ap_discard_request_body from ap_finalize_request. Remove the call

from all other modules that do not use it to determine the response for
the request.

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

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index b93e4b82ba1c5787aed15274182d80272a25e4fa..5fcb0a4f78e2e2f396dac2626b1222a6174fa914 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -354,9 +354,6 @@ static int dav_error_response(request_rec *r, int status, const char *body)
 
     ap_set_content_type(r, "text/html");
 
-    /* since we're returning DONE, ensure the request body is consumed. */
-    (void) ap_discard_request_body(r);
-
     /* begin the response now... */
     ap_rvputs(r,
               DAV_RESPONSE_BODY_1,
@@ -391,9 +388,6 @@ static int dav_error_response_tag(request_rec *r,
 
     ap_set_content_type(r, DAV_XML_CONTENT_TYPE);
 
-    /* since we're returning DONE, ensure the request body is consumed. */
-    (void) ap_discard_request_body(r);
-
     ap_rputs(DAV_XML_HEADER DEBUG_CR
              "<D:error xmlns:D=\"DAV:\"", r);
 
@@ -595,9 +589,6 @@ static int dav_handle_err(request_rec *r, dav_error *err,
         return err->status;
     }
 
-    /* since we're returning DONE, ensure the request body is consumed. */
-    (void) ap_discard_request_body(r);
-
     /* send the multistatus and tell Apache the request/response is DONE. */
     dav_send_multistatus(r, err->status, response, NULL);
     return DONE;

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index c29a32033fb0bbf44d99c1f541b98a60f3be6fff..fff8c0ac6190d545921fdeb8c2626c1160e7e57a 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -145,17 +145,6 @@ AP_DECLARE(void) ap_die(int type, request_rec *r)
     if (ap_status_drops_connection(r->status)) {
         r->connection->keepalive = 0;
     }
-    else if ((r->status != HTTP_NOT_MODIFIED) &&
-             (r->status != HTTP_NO_CONTENT) &&
-             r->connection && (r->connection->keepalive != -1)) {
-        /* If the discard returns AP_FILTER_ERROR, it means that we went
-         * recursive on ourselves and we should abort.
-         */
-        int errstatus = ap_discard_request_body(r);
-        if (errstatus == AP_FILTER_ERROR) {
-            return;
-        }
-    }
 
     /*
      * Two types of custom redirects --- plain text, and URLs. Plain text has

diff --git a/server/protocol.c b/server/protocol.c
index 9a80a617fc8e27aec6d75ceef5812c934c0df7a2..dbe602015830fc1c813e8bc82795e3b268ac0df5 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -969,7 +969,6 @@ request_rec *ap_read_request(conn_rec *conn)
                           "client sent an unrecognized expectation value of "
                           "Expect: %s", expect);
             ap_send_error_response(r, 0);
-            (void) ap_discard_request_body(r);
             ap_run_log_transaction(r);
             return r;
         }
@@ -1044,6 +1043,8 @@ void ap_finalize_sub_req_protocol(request_rec *sub)
  */
 AP_DECLARE(void) ap_finalize_request_protocol(request_rec *r)
 {
+    (void) ap_discard_request_body(r);
+
     while (r->next) {
         r = r->next;
     }