From b65ca11a4a8c34ee7738813a82f67538c8d4d52d Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Wed, 18 Jul 2001 16:56:55 +0000 Subject: [PATCH] Changes to back out inherit flag from apr_os_sock_make() and apr_socket_create() git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89592 13f79535-47bb-0310-9956-ffa450edef68 --- server/listen.c | 5 +++-- server/mpm/winnt/mpm_winnt.c | 2 +- server/mpm_common.c | 2 +- server/rfc1413.c | 2 +- support/ab.c | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/listen.c b/server/listen.c index bdc777c588..12b270c86a 100644 --- a/server/listen.c +++ b/server/listen.c @@ -191,7 +191,7 @@ static void find_default_family(apr_pool_t *p) if (default_family == APR_UNSPEC) { apr_socket_t *tmp_sock; - if (apr_socket_create(&tmp_sock, APR_INET6, SOCK_STREAM, APR_INHERIT, + if (apr_socket_create(&tmp_sock, APR_INET6, SOCK_STREAM, p) == APR_SUCCESS) { apr_socket_close(tmp_sock); default_family = APR_INET6; @@ -254,11 +254,12 @@ static void alloc_listener(process_rec *process, char *addr, apr_port_t port) return; } if ((status = apr_socket_create(&new->sd, new->bind_addr->sa.sin.sin_family, - SOCK_STREAM, APR_INHERIT, process->pool)) != APR_SUCCESS) { + SOCK_STREAM, process->pool)) != APR_SUCCESS) { ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool, "alloc_listener: failed to get a socket for %s", addr); return; } + apr_socket_inherit_set(); new->next = ap_listeners; ap_listeners = new; } diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index a2f14253ed..901b5ba206 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -899,7 +899,7 @@ static void worker_main(int thread_num) sockinfo.family = APR_INET; sockinfo.type = SOCK_STREAM; /* ### is this correct? Shouldn't be inheritable (at this point) */ - apr_os_sock_make(&context->sock, &sockinfo, APR_NO_INHERIT, context->ptrans); + apr_os_sock_make(&context->sock, &sockinfo, context->ptrans); c = ap_new_connection(context->ptrans, server_conf, context->sock, thread_num); diff --git a/server/mpm_common.c b/server/mpm_common.c index beba575bf8..006d813341 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -403,7 +403,7 @@ AP_DECLARE(apr_status_t) ap_mpm_pod_signal(ap_pod_t *pod) } apr_sockaddr_info_get(&sa, "127.0.0.1", APR_UNSPEC, ap_listeners->bind_addr->port, 0, pod->p); - rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, APR_NO_INHERIT, pod->p); + rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, pod->p); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf, "get socket to connect to listener"); diff --git a/server/rfc1413.c b/server/rfc1413.c index 41619b19c2..669c9e97c6 100644 --- a/server/rfc1413.c +++ b/server/rfc1413.c @@ -141,7 +141,7 @@ static apr_status_t rfc1413_connect(apr_socket_t **newsock, conn_rec *conn, if ((rv = apr_socket_create(newsock, localsa->sa.sin.sin_family, /* has to match */ - SOCK_STREAM, APR_NO_INHERIT, conn->pool)) != APR_SUCCESS) { + SOCK_STREAM, conn->pool)) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_CRIT, rv, srv, "rfc1413: error creating query socket"); return rv; diff --git a/support/ab.c b/support/ab.c index 0ff1cec321..43d47c632a 100644 --- a/support/ab.c +++ b/support/ab.c @@ -844,7 +844,7 @@ static void start_connect(struct connection * c) apr_err(buf, rv); } if ((rv = apr_socket_create(&c->aprsock, destsa->sa.sin.sin_family, - SOCK_STREAM, APR_NO_INHERIT, cntxt)) != APR_SUCCESS) { + SOCK_STREAM, cntxt)) != APR_SUCCESS) { apr_err("socket", rv); } c->start = apr_time_now(); @@ -1289,14 +1289,14 @@ static void test(void) static void copyright(void) { if (!use_html) { - printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.73 $> apache-2.0"); + printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.74 $> apache-2.0"); printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n"); printf("Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/\n"); printf("\n"); } else { printf("

\n"); - printf(" This is ApacheBench, Version %s <%s> apache-2.0
\n", AB_VERSION, "$Revision: 1.73 $"); + printf(" This is ApacheBench, Version %s <%s> apache-2.0
\n", AB_VERSION, "$Revision: 1.74 $"); printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
\n"); printf(" Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/
\n"); printf("

\n

\n"); -- 2.40.0