diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/client.c | 2 | ||||
| -rw-r--r-- | test/sendfile.c | 2 | ||||
| -rw-r--r-- | test/server.c | 2 | ||||
| -rw-r--r-- | test/testpoll.c | 2 | ||||
| -rw-r--r-- | test/testsockets.c | 12 | ||||
| -rw-r--r-- | test/testsockopt.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/test/client.c b/test/client.c index a7a5eb190..c463a403d 100644 --- a/test/client.c +++ b/test/client.c @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) fprintf(stdout,"OK\n"); fprintf(stdout, "\tClient: Creating new socket......."); - if (apr_socket_create(&sock, remote_sa->family, SOCK_STREAM, + if (apr_socket_create(&sock, remote_sa->family, SOCK_STREAM, APR_NO_INHERIT, context) != APR_SUCCESS) { fprintf(stderr, "Couldn't create socket\n"); exit(-1); diff --git a/test/sendfile.c b/test/sendfile.c index d333e1657..3a4e5ad4b 100644 --- a/test/sendfile.c +++ b/test/sendfile.c @@ -114,7 +114,7 @@ static void apr_setup(apr_pool_t **p, apr_socket_t **sock, int *family) } *sock = NULL; - rv = apr_socket_create(sock, *family, SOCK_STREAM, *p); + rv = apr_socket_create(sock, *family, SOCK_STREAM, APR_NO_INHERIT, *p); if (rv != APR_SUCCESS) { fprintf(stderr, "apr_socket_create()->%d/%s\n", rv, diff --git a/test/server.c b/test/server.c index 4c5087b8b..074eeb6c7 100644 --- a/test/server.c +++ b/test/server.c @@ -132,7 +132,7 @@ int main(int argc, const char * const argv[]) } fprintf(stdout, "\tServer: Creating new socket......."); - if (apr_socket_create(&sock, family, SOCK_STREAM, context) != APR_SUCCESS) { + if (apr_socket_create(&sock, family, SOCK_STREAM, APR_NO_INHERIT, context) != APR_SUCCESS) { fprintf(stderr, "Couldn't create socket\n"); exit(-1); } diff --git a/test/testpoll.c b/test/testpoll.c index 510d2c33b..c20762e35 100644 --- a/test/testpoll.c +++ b/test/testpoll.c @@ -72,7 +72,7 @@ static int make_socket(apr_socket_t **sock, apr_sockaddr_t **sa, apr_port_t port printf("couldn't create control socket information, shutting down"); return 1; } - if (apr_socket_create(sock, (*sa)->sa.sin.sin_family, SOCK_DGRAM, p) + if (apr_socket_create(sock, (*sa)->sa.sin.sin_family, SOCK_DGRAM, APR_NO_INHERIT, p) != APR_SUCCESS){ printf("couldn't create UDP socket, shutting down"); return 1; diff --git a/test/testsockets.c b/test/testsockets.c index 8fc74b937..82c4af7d7 100644 --- a/test/testsockets.c +++ b/test/testsockets.c @@ -101,20 +101,20 @@ int main(void) printf("Testing socket creation functions.\n"); STD_TEST_NEQ(" Creating a TCP socket", - apr_socket_create(&sock, APR_INET, SOCK_STREAM, pool)) + apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, pool)) close_sock(sock); STD_TEST_NEQ(" Creating UDP socket", - apr_socket_create(&sock, APR_INET, SOCK_DGRAM, pool)) + apr_socket_create(&sock, APR_INET, SOCK_DGRAM, APR_NO_INHERIT, pool)) close_sock(sock); #if APR_HAVE_IPV6 STD_TEST_NEQ(" Creating an IPv6 TCP socket", - apr_socket_create(&sock, APR_INET6, SOCK_STREAM, pool)) + apr_socket_create(&sock, APR_INET6, SOCK_STREAM, APR_NO_INHERIT, pool)) close_sock(sock); STD_TEST_NEQ(" Creating an IPv6 UDP socket", - apr_socket_create(&sock, APR_INET6, SOCK_DGRAM, pool)) + apr_socket_create(&sock, APR_INET6, SOCK_DGRAM, APR_NO_INHERIT, pool)) close_sock(sock); #else printf("NO IPv6 support.\n"); @@ -123,9 +123,9 @@ int main(void) printf("Now trying sendto/recvfrom (simple tests only)\n"); STD_TEST_NEQ(" Creating socket #1 for test", - apr_socket_create(&sock, family, SOCK_DGRAM, pool)) + apr_socket_create(&sock, family, SOCK_DGRAM, APR_NO_INHERIT, pool)) STD_TEST_NEQ(" Creating socket #2 for test", - apr_socket_create(&sock2, family, SOCK_DGRAM, pool)) + apr_socket_create(&sock2, family, SOCK_DGRAM, APR_NO_INHERIT, pool)) apr_sockaddr_info_get(&to, US, APR_UNSPEC, 7772, 0, pool); apr_sockaddr_info_get(&from, US, APR_UNSPEC, 7771, 0, pool); diff --git a/test/testsockopt.c b/test/testsockopt.c index f0b9641bf..6cec1e1f2 100644 --- a/test/testsockopt.c +++ b/test/testsockopt.c @@ -103,7 +103,7 @@ int main(void) printf("Testing socket option functions.\n"); printf("\tCreating socket.........................."); - if ((stat = apr_socket_create(&sock, APR_INET, SOCK_STREAM, context)) + if ((stat = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, context)) != APR_SUCCESS){ printf("Failed to create a socket!\n"); exit(-1); |