diff options
| author | Daniel Ruggeri <druggeri@apache.org> | 2016-12-30 19:06:55 +0000 |
|---|---|---|
| committer | Daniel Ruggeri <druggeri@apache.org> | 2016-12-30 19:06:55 +0000 |
| commit | 3e4041649d121653f2b43922b3b584d9408c1100 (patch) | |
| tree | 8f23f9dc664731f59e50e1abbe16ab09d28f3c2a /modules/metadata | |
| parent | 687df1469f7f4eb21a58dcaeb9bf040870060e9b (diff) | |
| download | httpd-3e4041649d121653f2b43922b3b584d9408c1100.tar.gz | |
Shorten RemoteIPProxyProtocolEnable to RemoteIPProxyProtocol and correct references in docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776624 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/metadata')
| -rw-r--r-- | modules/metadata/mod_remoteip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c index a47ccbbacd..8abfff73f4 100644 --- a/modules/metadata/mod_remoteip.c +++ b/modules/metadata/mod_remoteip.c @@ -369,7 +369,7 @@ static void remoteip_warn_enable_conflict(remoteip_addr_info *prev, server_rec * apr_sockaddr_ip_getbuf(buf, sizeof(buf), prev->addr); ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, new, APLOGNO(03491) - "RemoteIPProxyProtocolEnable: previous setting for %s:%hu from virtual " + "RemoteIPProxyProtocol: previous setting for %s:%hu from virtual " "host {%s:%hu in %s} is being overriden by virtual host " "{%s:%hu in %s}; new setting is '%s'", buf, prev->addr->port, prev->source->server_hostname, @@ -412,7 +412,7 @@ static const char *remoteip_enable_proxy_protocol(cmd_parms *cmd, void *config, rem_list[1] = &global_conf->proxy_protocol_optional; } else { - return apr_pstrcat(cmd->pool, "Unrecognized option for ProxyProtocolEnable `%s'", arg, NULL); + return apr_pstrcat(cmd->pool, "Unrecognized option for RemoteIPProxyProtocol `%s'", arg, NULL); } for (addr = cmd->server->addrs; addr; addr = addr->next) { @@ -1008,7 +1008,7 @@ static int remoteip_determine_version(conn_rec *c, const char *ptr) } } -/* Capture the first bytes on the protocol and parse the proxy protocol header. +/* Capture the first bytes on the protocol and parse the PROXY protocol header. * Removes itself when the header is complete. */ static apr_status_t remoteip_input_filter(ap_filter_t *f, @@ -1211,7 +1211,7 @@ static const command_rec remoteip_cmds[] = RSRC_CONF | EXEC_ON_READ, "The filename to read the list of internal proxies, " "see the RemoteIPInternalProxy directive"), - AP_INIT_TAKE1("RemoteIPProxyProtocolEnable", remoteip_enable_proxy_protocol, NULL, + AP_INIT_TAKE1("RemoteIPProxyProtocol", remoteip_enable_proxy_protocol, NULL, RSRC_CONF, "Enable proxy-protocol handling (`on', `off')"), { NULL } }; |