Fix mod_proxy seg fault when the proxied server returns

an HTTP/0.9 response or a bogus status line.

Submitted by: Adam Sussman
Reviewed by:	Bill Stoddard

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

diff --git a/CHANGES b/CHANGES
index 455ed943b0f2da9cf535b5f6be0d1798464c992a..8ac6dc3fcce17dd03b4ca770e4c1866d55a92db5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.30-dev
+  *) Fix mod_proxy seg fault when the proxied server returns 
+     an HTTP/0.9 response or a bogus status line.
+     [Adam Sussman]
+
   *) Prevent mod_proxy from truncating one character off the
      end of the status line returned from the proxied server.
      [Adam Sussman, Bill Stoddard]

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index e45021c9b24425b1fea78c7c016e63ec4d3fa1e5..81fd0a510a2979e7013ae89b4c8f9f6f397040f4 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -801,7 +801,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
         /* Is it an HTTP/0.9 response? If so, send the extra data */
         if (backasswards) {
             apr_ssize_t cntr = len;
-            e = apr_bucket_heap_create(buffer, cntr, 0);
+            e = apr_bucket_heap_create(buffer, cntr, 1);
             APR_BRIGADE_INSERT_TAIL(bb, e);
         }