httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1773160 - /httpd/httpd/branches/2.4.x/server/protocol.c
Date Wed, 07 Dec 2016 23:05:37 GMT
Author: wrowe
Date: Wed Dec  7 23:05:37 2016
New Revision: 1773160

URL: http://svn.apache.org/viewvc?rev=1773160&view=rev
Log:
Meant to commit this to the merge branch for consideration; reverting r1773158

Modified:
    httpd/httpd/branches/2.4.x/server/protocol.c

Modified: httpd/httpd/branches/2.4.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/protocol.c?rev=1773160&r1=1773159&r2=1773160&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.4.x/server/protocol.c Wed Dec  7 23:05:37 2016
@@ -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;
 }



Mime
View raw message