From 04b0c156afc62cc0b91bf510a7c0f51d7a80ba85 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 1 Dec 2000 18:49:52 +0000 Subject: [PATCH] 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 --- server/connection.c | 9 +++++---- support/httpd.exp | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/server/connection.c b/server/connection.c index a1c028e3ad..12c3576ea2 100644 --- 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 834b75f049..c324444aec 100644 --- 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 -- 2.40.0