From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 7 Sep 2021 13:05:22 +0000 (+0000)
Subject: Revert r1893026, will re-commit with minimal changes to ease backport.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~825
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8dce10f62eacdca2daf3750223c17a91e3a3467;p=thirdparty%2Fapache%2Fhttpd.git

Revert r1893026, will re-commit with minimal changes to ease backport.


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

diff --git a/changes-entries/init_request_on_read_failure.txt b/changes-entries/init_request_on_read_failure.txt
deleted file mode 100644
index c59bf89460e..00000000000
--- a/changes-entries/init_request_on_read_failure.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) core: Initialize the request fields on read failure to avoid NULLs.
-     [Yann Ylavic]
\ No newline at end of file
diff --git a/server/protocol.c b/server/protocol.c
index 87056dcda39..276e4905281 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -716,13 +716,6 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb)
         if (rv != APR_SUCCESS) {
             r->request_time = apr_time_now();
 
-            /* Fall through with an invalid (non NULL) request */
-            r->method = "-";
-            r->method_number = M_INVALID;
-            r->uri = r->unparsed_uri = apr_pstrdup(r->pool, "-");
-            r->proto_num = HTTP_VERSION(1,0);
-            r->protocol  = "HTTP/1.0";
-
             /* ap_rgetline returns APR_ENOSPC if it fills up the
              * buffer before finding the end-of-line.  This is only going to
              * happen if it exceeds the configured limit for a request-line.
@@ -739,6 +732,8 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb)
             else if (APR_STATUS_IS_EINVAL(rv)) {
                 r->status = HTTP_BAD_REQUEST;
             }
+            r->proto_num = HTTP_VERSION(1,0);
+            r->protocol  = "HTTP/1.0";
             return 0;
         }
     } while ((len <= 0) && (--num_blank_lines >= 0));