httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy mod_proxy.c proxy_util.c mod_proxy.h
Date Wed, 15 Sep 2004 11:57:02 GMT
mturk       2004/09/15 04:57:02

  Modified:    modules/proxy mod_proxy.c proxy_util.c mod_proxy.h
  Log:
  Register output function so that core can retrieve it and set
  scoreboard accordingly
  
  Revision  Changes    Path
  1.144     +3 -1      httpd-2.0/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- mod_proxy.c	11 Sep 2004 17:14:49 -0000	1.143
  +++ mod_proxy.c	15 Sep 2004 11:57:02 -0000	1.144
  @@ -19,6 +19,7 @@
   #include "mod_proxy.h"
   #include "mod_core.h"
   #include "apr_optional.h"
  +#include "scoreboard.h"
   #include "mod_status.h"
   
   #if (MODULE_MAGIC_NUMBER_MAJOR > 20020903)
  @@ -1766,7 +1767,8 @@
   #ifndef FIX_15207
       static const char * const aszSucc[]={ "mod_rewrite.c", NULL };
   #endif
  -
  +    
  +    APR_REGISTER_OPTIONAL_FN(ap_proxy_lb_workers);
       /* handler */
       ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);
       /* filename-to-URI translation */
  
  
  
  1.154     +1 -2      httpd-2.0/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -r1.153 -r1.154
  --- proxy_util.c	13 Sep 2004 11:36:24 -0000	1.153
  +++ proxy_util.c	15 Sep 2004 11:57:02 -0000	1.154
  @@ -16,7 +16,6 @@
   /* Utility routines for Apache proxy */
   #include "mod_proxy.h"
   #include "ap_mpm.h"
  -#include "scoreboard.h"
   #include "apr_version.h"
   
   #if APR_HAVE_UNISTD_H
  @@ -1816,7 +1815,7 @@
       return OK;
   }
   
  -PROXY_DECLARE(int) ap_proxy_lb_workers(void)
  +int ap_proxy_lb_workers(void)
   {
       /* Set the dynamic #workers limit */
       lb_workers_limit = lb_workers + PROXY_DYNAMIC_BALANCER_LIMIT;
  
  
  
  1.134     +1 -1      httpd-2.0/modules/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- mod_proxy.h	13 Sep 2004 11:13:28 -0000	1.133
  +++ mod_proxy.h	15 Sep 2004 11:57:02 -0000	1.134
  @@ -586,7 +586,7 @@
   #endif
   /* The number of dynamic balancers that can be added */
   #define PROXY_DYNAMIC_BALANCER_LIMIT    16
  -PROXY_DECLARE(int) ap_proxy_lb_workers(void);
  +int ap_proxy_lb_workers(void);
   
   /* For proxy_util */
   extern module PROXY_DECLARE_DATA proxy_module;
  
  
  

Mime
View raw message