svn commit: r990745 - in /httpd/httpd/trunk: CHANGES modules/metadata/mod_remoteip.c

[rp...@apache.org]

Author: rpluem
Date: Mon Aug 30 09:41:38 2010
New Revision: 990745

URL: http://svn.apache.org/viewvc?rev=990745&view=rev
Log:
* temp_sa is already the correct pointer.

PR: 49838
Submitted by: Andrew Skalski <voltara gmail.com>
Reviewed by: rpluem

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=990745&r1=990744&r2=990745&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Aug 30 09:41:38 2010
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.9
 
+  *) mod_remoteip: Fix a segfaulti when using mod_remoteip in conjunction with
+     Allow/Deny. PR 49838.  [Andrew Skalski <voltara gmail.com>]
+
   *) core: DirectoryMatch can now match on the end of line character ($),
      and sub-directories of matched directories are no longer implicitly
      matched.  PR49809 [Eric Covener]

Modified: httpd/httpd/trunk/modules/metadata/mod_remoteip.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_remoteip.c?rev=990745&r1=990744&r2=990745&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_remoteip.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_remoteip.c Mon Aug 30 09:41:38 2010
@@ -409,7 +409,7 @@ static int remoteip_modify_connection(re
      */
     c->remote_ip = apr_pstrdup(c->pool, c->remote_ip);
     conn->proxied_ip = c->remote_ip;
-    memcpy(&conn->proxied_addr, &temp_sa, sizeof(temp_sa));
+    memcpy(&conn->proxied_addr, temp_sa, sizeof(*temp_sa));
     conn->proxied_addr.pool = c->pool;
     c->remote_addr = &conn->proxied_addr;