From: Jim Jagielski <jim@apache.org>
Date: Fri, 3 Jul 2009 11:57:02 +0000 (+0000)
Subject: Merge r395552 from trunk:
X-Git-Tag: 2.2.12~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29df90a857f1e7b8a280519ed27a92c19252a6fb;p=thirdparty%2Fapache%2Fhttpd.git

Merge r395552 from trunk:

* modules/proxy/proxy_util.c (ap_proxy_initialize_worker): Fix
gcc strict-aliasing warning.

Submitted by: jorton
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790876 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 2c1e5c8bbbf..301f34d20ff 100644
--- a/STATUS
+++ b/STATUS
@@ -105,12 +105,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * modules/proxy/proxy_util.c (ap_proxy_initialize_worker): Fix
-   gcc strict-aliasing warning.
-   Trunk version of patch works:
-       http://svn.apache.org/viewvc?view=rev&revision=395552
-   +1: takashi, rpluem, jim
-
  * mod_rewrite: Fix the error string returned by RewriteRule.
    RewriteRule returned "RewriteCond: bad flag delimiters"
    when the 3rd argument of RewriteRule  was not started with
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index a565c0d5992..b835832d059 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1914,8 +1914,11 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
     else
 #endif
     {
+        void *conn;
+
+        rv = connection_constructor(&conn, worker, worker->cp->pool);
+        worker->cp->conn = conn;
 
-        rv = connection_constructor((void **)&(worker->cp->conn), worker, worker->cp->pool);
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
              "proxy: initialized single connection worker %d in child %" APR_PID_T_FMT " for (%s)",
              worker->id, getpid(), worker->hostname);