Stops the forced downgrade of the connection to HTTP/1.0 for proxy requests.

Submitted by:	Graham Leggett
Reviewed by:	Chuck Murcko

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

diff --git a/CHANGES b/CHANGES
index 123f6e02d369a99593050838c176be1e9a8a4440..bbd58e8e3c11203d143e9a8e27f68d86d56fc367 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.15-dev
+
+  *) Stop the forced downgrade of the connection to HTTP/1.0 for
+     proxy requests.  [Graham Leggett]
+
   *) Avoid using sscanf to determine the HTTP protocol number in
      the common case because sscanf is a performance hog. From
      Mike Abbot's Accelerating Apache patch number 6.

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 8abd5ca82aae52e8259431564660e515df38cc29..2eee5314efa5fc9b8c37e4404686381e0c3e0ee3 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -770,12 +770,10 @@ static void basic_http_header_check(request_rec *r,
     if (!r->status_line)
         r->status_line = status_lines[ap_index_of_response(r->status)];
 
-    /* mod_proxy is only HTTP/1.0, so avoid sending HTTP/1.1 error response;
-     * kluge around broken browsers when indicated by force-response-1.0
+    /* kluge around broken browsers when indicated by force-response-1.0
      */
-    if (r->proxyreq
-        || (r->proto_num == HTTP_VERSION(1,0)
-            && apr_table_get(r->subprocess_env, "force-response-1.0"))) {
+    if (r->proto_num == HTTP_VERSION(1,0)
+            && apr_table_get(r->subprocess_env, "force-response-1.0")) {
 
         *protocol = "HTTP/1.0";
         r->connection->keepalive = -1;