proxy_util: NULL terminate the right buffer in 'send_http_connect'

trunk patch: http://svn.apache.org/r1490994
Submitted by: jailletc36
Reviewed by: covener, minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491466 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index b4352fc8e9510ad27090cd36bbf5f1530f0fb792..90e016f8c6849adcce8e2e74e3c349a4d227f067 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.5
 
+  *) proxy_util: NULL terminate the right buffer in 'send_http_connect'.
+     [Christophe Jaillet]
+
   *) mod_remoteip: close file in error path. [Christophe Jaillet]
 
   *) mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)

diff --git a/STATUS b/STATUS
index fea2ee1dd9be8aecdaafde6e5d542ea2fd74b20f..01aa549a60ee842aa2d51f0196a7ac5dd3e18f7b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -100,11 +100,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works modulo CHANGES and mmn bump
       +1: minfrin, jim, sf
 
-    * proxy_util: NULL terminate the right buffer in 'send_http_connect'
-      trunk patch: http://svn.apache.org/r1490994
-      2.4.x patch: trunk patch works
-      +1: jailletc36, covener, minfrin
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 5ab5d9144a557be3d875729b5fb4431c3ca2539f..4f0a9a432eb54819c694895016ced846166f2c50 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2316,7 +2316,7 @@ static apr_status_t send_http_connect(proxy_conn_rec *backend,
         nbytes = sizeof(drain_buffer) - 1;
         while (status == APR_SUCCESS && nbytes) {
             status = apr_socket_recv(backend->sock, drain_buffer, &nbytes);
-            buffer[nbytes] = '\0';
+            drain_buffer[nbytes] = '\0';
             nbytes = sizeof(drain_buffer) - 1;
             if (strstr(drain_buffer, "\r\n\r\n") != NULL) {
                 break;