Add the server_rec argument back to the create_connection hook.

Submitted by:	Greg Stein

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91913 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_connection.h b/include/http_connection.h
index e99cd398c64b50e42dced3d36466e996f20f3c89..eb48cfcdd0215d420cd7e1d16d31752864cbf025 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -130,7 +130,7 @@ AP_DECLARE_HOOK(int,process_connection,(conn_rec *c))
  * @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
 }

diff --git a/server/connection.c b/server/connection.c
index 4f27935c03345f80dd4f47e6b2938d84a083ffb0..b0d59aaed0d9ad76bbc83807d80089af7267a91b 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -82,8 +82,8 @@ APR_HOOK_STRUCT(
 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,

diff --git a/server/core.c b/server/core.c
index 84ad3b1b7fd99e306115af2b4b40ceb9050704a7..7e4a0ef82d7366d9c3dbe3b27abb8d04683eccf7 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -3276,8 +3276,8 @@ static int core_create_proxy_req(request_rec *r, request_rec *pr)
     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 @@ static conn_rec *core_create_conn(apr_pool_t *ptrans, apr_socket_t *csd,
     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 @@ static conn_rec *core_create_conn(apr_pool_t *ptrans, apr_socket_t *csd,
     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;

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 303024068461ecd7536b182b633ace4df0073740..4ac0f6b70f9532893f6a0b9ef973b8f831d69ea5 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -312,7 +312,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num)
         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);

diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c
index 3122eedca5e692838b5eb395ec68e15b65c4e7f1..290a91ea069456681a6068ef88835bff6ca802cc 100644 (file)
--- a/server/mpm/mpmt_os2/mpmt_os2_child.c
+++ b/server/mpm/mpmt_os2/mpmt_os2_child.c
@@ -406,7 +406,7 @@ static void worker_main(void *vpArg)
     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);

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index d66bae338881d0d880401e46add0a983e3916247..181d2909256d8cd0b0d52519d9fa6fbf0cefff82 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -505,7 +505,7 @@ got_listener:
         * 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);
         }

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 1286d1f3397ff4cf61acf686f67e71982e409855..2e05f31a8e66c67aea6643e5ef78caccb3892ce9 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -787,7 +787,7 @@ static void child_main(int child_num_arg)
         }
 #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);
         }

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 104a0a86ba5fd3a503e9ab752e001d58e31891d4..ab530d93c499a33fcc363408f6f43567611cc84f 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -677,7 +677,7 @@ static void thread_main(void *thread_num_arg)
         * 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) {

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index f6376559384fc311ad85b540a183f477d759e580..8dc3cfd998df53c4b44800274b85d0aa1f35af0d 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -473,7 +473,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
         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);
     }

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 6b0ac33627dd6fa01600765769695ac6b981c689..f68d7d5c2c506610a3c0cd9c86168d8687189a7e 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -893,7 +893,7 @@ static void worker_main(int thread_num)
         /* ### 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) {

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 160988a230bca7745ba01e14d10aaa9096536769..bb7b61c0ce22b2e95952e4944a49a1ef59c6f63d 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -497,7 +497,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
         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);
     }