Get rid of ap_new_apr_connection(). ap_new_connection() now has

fewer parameters: the local and remote socket addresses were removed
from the parameter list because all required information is available
via the APR socket.

I haven't tested the most important part -- the WinNT MPM changes
-- but it compiles and it looks okay :)  If the WinNT MPM works on
Win98 these days let me know.

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

diff --git a/include/http_connection.h b/include/http_connection.h
index da21db07cbb4afab15a9b03af2cc670a19352b40..f7a880336b4fbcfb2572f65b6b4c974bb8a3d19f 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -72,25 +72,10 @@ extern "C" {
  * @param p Pool to allocate data structures out of
  * @param server The server to create the connection for
  * @param inout The socket to use for all communication with the client
- * @param remaddr The remote address
- * @param addr The server's local address
  * @param id ID of this connection; unique at any point in time.
  */
 conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
-                            apr_socket_t *inout,
-                           const struct sockaddr_in *remaddr,
-                           const struct sockaddr_in *saddr, long id);
-
-/**
- * Create a new connection using APR primitives.  This is basically a
- * wrapper around ap_new_connection
- * @param p Pool to allocate data structures out of.
- * @param server The server to create the connection for
- * @param conn_socket The socket we are creating the connection on.
- * @param id ID of this connection; unique at any point in time.
- */
-conn_rec *ap_new_apr_connection(apr_pool_t *p, server_rec *server, 
-                                apr_socket_t *conn_socket, long id);
+                            apr_socket_t *inout, long id);
 
 /**
  * This is the protocol module driver.  This calls all of the

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index e679f1931b6dee65b36b1a018f13fedc8bd598a4..044c64fb17b1f947572d0c835b967f70c61045ac 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -276,7 +276,7 @@ int ap_proxy_http_handler(request_rec *r, char *url,
                                desthost, NULL));
     }
 
-    origin = ap_new_apr_connection(r->pool, r->server, sock, 0);
+    origin = ap_new_connection(r->pool, r->server, sock, 0);
     ap_add_output_filter("CORE", NULL, NULL, origin);
 
     clear_connection(r->pool, r->headers_in);  /* Strip connection-based headers */

diff --git a/server/connection.c b/server/connection.c
index 12c3576ea2eb838fe6795504a59c3c65617a5083..e86a037ad5b4a142ed69a43b56d148ad3b3025c8 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -269,9 +269,7 @@ int ap_process_http_connection(conn_rec *c)
 */
 
 conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
-                            apr_socket_t *inout,
-                           const struct sockaddr_in *remaddr,
-                           const struct sockaddr_in *saddr, long id)
+                            apr_socket_t *inout, long id)
 {
     conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));
     apr_sockaddr_t *sa;
@@ -284,29 +282,16 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server,
     conn->notes = apr_make_table(p, 5);
 
     conn->pool = p;
-    conn->local_addr = *saddr;
     apr_get_sockaddr(&sa, APR_LOCAL, inout);
+    conn->local_addr = sa->sa.sin;
     apr_get_ipaddr(&conn->local_ip, sa);
     conn->base_server = server;
     conn->client_socket = inout;
 
-    conn->remote_addr = *remaddr;
     apr_get_sockaddr(&sa, APR_REMOTE, inout);
+    conn->remote_addr = sa->sa.sin;
     apr_get_ipaddr(&conn->remote_ip, sa);   
     conn->id = id;
 
     return conn;
 }
-
-
-
-conn_rec *ap_new_apr_connection(apr_pool_t *p, server_rec *server, 
-                                apr_socket_t *conn_socket, long id)
-{
-    apr_sockaddr_t *sa_local, *sa_remote;
-
-    apr_get_sockaddr(&sa_local, APR_LOCAL, conn_socket);
-    apr_get_sockaddr(&sa_remote, APR_REMOTE, conn_socket);
-    return ap_new_connection(p, server, conn_socket, 
-                             &sa_remote->sa.sin, &sa_local->sa.sin, id);
-}

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 9d365a7d10b05c6ffee2bd6d7422685dd16e50bd..495eb5b3e251891299dcba4b96425dc1c516e973 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -320,8 +320,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num)
            return;
     }
     
-    current_conn = ap_new_apr_connection(p, ap_server_conf, sock, 
-                                         conn_id);
+    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
 
     ap_process_connection(current_conn);
     ap_lingering_close(current_conn);

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index cf11a0ab7032835481b95e9ebb61629fa01b0df7..9f63a44d19392d9f3fd048cb124461e4ebd3fd28 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -414,8 +414,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id)
 
     ap_sock_disable_nagle(sock);
 
