You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/18 16:58:03 UTC
svn commit: r24291 -
/release/httpd/patches/apply_to_2.2.34/2.2.x-mod_proxy-without-APR_HAS_THREADS.patch
Author: ylavic
Date: Thu Jan 18 16:58:03 2018
New Revision: 24291
Log:
Patch to build mod_proxy w/o APR_HAS_THREADS on 2.2.34/x.
Added:
release/httpd/patches/apply_to_2.2.34/2.2.x-mod_proxy-without-APR_HAS_THREADS.patch
Added: release/httpd/patches/apply_to_2.2.34/2.2.x-mod_proxy-without-APR_HAS_THREADS.patch
==============================================================================
--- release/httpd/patches/apply_to_2.2.34/2.2.x-mod_proxy-without-APR_HAS_THREADS.patch (added)
+++ release/httpd/patches/apply_to_2.2.34/2.2.x-mod_proxy-without-APR_HAS_THREADS.patch Thu Jan 18 16:58:03 2018
@@ -0,0 +1,20 @@
+Index: modules/proxy/proxy_util.c
+===================================================================
+--- modules/proxy/proxy_util.c (revision 1821521)
++++ modules/proxy/proxy_util.c (working copy)
+@@ -1398,7 +1398,6 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_get_worker(
+ return max_worker;
+ }
+
+-#if APR_HAS_THREADS
+ static void socket_cleanup(proxy_conn_rec *conn)
+ {
+ conn->sock = NULL;
+@@ -1407,6 +1406,7 @@ static void socket_cleanup(proxy_conn_rec *conn)
+ apr_pool_clear(conn->scpool);
+ }
+
++#if APR_HAS_THREADS
+ static apr_status_t conn_pool_cleanup(void *theworker)
+ {
+ proxy_worker *worker = (proxy_worker *)theworker;