httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1569007 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/proxy/mod_proxy_fcgi.c
Date Mon, 17 Feb 2014 14:13:14 GMT
Author: jim
Date: Mon Feb 17 14:13:14 2014
New Revision: 1569007

URL: http://svn.apache.org/r1569007
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1564756

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1569007&r1=1569006&r2=1569007&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Feb 17 14:13:14 2014
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1569007&r1=1569006&r2=1569007&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Feb 17 14:13:14 2014
@@ -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

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c?rev=1569007&r1=1569006&r2=1569007&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c Mon Feb 17 14:13:14 2014
@@ -510,7 +510,7 @@ static apr_status_t dispatch(proxy_conn_
 
             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;
             }



Mime
View raw message