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 mod_proxy.h
Date Thu, 26 Aug 2004 06:49:22 GMT
mturk       2004/08/25 23:49:22

  Modified:    modules/proxy mod_proxy.c mod_proxy.h
  Log:
  Add pool used for allocating proxy_server_conf to that struct.
  It will be used for dynamic configuration, to ensure that dynamic
  params has the same lifetime as the config has.
  
  Revision  Changes    Path
  1.136     +2 -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.135
  retrieving revision 1.136
  diff -u -r1.135 -r1.136
  --- mod_proxy.c	25 Aug 2004 09:19:43 -0000	1.135
  +++ mod_proxy.c	26 Aug 2004 06:49:21 -0000	1.136
  @@ -714,6 +714,7 @@
       ps->timeout_set = 0;
       ps->badopt = bad_error;
       ps->badopt_set = 0;
  +    ps->pool = p;
       return ps;
   }
   
  @@ -749,7 +750,7 @@
       ps->preserve_host = (overrides->preserve_host_set == 0) ? base->preserve_host
: overrides->preserve_host;
       ps->timeout= (overrides->timeout_set == 0) ? base->timeout : overrides->timeout;
       ps->badopt = (overrides->badopt_set == 0) ? base->badopt : overrides->badopt;
  -
  +    ps->pool = p;
       return ps;
   }
   
  
  
  
  1.124     +5 -5      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.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- mod_proxy.h	25 Aug 2004 11:22:54 -0000	1.123
  +++ mod_proxy.h	26 Aug 2004 06:49:22 -0000	1.124
  @@ -96,7 +96,7 @@
       const char *hostname;   /* the hostname of this proxy */
       apr_port_t  port;       /* the port for this proxy */
       regex_t *regexp;        /* compiled regex (if any) for the remote */
  -    int use_regex;          /* simple boolean. True if we have a regex pattern */
  +    int use_regex;      /* simple boolean. True if we have a regex pattern */
   };
   
   struct proxy_alias {
  @@ -127,7 +127,7 @@
       apr_array_header_t *workers;
       apr_array_header_t *balancers;
       const char *domain;     /* domain name to use in absence of a domain name in the request
*/
  -    int req;                /* true if proxy requests are enabled */
  +    int req;            /* true if proxy requests are enabled */
       char req_set;
       enum {
         via_off,
  @@ -176,7 +176,7 @@
           status_full
       } proxy_status;             /* Status display options */
       char proxy_status_set;
  -
  +    apr_pool_t *pool;           /* Pool used for allocating this struct */
   } proxy_server_conf;
   
   typedef struct proxy_balancer  proxy_balancer;
  @@ -359,9 +359,9 @@
   PROXY_DECLARE(int) ap_proxy_hex2c(const char *x);
   PROXY_DECLARE(void) ap_proxy_c2hex(int ch, char *x);
   PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype
t,
  -                                       int isenc);
  +            int isenc);
   PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp,
  -                                           char **passwordp, char **hostp, apr_port_t *port);
  +             char **passwordp, char **hostp, apr_port_t *port);
   PROXY_DECLARE(const char *)ap_proxy_date_canon(apr_pool_t *p, const char *x);
   PROXY_DECLARE(int) ap_proxy_liststr(const char *list, const char *val);
   PROXY_DECLARE(char *)ap_proxy_removestr(apr_pool_t *pool, const char *list, const char
*val);
  
  
  

Mime
View raw message