diff options
author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 1999-12-03 15:18:49 +0000 |
---|---|---|
committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 1999-12-03 15:18:49 +0000 |
commit | e25a953d65012b5c7c05f4d25b0ded43b82c1f65 (patch) | |
tree | 0c1f9343452dc2ccbcbd08ab07346ecc1ae8d293 /network_io | |
parent | 6fab83b33a96c54b2f029f4f43de662f1d6656dc (diff) | |
download | libapr-e25a953d65012b5c7c05f4d25b0ded43b82c1f65.tar.gz |
Fix the logic in blocking vs non-blocking pipes to children. It only
makes sense to change the blocking attributes of a pipe if we actually
are successful in creating the pipe.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59501 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
-rw-r--r-- | network_io/unix/Makefile.in | 44 | ||||
-rw-r--r-- | network_io/unix/networkio.h | 37 | ||||
-rw-r--r-- | network_io/unix/poll.c | 10 | ||||
-rw-r--r-- | network_io/unix/sendrecv.c | 6 | ||||
-rw-r--r-- | network_io/unix/sockaddr.c | 11 | ||||
-rw-r--r-- | network_io/unix/sockets.c | 16 | ||||
-rw-r--r-- | network_io/unix/sockopt.c | 11 |
7 files changed, 57 insertions, 78 deletions
diff --git a/network_io/unix/Makefile.in b/network_io/unix/Makefile.in index 745329996..6a8955ebc 100644 --- a/network_io/unix/Makefile.in +++ b/network_io/unix/Makefile.in @@ -54,25 +54,25 @@ depend: && rm Makefile.new # DO NOT REMOVE -poll.o: poll.c networkio.h ../../include/apr_network_io.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lock.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h -sendrecv.o: sendrecv.c networkio.h ../../include/apr_network_io.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lock.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h -sockaddr.o: sockaddr.c networkio.h ../../include/apr_network_io.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lock.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h -sockets.o: sockets.c networkio.h ../../include/apr_network_io.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lock.h \ - ../../include/apr_portable.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_win.h \ - ../../include/apr_time.h ../../include/apr_lib.h -sockopt.o: sockopt.c networkio.h ../../include/apr_network_io.h \ - ../../include/apr_general.h ../../include/apr_config.h \ - ../../include/apr_errno.h ../../include/apr_lock.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h +poll.o: poll.c networkio.h ../../include/apr_config.h \ + ../../include/apr_network_io.h ../../include/apr_general.h \ + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \ + ../../include/apr_file_io.h +sendrecv.o: sendrecv.c networkio.h ../../include/apr_config.h \ + ../../include/apr_network_io.h ../../include/apr_general.h \ + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \ + ../../include/apr_file_io.h +sockaddr.o: sockaddr.c networkio.h ../../include/apr_config.h \ + ../../include/apr_network_io.h ../../include/apr_general.h \ + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \ + ../../include/apr_file_io.h +sockets.o: sockets.c networkio.h ../../include/apr_config.h \ + ../../include/apr_network_io.h ../../include/apr_general.h \ + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \ + ../../include/apr_file_io.h ../../include/apr_portable.h \ + ../../include/apr_thread_proc.h ../../include/apr_lock.h \ + ../../include/apr_time.h +sockopt.o: sockopt.c networkio.h ../../include/apr_config.h \ + ../../include/apr_network_io.h ../../include/apr_general.h \ + ../../include/apr.h ../../include/apr_errno.h ../../include/apr_lib.h \ + ../../include/apr_file_io.h diff --git a/network_io/unix/networkio.h b/network_io/unix/networkio.h index e38c2c211..2cb64086f 100644 --- a/network_io/unix/networkio.h +++ b/network_io/unix/networkio.h @@ -59,10 +59,43 @@ #include "apr_config.h" #include "apr_network_io.h" #include "apr_general.h" -#include "apr_lock.h" -#ifdef HAVE_POLL_H +#include "apr_lib.h" + +/* System headers the network I/O library needs */ +#if HAVE_POLL_H #include <poll.h> #endif +#if HAVE_ERRNO_H +#include <errno.h> +#endif +#if HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#if HAVE_UNISTD_H +#include <unistd.h> +#endif +#if HAVE_STRING_H +#include <string.h> +#endif +#if HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif +#if HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#if HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#if HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#if HAVE_NETDB_H +#include <netdb.h> +#endif +#if HAVE_FCNTL_H +#include <fcntl.h> +#endif +/* End System Headers */ struct socket_t { ap_context_t *cntxt; diff --git a/network_io/unix/poll.c b/network_io/unix/poll.c index a73c1b7fe..255cfa9a6 100644 --- a/network_io/unix/poll.c +++ b/network_io/unix/poll.c @@ -54,16 +54,6 @@ */ #include "networkio.h" -#include "apr_config.h" -#include "apr_network_io.h" -#include "apr_general.h" -#include "apr_lib.h" -#ifdef HAVE_ERRNO_H -#include <errno.h> -#endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif #ifdef HAVE_POLL /* We can just use poll to do our socket polling. */ diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c index 3575a204e..1db9178bd 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -56,12 +56,6 @@ */ #include "networkio.h" -#include "apr_errno.h" -#include "apr_general.h" -#include "apr_network_io.h" -#include "apr_lib.h" -#include <sys/time.h> -#include <unistd.h> /* ***APRDOC******************************************************** * ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *, time_t) diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index 41df63e7f..6603099d7 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -54,17 +54,6 @@ */ #include "networkio.h" -#include "apr_network_io.h" -#include "apr_general.h" -#include "apr_lib.h" -#include <errno.h> -#include <string.h> -#include <sys/socket.h> -#include <netinet/tcp.h> -#include <netinet/in.h> -#include <arpa/inet.h> - - /* ***APRDOC******************************************************** * ap_status_t ap_set_local_port(ap_socket_t *socket, ap_uint32_t port) diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c index f070925a7..e40e80cc2 100644 --- a/network_io/unix/sockets.c +++ b/network_io/unix/sockets.c @@ -54,23 +54,7 @@ */ #include "networkio.h" -#include "apr_network_io.h" -#include "apr_general.h" #include "apr_portable.h" -#include "apr_lib.h" -#include <errno.h> -#include <string.h> -#include <unistd.h> -#include <sys/socket.h> -#include <netinet/tcp.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <netdb.h> - -#ifndef _POSIX_THREAD_SAFE_FUNCTIONS -ap_lock_t *lock_network = NULL; -ap_lock_t *lock_inet = NULL; -#endif static ap_status_t socket_cleanup(void *sock) { diff --git a/network_io/unix/sockopt.c b/network_io/unix/sockopt.c index 4d2b912f5..96746dac3 100644 --- a/network_io/unix/sockopt.c +++ b/network_io/unix/sockopt.c @@ -54,17 +54,6 @@ */ #include "networkio.h" -#include "apr_network_io.h" -#include "apr_general.h" -#include "apr_lib.h" -#include <errno.h> -#include <string.h> -#include <sys/socket.h> -#include <netinet/tcp.h> -#include <netinet/in.h> -#include <unistd.h> -#include <fcntl.h> -#include <netdb.h> static ap_status_t soblock(int sd) { |