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 proxy_util.c
Date Sat, 11 Sep 2004 10:50:05 GMT
mturk       2004/09/11 03:50:05

  Modified:    modules/proxy proxy_util.c
  Log:
  Use worker as a parameter for connection_constructor.
  When min connections is greater then zero connstructor is
  called when the reslist is created.
  
  Revision  Changes    Path
  1.150     +6 -8      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.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- proxy_util.c	11 Sep 2004 09:31:10 -0000	1.149
  +++ proxy_util.c	11 Sep 2004 10:50:05 -0000	1.150
  @@ -1345,7 +1345,7 @@
   {
       apr_pool_t *ctx;
       proxy_conn_rec *conn;
  -    server_rec *s = (server_rec *)params;
  +    proxy_worker *worker = (proxy_worker *)params;
       
       /* Create the subpool for each connection
        * This keeps the memory consumption constant
  @@ -1354,12 +1354,10 @@
       apr_pool_create(&ctx, pool);
       conn = apr_pcalloc(ctx, sizeof(proxy_conn_rec));
   
  -    conn->pool = ctx;
  +    conn->pool   = ctx;
  +    conn->worker = worker;
       *resource = conn;
   
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
  -                 "proxy: socket is constructed");
  -
       return APR_SUCCESS;
   }
   
  @@ -1404,7 +1402,7 @@
                                   worker->min, worker->smax,
                                   worker->hmax, worker->ttl,
                                   connection_constructor, connection_destructor,
  -                                s, worker->cp->pool);
  +                                worker, worker->cp->pool);
   
           apr_pool_cleanup_register(worker->cp->pool, (void *)worker,
                                     conn_pool_cleanup,
  @@ -1424,7 +1422,7 @@
   #endif
       {
           
  -        rv = connection_constructor((void **)&(worker->cp->conn), s, worker->cp->pool);
  +        rv = connection_constructor((void **)&(worker->cp->conn), worker, worker->cp->pool);
           ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                        "proxy: initialized single connection worker for (%s)",
                         worker->hostname);
  @@ -1489,7 +1487,7 @@
       {
           /* create the new connection if the previous was destroyed */
           if (!worker->cp->conn)
  -            connection_constructor((void **)conn, s, worker->cp->pool);
  +            connection_constructor((void **)conn, worker, worker->cp->pool);
           else {
               *conn = worker->cp->conn;
               worker->cp->conn = NULL;
  
  
  

Mime
View raw message