Stop referencing apr_get_socket_inaddr(), apr_get_remote_name(), and

apr_get_local_name().  They have been removed.

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

diff --git a/server/connection.c b/server/connection.c
index a1c028e3ada05902b6af344f8d2ea9d65c104ce3..12c3576ea2eb838fe6795504a59c3c65617a5083 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -303,9 +303,10 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server,
 conn_rec *ap_new_apr_connection(apr_pool_t *p, server_rec *server, 
                                 apr_socket_t *conn_socket, long id)
 {
-    struct sockaddr_in *sa_local, *sa_remote;
+    apr_sockaddr_t *sa_local, *sa_remote;
 
-    apr_get_local_name(&sa_local, conn_socket);
-    apr_get_remote_name(&sa_remote, conn_socket);
-    return ap_new_connection(p, server, conn_socket, sa_remote, sa_local, id);
+    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/support/httpd.exp b/support/httpd.exp
index 834b75f04950b7c25cca2107a20abdf21a03c90f..c324444aecd5e1dd20b3ce38e707206622060b12 100644 (file)
--- a/support/httpd.exp
+++ b/support/httpd.exp
@@ -409,7 +409,6 @@ apr_get_filedata
 apr_get_hostname
 apr_get_inaddr
 apr_get_ipaddr
-apr_get_local_name
 apr_get_lockdata
 apr_get_os_dir
 apr_get_os_exp_time
@@ -422,10 +421,8 @@ apr_get_os_threadkey
 apr_get_pipe_timeout
 apr_get_polldata
 apr_get_port
-apr_get_remote_name
 apr_get_revents
 apr_get_sockaddr
-apr_get_socket_inaddr
 apr_get_socketdata
 apr_get_thread_private
 apr_get_threaddata