-    current_conn = ap_new_apr_connection(p, ap_server_conf, sock,
-                                         conn_id);
+    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
 
     ap_process_connection(current_conn);
     ap_lingering_close(current_conn);

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index d934e9e99a505fe37a231ef2157f1d79b7acd09a..c5230aa80c479fd33438de4560659dac944c0a5e 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -453,8 +453,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id)
         ap_sock_disable_nagle(sock);
     }
 
-    current_conn = ap_new_apr_connection(p, ap_server_conf, sock,
-                                         conn_id);
+    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
 
     ap_process_connection(current_conn);
     ap_lingering_close(current_conn);

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index 26df7bc9efbba7ad6eada46920aace4a249017fc..3f62b40e7d7aa4b312b52f8b86d37e47234d01ab 100644 (file)
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -299,8 +299,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
     long conn_id = my_child_num * HARD_THREAD_LIMIT + my_thread_num;
     int csd;
 
-    current_conn = ap_new_apr_connection(p, ap_server_conf, sock, 
-                                         conn_id);
+    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
 
     ap_process_connection(current_conn);
     ap_lingering_close(current_conn);

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index 1a37e9bd1d2fd7f7bfb0a7bec0401aa2bd8f4969..e43440c993882e85dca56f7f31350af0789420ec 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -412,8 +412,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
     (void) ap_update_child_status(my_child_num, my_thread_num,  
                                  SERVER_BUSY_READ, (request_rec *) NULL);
 
-    current_conn = ap_new_apr_connection(p, ap_server_conf, sock,
-                                         conn_id);
+    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
 
     ap_process_connection(current_conn);
     ap_lingering_close(current_conn);

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index d934e9e99a505fe37a231ef2157f1d79b7acd09a..c5230aa80c479fd33438de4560659dac944c0a5e 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -453,8 +453,7 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id)
         ap_sock_disable_nagle(sock);
     }
 
-    current_conn = ap_new_apr_connection(p, ap_server_conf, sock,
-                                         conn_id);
+    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);
 
     ap_process_connection(current_conn);
     ap_lingering_close(current_conn);

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 2e92927ab7bd0f24f25002d243e1e1e8807de39d..77b217b3d9193a8a16feabfae3cab34377a99064 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1042,8 +1042,8 @@ static void child_main(int child_num_arg)
        (void) ap_update_child_status(my_child_num, SERVER_BUSY_READ,
                                   (request_rec *) NULL);
 
-       current_conn = ap_new_apr_connection(ptrans, ap_server_conf, csd,
-                                        my_child_num);
+       current_conn = ap_new_connection(ptrans, ap_server_conf, csd, 
+                                         my_child_num);
 
        ap_process_connection(current_conn);
         ap_lingering_close(current_conn);

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 83b87e74deb0a75eee4beaf2432166e0ee6a3ab1..37b3dee385ad90c24ca65336ad4a80a3efab8c2f 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -964,8 +964,8 @@ static void child_main(void *child_num_arg)
        (void) ap_update_child_status(THREAD_GLOBAL(child_num), SERVER_BUSY_READ,
                                   (request_rec *) NULL);
 
-       current_conn = ap_new_apr_connection(ptrans, ap_server_conf, csd,
-                                             THREAD_GLOBAL(child_num));
+       current_conn = ap_new_connection(ptrans, ap_server_conf, csd,
+                                         THREAD_GLOBAL(child_num));
 
        ap_process_connection(current_conn);
         ap_lingering_close(current_conn);

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 5a4b36e594e24da8c0e2ad4653c67eb40dbf41bf..41f2c4183379361d8c11073be66a7ca60ef83c31 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1121,6 +1121,7 @@ static PCOMP_CONTEXT winnt_get_connection(PCOMP_CONTEXT context)
 static void worker_main(int child_num)
 {
     PCOMP_CONTEXT context = NULL;
+    apr_os_sock_info_t sockinfo;
 
     while (1) {
         conn_rec *c;
@@ -1137,7 +1138,13 @@ static void worker_main(int child_num)
         if (!context)
             break;
         sock_disable_nagle(context->accept_socket);
-        apr_put_os_sock(&context->sock, &context->accept_socket, context->ptrans);
+
+        sockinfo.os_sock = &context->accept_socket;
+        sockinfo.local   = context->sa_server;
+        sockinfo.remote  = context->sa_client;
+        sockinfo.family  = APR_INET;
+        sockinfo.type    = SOCK_STREAM;
+        apr_make_os_sock(&context->sock, &sockinfo, context->ptrans);
 
         c = ap_new_connection(context->ptrans, server_conf, context->sock,
                               (struct sockaddr_in *) context->sa_client,