File nginx-gcc-4.7.patch of Package nginx

Overview Repositories Revisions Requests Users Attributes Meta

File nginx-gcc-4.7.patch of Package nginx (Revision ec83ba9136e87c18e44676de723461b3)

Currently displaying revision ec83ba9136e87c18e44676de723461b3 , Show latest

Index: src/http/ngx_http_core_module.c
===================================================================
--- src/http/ngx_http_core_module.c	(revision 4824)
+++ src/http/ngx_http_core_module.c	(working copy)
@@ -2776,7 +2776,13 @@ ngx_http_get_forwarded_addr(ngx_http_req
 
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
             family = AF_INET;
-            inaddr = *(in_addr_t *) &inaddr6->s6_addr[12];
+
+            p = inaddr6->s6_addr;
+
+            inaddr = p[12] << 24;
+            inaddr += p[13] << 16;
+            inaddr += p[14] << 8;
+            inaddr += p[15];
         }
     }
 #endif
Index: src/http/modules/ngx_http_geo_module.c
===================================================================
--- src/http/modules/ngx_http_geo_module.c	(revision 4824)
+++ src/http/modules/ngx_http_geo_module.c	(working copy)
@@ -233,12 +233,20 @@ ngx_http_geo_addr(ngx_http_request_t *r,
 #if (NGX_HAVE_INET6)
 
     if (addr.sockaddr->sa_family == AF_INET6) {
+        u_char           *p;
+        in_addr_t         inaddr;
         struct in6_addr  *inaddr6;
 
         inaddr6 = &((struct sockaddr_in6 *) addr.sockaddr)->sin6_addr;
 
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
-            return ntohl(*(in_addr_t *) &inaddr6->s6_addr[12]);
+            p = inaddr6->s6_addr;
+
+            inaddr = p[12] << 24;
+            inaddr += p[13] << 16;
+            inaddr += p[14] << 8;
+            inaddr += p[15];
+            return inaddr;
         }
     }
 
Index: src/http/modules/ngx_http_geoip_module.c
===================================================================
--- src/http/modules/ngx_http_geoip_module.c	(revision 4824)
+++ src/http/modules/ngx_http_geoip_module.c	(working copy)
@@ -226,12 +226,20 @@ ngx_http_geoip_addr(ngx_http_request_t *
 #if (NGX_HAVE_INET6)
 
     if (addr.sockaddr->sa_family == AF_INET6) {
+        u_char           *p;
+        in_addr_t         inaddr;
         struct in6_addr  *inaddr6;
 
         inaddr6 = &((struct sockaddr_in6 *) addr.sockaddr)->sin6_addr;
 
         if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
-            return ntohl(*(in_addr_t *) &inaddr6->s6_addr[12]);
+            p = inaddr6->s6_addr;
+
+            inaddr = p[12] << 24;
+            inaddr += p[13] << 16;
+            inaddr += p[14] << 8;
+            inaddr += p[15];
+            return inaddr;
         }
     }

Places

File nginx-gcc-4.7.patch of Package nginx (Revision ec83ba9136e87c18e44676de723461b3)

Places