Commit 1a82ad81 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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.


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

modules/proxy/mod_proxy_http.c

+2 −4
Changes for modules/proxy/mod_proxy_http.c: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -596,15 +596,13 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r, 
        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;