From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 27 Jun 2016 08:08:26 +0000 (+0000)
Subject: mod_proxy: follow up to r1750301.
X-Git-Tag: 2.5.0-alpha~1469
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d353c8bfed89507460f10b6c515c3a5b14ed323b;p=thirdparty%2Fapache%2Fhttpd.git

mod_proxy: follow up to r1750301.
s/is_socket_connected/get_socket_connected/ in the !USE_ALTERNATE_IS_CONNECTED
case, and add CHANGE + MMN entries.

[Reverted by r1750376]


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

diff --git a/CHANGES b/CHANGES
index 229e85f6518..07a9feb6fd9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_proxy: don't reuse backend connections with data available before the
+     request is sent.  PR 57832.  [Yann Ylavic]
+
   *) mod_sed: Fix 'x' command processing. [Christophe Jaillet]
 
   *) core: Drop an invalid Last-Modified header value coming
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index c4c4188b01d..230bdebf251 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -532,6 +532,7 @@
  *                         dav_success_proppatch.
  * 20160608.4 (2.5.0-dev)  Add dav_acl_provider, dav_acl_provider_register
  *                         dav_get_acl_providers.
+ * 20160608.5 (2.5.0-dev)  Add tmp_bb to proxy_conn_rec.
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -539,7 +540,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20160608
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 4                 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 5                 /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 908c1d6e721..cfda4051955 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2525,8 +2525,7 @@ static int get_socket_connected(apr_socket_t *socket)
 
 }
 #else
-static int is_socket_connnected(apr_socket_t *socket)
-
+static int get_socket_connnected(apr_socket_t *socket)
 {
     apr_size_t buffer_len = 1;
     char test_buffer[1];