From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Feb 2014 14:13:14 +0000 (+0000)
Subject: Merge r1564756 from trunk:
X-Git-Tag: 2.4.8~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7aa84ea70c7133f65480cedc95b83898d850c196;p=apache

Merge r1564756 from trunk:

mod_proxy_fcgi: Fix error message when an unexpected protocol version
number is received from the application.

PR: 56110

Submitted by: trawick
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index b112bc36ac..383040f5ba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ Changes with Apache 2.4.8
   *) mod_remoteip: Correct the trusted proxy match test. PR 54651.
      [Yoshinori Ehara <yoshinori ehara gmail com>, Eugene L <eugenel amazon com>]
 
+  *) mod_proxy_fcgi: Fix error message when an unexpected protocol version
+     number is received from the application.  PR 56110.  [Jeff Trawick]
+
   *) mod_remoteip: Use the correct IP addresses to populate the proxy_ips field.
      PR 55972. [Mike Rumph]
 
diff --git a/STATUS b/STATUS
index 1d4081210f..6979446e9f 100644
--- a/STATUS
+++ b/STATUS
@@ -98,17 +98,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_remoteip: Correct the trusted proxy match test. PR54651
-     trunk patch: https://svn.apache.org/r1564052
-     2.4.x patch: trunk works
-     +1: mrumph, covener, jim
-
-   * mod_proxy_fcgi: Fix error message when an unexpected protocol version
-     number is received from the application.  PR 56110.
-     trunk patch: http://svn.apache.org/r1564756
-     2.4.x patch: trunk patch works with manipulation of CHANGES
-     +1: trawick, jim, jailletc36
-
   * event fdqueue: Use a normalized offset point for idlers via atomics
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1545286
                  http://svn.apache.org/viewvc?view=revision&revision=1545292
diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index ee7029002c..89816dee09 100644
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -510,7 +510,7 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
 
             if (version != AP_FCGI_VERSION_1) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01068)
-                              "Got bogus version %d", (int) header.version);
+                              "Got bogus version %d", (int)version);
                 rv = APR_EINVAL;
                 break;
             }