|
Lines 1-5
Link Here
|
| 1 |
--- modules/metadata/mod_remoteip.c.orig 2010-05-11 21:33:43.631571954 -0500 |
1 |
--- modules/metadata/mod_remoteip.c 2014-10-31 21:06:56.462471491 +0100 |
| 2 |
+++ modules/metadata/mod_remoteip.c 2010-05-11 21:34:15.374903181 -0500 |
2 |
+++ modules/metadata/mod_remoteip.c 2014-10-31 21:06:59.426471488 +0100 |
| 3 |
@@ -127,7 +127,7 @@ |
3 |
@@ -127,7 +127,7 @@ |
| 4 |
return (*ipstr == '\0'); |
4 |
return (*ipstr == '\0'); |
| 5 |
} |
5 |
} |
|
Lines 45-47
Link Here
|
| 45 |
if (errmsg) { |
45 |
if (errmsg) { |
| 46 |
errmsg = apr_psprintf(cmd->pool, "%s at line %d of %s", |
46 |
errmsg = apr_psprintf(cmd->pool, "%s at line %d of %s", |
| 47 |
errmsg, cfp->line_number, filename); |
47 |
errmsg, cfp->line_number, filename); |
|
|
48 |
@@ -260,7 +260,7 @@ |
| 49 |
remote = apr_pstrdup(r->pool, remote); |
| 50 |
|
| 51 |
#ifdef REMOTEIP_OPTIMIZED |
| 52 |
- memcpy(&temp_sa, c->remote_addr, sizeof(temp_sa)); |
| 53 |
+ memcpy(temp_sa, c->remote_addr, sizeof(*temp_sa)); |
| 54 |
temp_sa->pool = r->pool; |
| 55 |
#else |
| 56 |
temp_sa = c->remote_addr; |
| 57 |
@@ -310,7 +310,7 @@ |
| 58 |
#ifdef REMOTEIP_OPTIMIZED |
| 59 |
/* Decode remote_addr - sucks; apr_sockaddr_vars_set isn't 'public' */ |
| 60 |
if (inet_pton(AF_INET, parse_remote, |
| 61 |
- &temp_sa_buff->sa.sin.sin_addr) > 0) { |
| 62 |
+ &temp_sa->sa.sin.sin_addr) > 0) { |
| 63 |
apr_sockaddr_vars_set(temp_sa, APR_INET, temp_sa.port); |
| 64 |
} |
| 65 |
#if APR_HAVE_IPV6 |
| 66 |
@@ -409,7 +409,7 @@ |
| 67 |
*/ |
| 68 |
c->remote_ip = apr_pstrdup(c->pool, c->remote_ip); |
| 69 |
conn->proxied_ip = c->remote_ip; |
| 70 |
- memcpy(&conn->proxied_addr, &temp_sa, sizeof(temp_sa)); |
| 71 |
+ memcpy(&conn->proxied_addr, temp_sa, sizeof(*temp_sa)); |
| 72 |
conn->proxied_addr.pool = c->pool; |
| 73 |
c->remote_addr = &conn->proxied_addr; |
| 74 |
|