tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/ajp/proxy mod_proxy.h
Date Fri, 06 Aug 2004 11:41:40 GMT
mturk       2004/08/06 04:41:40

  Modified:    ajp/proxy mod_proxy.h
  Log:
  Change the scheme handler hook to include worker.
  We will probably need the balancer too, but that can wait for now.
  
  Revision  Changes    Path
  1.25      +5 -5      jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h
  
  Index: mod_proxy.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_proxy.h	6 Aug 2004 05:42:14 -0000	1.24
  +++ mod_proxy.h	6 Aug 2004 11:41:40 -0000	1.25
  @@ -294,7 +294,7 @@
           APR_OPTIONAL_HOOK(proxy,name,fn,pre,succ,order)
   
   APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, scheme_handler, (request_rec *r, 
  -                          proxy_server_conf *conf, char *url, 
  +                          proxy_worker *worker, proxy_server_conf *conf, char *url, 
                             const char *proxyhost, apr_port_t proxyport))
   APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, canon_handler, (request_rec *r, 
                             char *url))
  @@ -358,14 +358,14 @@
   PROXY_DECLARE(const char *) ap_proxy_add_balancer(proxy_balancer **balancer, apr_pool_t
*p, proxy_server_conf *conf, const char *url);
   PROXY_DECLARE(void) ap_proxy_add_worker_to_balancer(proxy_balancer *balancer, proxy_worker
*worker);
   PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker, proxy_balancer **balancer,
request_rec *r, proxy_server_conf *conf, char **url);
  -PROXY_DECLARE(apr_status_t) ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
proxy_server_conf *conf, proxy_worker *worker, proxy_conn_rec *conn,
  -                                                          apr_pool_t *ppool, apr_uri_t
*uri, char **url, const char *proxyname, apr_port_t proxyport,
  -                                                          char *server_portstr, int server_portstr_size);
  +PROXY_DECLARE(int) ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, proxy_server_conf
*conf, proxy_worker *worker, proxy_conn_rec *conn,
  +                                                 apr_pool_t *ppool, apr_uri_t *uri, char
**url, const char *proxyname, apr_port_t proxyport,
  +                                                 char *server_portstr, int server_portstr_size);
   PROXY_DECLARE(int) ap_proxy_acquire_connection(const char *proxy_function, proxy_conn_rec
**conn, proxy_worker *worker, server_rec *s);
   PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function, proxy_conn_rec
*conn, server_rec *s);
   PROXY_DECLARE(apr_status_t) ap_proxy_close_connection(proxy_conn_rec *conn);
   PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function, proxy_conn_rec
*conn, proxy_worker *worker, server_rec *s);
  -PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function, proxy_conn_rec
*conn, int close_on_recycle, conn_rec *c, server_rec *s);
  +PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function, proxy_conn_rec
*conn, conn_rec *c, server_rec *s);
   
   /* For proxy_util */
   extern module PROXY_DECLARE_DATA proxy_module;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message