]> granicus.if.org Git - apache/commitdiff
* - temp_sa is already the correct pointer
authorRuediger Pluem <rpluem@apache.org>
Mon, 30 Aug 2010 09:45:34 +0000 (09:45 +0000)
committerRuediger Pluem <rpluem@apache.org>
Mon, 30 Aug 2010 09:45:34 +0000 (09:45 +0000)
  - use temp_sa instead of temp_sa_buff which is not a pointer

Pointed by: Andrew Skalski <voltara gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@990746 13f79535-47bb-0310-9956-ffa450edef68

modules/metadata/mod_remoteip.c

index b7f2f17dcf26ea11d27f1a2ae657d27b05b3b577..92d07d4f1122e0faac0f4d234a3a46a04ae8be30 100644 (file)
@@ -260,7 +260,7 @@ static int remoteip_modify_connection(request_rec *r)
     remote = apr_pstrdup(r->pool, remote);
 
 #ifdef REMOTEIP_OPTIMIZED
-    memcpy(&temp_sa, c->remote_addr, sizeof(temp_sa));
+    memcpy(temp_sa, c->remote_addr, sizeof(*temp_sa));
     temp_sa->pool = r->pool;
 #else
     temp_sa = c->remote_addr;
@@ -310,7 +310,7 @@ static int remoteip_modify_connection(request_rec *r)
 #ifdef REMOTEIP_OPTIMIZED
         /* Decode remote_addr - sucks; apr_sockaddr_vars_set isn't 'public' */
         if (inet_pton(AF_INET, parse_remote, 
-                      &temp_sa_buff->sa.sin.sin_addr) > 0) {
+                      &temp_sa->sa.sin.sin_addr) > 0) {
             apr_sockaddr_vars_set(temp_sa, APR_INET, temp_sa.port);
         }
 #if APR_HAVE_IPV6