You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
2.8 KiB
52 lines
2.8 KiB
10 years ago
|
Description: Apache 2.4 compatibility patch
|
||
|
Author: Sergey B Kirpichev <skirpichev@gmail.com>
|
||
|
Bug-Debian: http://bugs.debian.org/666792
|
||
|
|
||
|
---
|
||
|
mod_rpaf-2.0.c | 16 ++++++++--------
|
||
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
||
|
--- a/mod_rpaf-2.0.c
|
||
|
+++ b/mod_rpaf-2.0.c
|
||
|
@@ -149,8 +149,8 @@
|
||
|
|
||
|
static apr_status_t rpaf_cleanup(void *data) {
|
||
|
rpaf_cleanup_rec *rcr = (rpaf_cleanup_rec *)data;
|
||
|
- rcr->r->connection->remote_ip = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
|
||
|
- rcr->r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->remote_ip);
|
||
|
+ rcr->r->connection->client_ip = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
|
||
|
+ rcr->r->connection->client_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->client_ip);
|
||
|
return APR_SUCCESS;
|
||
|
}
|
||
|
|
||
|
@@ -173,7 +173,7 @@
|
||
|
if (!cfg->enable)
|
||
|
return DECLINED;
|
||
|
|
||
|
- if (is_in_array(r->connection->remote_ip, cfg->proxy_ips) == 1) {
|
||
|
+ if (is_in_array(r->connection->client_ip, cfg->proxy_ips) == 1) {
|
||
|
/* check if cfg->headername is set and if it is use
|
||
|
that instead of X-Forwarded-For by default */
|
||
|
if (cfg->headername && (fwdvalue = apr_table_get(r->headers_in, cfg->headername))) {
|
||
|
@@ -192,15 +192,15 @@
|
||
|
if (*fwdvalue != '\0')
|
||
|
++fwdvalue;
|
||
|
}
|
||
|
- rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->remote_ip);
|
||
|
+ rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->client_ip);
|
||
|
rcr->r = r;
|
||
|
apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
|
||
|
- r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
|
||
|
- r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
|
||
|
+ r->connection->client_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
|
||
|
+ r->connection->client_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->client_ip);
|
||
|
apr_sockaddr_t *tmpsa;
|
||
|
- int ret = apr_sockaddr_info_get(&tmpsa, r->connection->remote_ip, APR_UNSPEC, r->connection->remote_addr->port, 0, r->connection->remote_addr->pool);
|
||
|
+ int ret = apr_sockaddr_info_get(&tmpsa, r->connection->client_ip, APR_UNSPEC, r->connection->client_addr->port, 0, r->connection->client_addr->pool);
|
||
|
if (ret == APR_SUCCESS)
|
||
|
- memcpy(r->connection->remote_addr, tmpsa, sizeof(apr_sockaddr_t));
|
||
|
+ memcpy(r->connection->client_addr, tmpsa, sizeof(apr_sockaddr_t));
|
||
|
if (cfg->sethostname) {
|
||
|
const char *hostvalue;
|
||
|
if (hostvalue = apr_table_get(r->headers_in, "X-Forwarded-Host")) {
|