httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r574052 - in /httpd/httpd/trunk: modules/proxy/mod_proxy.c modules/proxy/mod_proxy.h server/scoreboard.c
Date Sun, 09 Sep 2007 19:31:46 GMT
Author: jim
Date: Sun Sep  9 12:31:46 2007
New Revision: 574052

URL: http://svn.apache.org/viewvc?rev=574052&view=rev
Log:
Reinsert extern int PROXY_DECLARE_DATA proxy_lb_workers
into the Proxy API. 

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy.c
    httpd/httpd/trunk/modules/proxy/mod_proxy.h
    httpd/httpd/trunk/server/scoreboard.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=574052&r1=574051&r2=574052&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Sun Sep  9 12:31:46 2007
@@ -38,7 +38,6 @@
 #endif
 
 /* Global balancer counter */
-extern int PROXY_DECLARE_DATA proxy_lb_workers;
 static int lb_workers_limit = 0;
 
 /**

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=574052&r1=574051&r2=574052&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Sun Sep  9 12:31:46 2007
@@ -734,5 +734,7 @@
 /* For proxy_util */
 extern module PROXY_DECLARE_DATA proxy_module;
 
+extern int PROXY_DECLARE_DATA proxy_lb_workers;
+
 #endif /*MOD_PROXY_H*/
 /** @} */

Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=574052&r1=574051&r2=574052&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Sun Sep  9 12:31:46 2007
@@ -61,7 +61,7 @@
                           (p, sb_type),OK,DECLINED)
 
 static APR_OPTIONAL_FN_TYPE(ap_proxy_lb_workers)
-                                *proxy_lb_workers;
+                                *pfn_proxy_lb_workers;
 
 struct ap_sb_handle_t {
     int child_num;
@@ -94,10 +94,10 @@
     ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit);
     ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit);
 
-    if (!proxy_lb_workers)
-        proxy_lb_workers = APR_RETRIEVE_OPTIONAL_FN(ap_proxy_lb_workers);
-    if (proxy_lb_workers)
-        lb_limit = proxy_lb_workers();
+    if (!pfn_proxy_lb_workers)
+        pfn_proxy_lb_workers = APR_RETRIEVE_OPTIONAL_FN(ap_proxy_lb_workers);
+    if (pfn_proxy_lb_workers)
+        lb_limit = pfn_proxy_lb_workers();
     else
         lb_limit = 0;
 



Mime
View raw message