From: Jim Jagielski <jim@apache.org>
Date: Thu, 9 Jan 2014 14:28:39 +0000 (+0000)
Subject: Merge r1524368, r1524388 from trunk:
X-Git-Tag: 2.4.8~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5c6fa00319a04d73c46ba7381d3f3b5846e9810;p=apache

Merge r1524368, r1524388 from trunk:

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.


Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Document r1524368 in CHANGES.

Submitted by: jkaluza
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index 44c29715ec..80c5e669db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.8
 
+  *) mod_proxy_fcgi: Use apr_socket_timeout_get instead of hard-coded
+     30 seconds timeout. [Jan Kaluza]
+
   *) build: only search for modules (config*.m4) in known subdirectories, see
      build/config-stubs. [Stefan Fritsch]
 
diff --git a/STATUS b/STATUS
index fb417a5b92..8003e061bd 100644
--- a/STATUS
+++ b/STATUS
@@ -98,12 +98,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_proxy_fcgi: Use apr_socket_timeout_get instead of hard-coded value
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1524368
-                 http://svn.apache.org/viewvc?view=revision&revision=1524388
-    2.4.x patch: trunk patch works mod CHANGES
-    +1: jim, covener, druggeri
-
   * mod_authn_core: allow <AuthnProviderAlias>'es to be seen from auth 
     stanzas under virtual hosts. PR55622.
     trunk patch: http://svn.apache.org/r1554995