diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-04-15 20:17:58 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-04-15 20:17:58 +0000 |
| commit | 9b7cea209349b01dbb1e7ba64b74e6fa600263d9 (patch) | |
| tree | be1e55f2a7e876e1293a25fc1a35d68e37625cbe /network_io | |
| parent | 1cb6180a79be637b0ed0d45ca9a21ccb3dda3462 (diff) | |
| download | libapr-9b7cea209349b01dbb1e7ba64b74e6fa600263d9.tar.gz | |
Backport from HEAD:
* network_io/unix/sockets.c (apr_socket_accept): Move TPF check for
accept returning zero out of httpd.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/APR_0_9_BRANCH@65060 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/unix/sockets.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c index 98c09871b..20e9bfed1 100644 --- a/network_io/unix/sockets.c +++ b/network_io/unix/sockets.c @@ -167,6 +167,13 @@ apr_status_t apr_socket_accept(apr_socket_t **new, apr_socket_t *sock, if ((*new)->socketdes < 0) { return errno; } +#ifdef TPF + if ((*new)->socketdes == 0) { + /* 0 is an invalid socket for TPF */ + return APR_EINTR; + } +#endif + *(*new)->local_addr = *sock->local_addr; /* The above assignment just overwrote the pool entry. Setting the local_addr |