summaryrefslogtreecommitdiffstats
path: root/modules/metadata
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2018-03-19 14:07:52 +0100
committerStefan Eissing <icing@apache.org>2018-03-19 14:07:52 +0100
commita1b7278e319a882aed7401e02ce83cbc502e9c63 (patch)
tree48e3821f32b5173c5dc1b4d5fc8143eade8698e9 /modules/metadata
parentmod_md: fixes error in renew window calculation that may lead to mod_md running (diff)
downloadapache2-a1b7278e319a882aed7401e02ce83cbc502e9c63.tar.xz
apache2-a1b7278e319a882aed7401e02ce83cbc502e9c63.zip
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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827196 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/metadata')
-rw-r--r--modules/metadata/mod_remoteip.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 4f60c2f98d..891db08c15 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -855,8 +855,13 @@ static int remoteip_hook_pre_connection(conn_rec *c, void *csd)
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;
}