From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 7 Dec 2016 23:05:37 +0000 (+0000)
Subject: Meant to commit this to the merge branch for consideration; reverting r1773158
X-Git-Tag: 2.4.24~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac02a8f920d1412dc3d926c8f041e604966bd42a;p=thirdparty%2Fapache%2Fhttpd.git

Meant to commit this to the merge branch for consideration; reverting r1773158

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1773160 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index 9b2b107fc32..7bc292cb162 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -782,15 +782,18 @@ rrl_done:
             memcpy((char*)r->protocol, "HTTP", 4);
     }
     else if (r->protocol[0]) {
+        r->assbackwards = 0;
+        r->proto_num = HTTP_VERSION(1,0);
         /* Defer setting the r->protocol string till error msg is composed */
-        r->proto_num = HTTP_VERSION(0,9);
-        if (deferred_error == rrl_none)
+        if (strict && deferred_error == rrl_none)
             deferred_error = rrl_badprotocol;
+        else
+            r->protocol  = "HTTP/1.0";
     }
     else {
         r->assbackwards = 1;
+        r->protocol = "HTTP/0.9";
         r->proto_num = HTTP_VERSION(0, 9);
-        r->protocol  = apr_pstrdup(r->pool, "HTTP/0.9");
     }
 
     /* Determine the method_number and parse the uri prior to invoking error
@@ -903,7 +906,7 @@ rrl_failed:
         r->assbackwards = 0;
         r->connection->keepalive = AP_CONN_CLOSE;
         r->proto_num = HTTP_VERSION(1, 0);
-        r->protocol  = apr_pstrdup(r->pool, "HTTP/1.0");
+        r->protocol  = "HTTP/1.0";
     }
     return 0;
 }