httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1827196 - in /httpd/httpd/trunk: CHANGES modules/metadata/mod_remoteip.c
Date Mon, 19 Mar 2018 13:07:52 GMT
Author: icing
Date: Mon Mar 19 13:07:52 2018
New Revision: 1827196

URL: http://svn.apache.org/viewvc?rev=1827196&view=rev
Log:
mod_remoteip: make proxy-protocol work on slave connections, e.g. in HTTP/2
     requests. See also https://github.com/roadrunner2/mod-proxy-protocol/issues/6

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/metadata/mod_remoteip.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1827196&r1=1827195&r2=1827196&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Mar 19 13:07:52 2018
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_remoteip: make proxy-protocol work on slave connections, e.g. in HTTP/2
+     requests. See also https://github.com/roadrunner2/mod-proxy-protocol/issues/6
+     [Stefan Eissing]
+
   *) mod_md: fixes error in renew window calculation that may lead to mod_md running
      watchdog in a tight loop until actual renewal becomes necessary. [Stefan Eissing]
 

Modified: httpd/httpd/trunk/modules/metadata/mod_remoteip.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_remoteip.c?rev=1827196&r1=1827195&r2=1827196&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_remoteip.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_remoteip.c Mon Mar 19 13:07:52 2018
@@ -855,8 +855,13 @@ static int remoteip_hook_pre_connection(
     remoteip_conn_config_t *conn_conf;
     int i;
 
-    /* Do not attempt to manipulate slave connections */
+    /* Establish master config in slave connections, so that request processing
+     * finds it. */
     if (c->master != NULL) {
+        conn_conf = ap_get_module_config(c->master->conn_config, &remoteip_module);
+        if (conn_conf) {
+            ap_set_module_config(c->conn_config, &remoteip_module, conn_conf);
+        }
         return DECLINED;
     }
 



Mime
View raw message