httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Tue, 13 Nov 2001 20:29:54 GMT
rbb         01/11/13 12:29:54

  Modified:    include  http_connection.h
               server   connection.c core.c
               server/mpm/beos beos.c
               server/mpm/mpmt_os2 mpmt_os2_child.c
               server/mpm/netware mpm_netware.c
               server/mpm/prefork prefork.c
               server/mpm/spmt_os2 spmt_os2.c
               server/mpm/threaded threaded.c
               server/mpm/winnt mpm_winnt.c
               server/mpm/worker worker.c
  Log:
  Add the server_rec argument back to the create_connection hook.
  Submitted by:	Greg Stein
  
  Revision  Changes    Path
  1.46      +1 -1      httpd-2.0/include/http_connection.h
  
  Index: http_connection.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_connection.h,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- http_connection.h	2001/11/13 20:10:11	1.45
  +++ http_connection.h	2001/11/13 20:29:53	1.46
  @@ -130,7 +130,7 @@
    * @return An allocated connection record or NULL.
    */
   AP_DECLARE_HOOK(conn_rec *, create_connection,
  -                (apr_pool_t *p, apr_socket_t *csd, int conn_id))
  +                (apr_pool_t *p, server_rec *server, apr_socket_t *csd, int conn_id))
   
   #ifdef __cplusplus
   }
  
  
  
  1.93      +2 -2      httpd-2.0/server/connection.c
  
  Index: connection.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/connection.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- connection.c	2001/11/13 17:44:06	1.92
  +++ connection.c	2001/11/13 20:29:53	1.93
  @@ -82,8 +82,8 @@
   AP_IMPLEMENT_HOOK_RUN_ALL(int,pre_connection,(conn_rec *c),(c),OK,DECLINED)
   AP_IMPLEMENT_HOOK_RUN_FIRST(int,process_connection,(conn_rec *c),(c),DECLINED)
   AP_IMPLEMENT_HOOK_RUN_FIRST(conn_rec *,create_connection,
  -                     (apr_pool_t *p, apr_socket_t *csd, int conn_id),
  -                     (p, csd, conn_id), NULL)
  +                     (apr_pool_t *p, server_rec *server, apr_socket_t *csd, int conn_id),
  +                     (p, server, csd, conn_id), NULL)
   
   /*
    * More machine-dependent networking gooo... on some systems,
  
  
  
  1.94      +5 -5      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- core.c	2001/11/13 17:44:06	1.93
  +++ core.c	2001/11/13 20:29:53	1.94
  @@ -3276,8 +3276,8 @@
       return core_create_req(pr);
   }
   
  -static conn_rec *core_create_conn(apr_pool_t *ptrans, apr_socket_t *csd,
  -                                  int conn_id)
  +static conn_rec *core_create_conn(apr_pool_t *ptrans, server_rec *server,
  +                                  apr_socket_t *csd, int conn_id)
   {
       core_net_rec *net = apr_palloc(ptrans, sizeof(*net));
       apr_status_t rv;
  @@ -3303,7 +3303,7 @@
       net->c->pool = ptrans;
       if ((rv = apr_socket_addr_get(&net->c->local_addr, APR_LOCAL, csd))
           != APR_SUCCESS) {
  -        ap_log_error(APLOG_MARK, APLOG_INFO, rv, ap_server_conf,
  +        ap_log_error(APLOG_MARK, APLOG_INFO, rv, server,
                        "apr_socket_addr_get(APR_LOCAL)");
           apr_socket_close(csd);
           return NULL;
  @@ -3311,13 +3311,13 @@
       apr_sockaddr_ip_get(&net->c->local_ip, net->c->local_addr);
       if ((rv = apr_socket_addr_get(&net->c->remote_addr, APR_REMOTE, csd))
           != APR_SUCCESS) {
  -        ap_log_error(APLOG_MARK, APLOG_INFO, rv, ap_server_conf,
  +        ap_log_error(APLOG_MARK, APLOG_INFO, rv, server,
                        "apr_socket_addr_get(APR_REMOTE)");
           apr_socket_close(csd);
           return NULL;
       }
       apr_sockaddr_ip_get(&net->c->remote_ip, net->c->remote_addr);
  -    net->c->base_server = ap_server_conf;
  +    net->c->base_server = server;
       net->client_socket = csd;
    
       net->c->id = conn_id;
  
  
  
  1.69      +1 -1      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- beos.c	2001/11/13 06:04:24	1.68
  +++ beos.c	2001/11/13 20:29:53	1.69
  @@ -312,7 +312,7 @@
           return;
       }
   
  -    current_conn = ap_run_create_connection(p, sock, conn_id);
  +    current_conn = ap_run_create_connection(p, ap_server_conf, sock, conn_id);
   
       if (current_conn) {
           ap_process_connection(current_conn);
  
  
  
  1.6       +1 -1      httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c
  
  Index: mpmt_os2_child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mpmt_os2_child.c	2001/11/13 01:24:41	1.5
  +++ mpmt_os2_child.c	2001/11/13 20:29:53	1.6
  @@ -406,7 +406,7 @@
       while (rc = DosReadQueue(workq, &rd, &len, (PPVOID)&worker_args, 0, DCWW_WAIT,
&priority, NULLHANDLE),
              rc == 0 && rd.ulData != WORKTYPE_EXIT) {
           pconn = worker_args->pconn;
  -        current_conn = ap_run_create_connection(pconn, worker_args->conn_sd, conn_id);
  +        current_conn = ap_run_create_connection(pconn, ap_server_conf, worker_args->conn_sd,
conn_id);
   
           if (current_conn) {
               ap_process_connection(current_conn);
  
  
  
  1.12      +1 -1      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mpm_netware.c	2001/11/13 18:36:22	1.11
  +++ mpm_netware.c	2001/11/13 20:29:53	1.12
  @@ -505,7 +505,7 @@
           * We now have a connection, so set it up with the appropriate
           * socket options, file descriptors, and read/write buffers.
           */
  -        current_conn = ap_run_create_connection(ptrans, csd, my_worker_num);
  +        current_conn = ap_run_create_connection(ptrans, ap_server_conf, csd, my_worker_num);
           if (current_conn) {
               ap_process_connection(current_conn);
           }
  
  
  
  1.218     +1 -1      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.217
  retrieving revision 1.218
  diff -u -r1.217 -r1.218
  --- prefork.c	2001/11/13 20:15:10	1.217
  +++ prefork.c	2001/11/13 20:29:53	1.218
  @@ -787,7 +787,7 @@
           }
   #endif
   
  -	current_conn = ap_run_create_connection(ptrans, csd, my_child_num);
  +	current_conn = ap_run_create_connection(ptrans, ap_server_conf, csd, my_child_num);
           if (current_conn) {
               ap_process_connection(current_conn);
           }
  
  
  
  1.109     +1 -1      httpd-2.0/server/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- spmt_os2.c	2001/11/13 06:04:24	1.108
  +++ spmt_os2.c	2001/11/13 20:29:53	1.109
  @@ -677,7 +677,7 @@
   	 * We now have a connection, so set it up with the appropriate
   	 * socket options, file descriptors, and read/write buffers.
   	 */
  -	current_conn = ap_run_create_connection(ptrans, csd,
  +	current_conn = ap_run_create_connection(ptrans, ap_server_conf, csd,
                                            THREAD_GLOBAL(thread_num));
   
           if (current_conn) {
  
  
  
  1.73      +1 -1      httpd-2.0/server/mpm/threaded/threaded.c
  
  Index: threaded.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- threaded.c	2001/11/13 06:04:24	1.72
  +++ threaded.c	2001/11/13 20:29:53	1.73
  @@ -473,7 +473,7 @@
           return;
       }
   
  -    current_conn = ap_run_create_connection(p, sock, conn_id);
  +    current_conn = ap_run_create_connection(p, ap_server_conf, sock, conn_id);
       if (current_conn) {
           ap_process_connection(current_conn);
       }
  
  
  
  1.193     +1 -1      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.192
  retrieving revision 1.193
  diff -u -r1.192 -r1.193
  --- mpm_winnt.c	2001/11/13 06:04:25	1.192
  +++ mpm_winnt.c	2001/11/13 20:29:54	1.193
  @@ -893,7 +893,7 @@
           /* ### is this correct?  Shouldn't be inheritable (at this point) */
           apr_os_sock_make(&context->sock, &sockinfo, context->ptrans);
   
  -        c = ap_run_create_connection(context->ptrans, context->sock,
  +        c = ap_run_create_connection(context->ptrans, ap_server_conf, context->sock,
                                 thread_num);
   
           if (c) {
  
  
  
  1.38      +1 -1      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- worker.c	2001/11/13 06:04:25	1.37
  +++ worker.c	2001/11/13 20:29:54	1.38
  @@ -497,7 +497,7 @@
           return;
       }
   
  -    current_conn = ap_run_create_connection(p, sock, conn_id);
  +    current_conn = ap_run_create_connection(p, ap_server_conf, sock, conn_id);
       if (current_conn) {
           ap_process_connection(current_conn);
       }
  
  
  

Mime
View raw message