svn commit: r219221 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c

[wr...@apache.org]

Author: wrowe
Date: Fri Jul 15 10:32:14 2005
New Revision: 219221

URL: http://svn.apache.org/viewcvs?rev=219221&view=rev
Log:

  leaving force-proxy-request-1.0 for broken clients, revert my
  patch for forcing an HTTP/1.0 proxy request, if the client 
  request is HTTP/1.0, per Roy.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=219221&r1=219220&r2=219221&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Fri Jul 15 10:32:14 2005
@@ -596,15 +596,13 @@
         p_conn->close++;
     }
 
-    if (apr_table_get(r->subprocess_env, "force-proxy-request-1.0")
-         || ((r->proto_num < HTTP_VERSION(1,1)) 
-             && !apr_table_get(r->subprocess_env, "force-proxy-request-1.1"))) {
+    if (apr_table_get(r->subprocess_env, "force-proxy-request-1.0")) {
         buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.0" CRLF, NULL);
         force10 = 1;
+        p_conn->close++;
     } else {
         buf = apr_pstrcat(p, r->method, " ", url, " HTTP/1.1" CRLF, NULL);
         force10 = 0;
-        p_conn->close++;
     }
     if (apr_table_get(r->subprocess_env, "proxy-nokeepalive")) {
         origin->keepalive = AP_CONN_CLOSE;