Author: jfrederic.clere(a)jboss.com Date: 2008-07-24 03:10:25 -0400 (Thu, 24 Jul 2008) New Revision: 1757 Added: trunk/mod_cluster/native/mod_proxy_cluster/config.m4.patch trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_ajp.patch Removed: trunk/mod_cluster/native/mod_proxy_cluster/patch.txt Log: Arrange the patch logic. Added: trunk/mod_cluster/native/mod_proxy_cluster/config.m4.patch =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/config.m4.patch (rev 0) +++ trunk/mod_cluster/native/mod_proxy_cluster/config.m4.patch 2008-07-24 07:10:25 UTC (rev 1757) @@ -0,0 +1,28 @@ +Index: config.m4 +=================================================================== +--- config.m4 (revision 663923) ++++ config.m4 (working copy) +@@ -18,6 +18,7 @@ + proxy_http_objs="mod_proxy_http.lo" + proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo" + proxy_balancer_objs="mod_proxy_balancer.lo" ++proxy_cluster_objs="mod_proxy_cluster.lo" + + case "$host" in + *os2*) +@@ -28,6 +29,7 @@ + proxy_http_objs="$proxy_http_objs mod_proxy.la" + proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la" + proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la" ++ proxy_cluster_objs="$proxy_cluster_objs mod_proxy.la" + ;; + esac + +@@ -36,6 +38,7 @@ + APACHE_MODULE(proxy_http, Apache proxy HTTP module, $proxy_http_objs, , $proxy_mods_enable) + APACHE_MODULE(proxy_ajp, Apache proxy AJP module, $proxy_ajp_objs, , $proxy_mods_enable) + APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module, $proxy_balancer_objs, , $proxy_mods_enable) ++APACHE_MODULE(proxy_cluster, proxy CLUSTER module, $proxy_cluster_objs, , $proxy_mods_enable) + + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators]) + Added: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_ajp.patch =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_ajp.patch (rev 0) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_ajp.patch 2008-07-24 07:10:25 UTC (rev 1757) @@ -0,0 +1,49 @@ +--- mod_proxy_ajp.c 2008-06-18 17:23:06.000000000 +0200 ++++ mod_proxy_ajp.c 2008-06-18 15:41:03.000000000 +0200 +@@ -550,6 +550,8 @@ + conn_rec *origin = NULL; + proxy_conn_rec *backend = NULL; + const char *scheme = "AJP"; ++ apr_interval_time_t savetimeout; ++ char savetimeout_set; + proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config, + &proxy_module); + +@@ -605,7 +607,18 @@ + goto cleanup; + + /* Step Two: Make the Connection */ +- if (ap_proxy_connect_backend(scheme, backend, worker, r->server)) { ++ if (worker->ping_timeout_set) { ++ savetimeout_set = worker->timeout_set; ++ savetimeout = worker->timeout; ++ worker->timeout_set = 1; ++ worker->timeout = worker->ping_timeout; ++ } ++ status = ap_proxy_connect_backend(scheme, backend, worker, r->server); ++ if (worker->ping_timeout_set) { ++ worker->timeout_set = savetimeout_set; ++ worker->timeout = savetimeout; ++ } ++ if (status) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, + "proxy: AJP: failed to make connection to backend: %s", + backend->hostname); +@@ -615,6 +628,17 @@ + + /* Handle CPING/CPONG */ + if (worker->ping_timeout_set) { ++ /* Put a timeout on the socket like ap_proxy_connect_backend() */ ++ if (worker->timeout_set == 1) { ++ apr_socket_timeout_set(backend->sock, worker->timeout); ++ } ++ else if (conf->timeout_set == 1) { ++ apr_socket_timeout_set(backend->sock, conf->timeout); ++ } ++ else { ++ apr_socket_timeout_set(backend->sock, r->server->timeout); ++ } ++ + + status = ajp_handle_cping_cpong(backend->sock, r, + worker->ping_timeout); Deleted: trunk/mod_cluster/native/mod_proxy_cluster/patch.txt =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/patch.txt 2008-07-23 14:17:15 UTC (rev 1756) +++ trunk/mod_cluster/native/mod_proxy_cluster/patch.txt 2008-07-24 07:10:25 UTC (rev 1757) @@ -1,77 +0,0 @@ -Index: config.m4 -=================================================================== ---- config.m4 (revision 663923) -+++ config.m4 (working copy) -@@ -18,6 +18,7 @@ - proxy_http_objs="mod_proxy_http.lo" - proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo" - proxy_balancer_objs="mod_proxy_balancer.lo" -+proxy_cluster_objs="mod_proxy_cluster.lo" - - case "$host" in - *os2*) -@@ -28,6 +29,7 @@ - proxy_http_objs="$proxy_http_objs mod_proxy.la" - proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la" - proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la" -+ proxy_cluster_objs="$proxy_cluster_objs mod_proxy.la" - ;; - esac - -@@ -36,6 +38,7 @@ - APACHE_MODULE(proxy_http, Apache proxy HTTP module, $proxy_http_objs, , $proxy_mods_enable) - APACHE_MODULE(proxy_ajp, Apache proxy AJP module, $proxy_ajp_objs, , $proxy_mods_enable) - APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module, $proxy_balancer_objs, , $proxy_mods_enable) -+APACHE_MODULE(proxy_cluster, proxy CLUSTER module, $proxy_cluster_objs, , $proxy_mods_enable) - - APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators]) - ---- mod_proxy_ajp.c 2008-06-18 17:23:06.000000000 +0200 -+++ mod_proxy_ajp.c 2008-06-18 15:41:03.000000000 +0200 -@@ -550,6 +550,8 @@ - conn_rec *origin = NULL; - proxy_conn_rec *backend = NULL; - const char *scheme = "AJP"; -+ apr_interval_time_t savetimeout; -+ char savetimeout_set; - proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config, - &proxy_module); - -@@ -605,7 +607,18 @@ - goto cleanup; - - /* Step Two: Make the Connection */ -- if (ap_proxy_connect_backend(scheme, backend, worker, r->server)) { -+ if (worker->ping_timeout_set) { -+ savetimeout_set = worker->timeout_set; -+ savetimeout = worker->timeout; -+ worker->timeout_set = 1; -+ worker->timeout = worker->ping_timeout; -+ } -+ status = ap_proxy_connect_backend(scheme, backend, worker, r->server); -+ if (worker->ping_timeout_set) { -+ worker->timeout_set = savetimeout_set; -+ worker->timeout = savetimeout; -+ } -+ if (status) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "proxy: AJP: failed to make connection to backend: %s", - backend->hostname); -@@ -615,6 +628,17 @@ - - /* Handle CPING/CPONG */ - if (worker->ping_timeout_set) { -+ /* Put a timeout on the socket like ap_proxy_connect_backend() */ -+ if (worker->timeout_set == 1) { -+ apr_socket_timeout_set(backend->sock, worker->timeout); -+ } -+ else if (conf->timeout_set == 1) { -+ apr_socket_timeout_set(backend->sock, conf->timeout); -+ } -+ else { -+ apr_socket_timeout_set(backend->sock, r->server->timeout); -+ } -+ - - status = ajp_handle_cping_cpong(backend->sock, r, - worker->ping_timeout);