From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 29 May 2008 22:23:19 +0000 (+0000)
Subject: * Do this later as we might leave the function anyway without the need for this.
X-Git-Tag: 2.3.0~562
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0269d681d9fbd7931566ce927707b28ec475c98;p=apache

* Do this later as we might leave the function anyway without the need for this.


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

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 86c082fbe6..8e7e40b219 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -690,8 +690,6 @@ int ap_proxy_http_request(apr_pool_t *p, request_rec *r,
      */
 
     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;
         /*
          * According to RFC 2616 8.2.3 we are not allowed to forward an
          * Expect: 100-continue to an HTTP/1.0 server. Instead we MUST return
@@ -700,6 +698,8 @@ int ap_proxy_http_request(apr_pool_t *p, request_rec *r,
         if (r->expecting_100) {
             return HTTP_EXPECTATION_FAILED;
         }
+        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);