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