summaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2004-03-10 22:06:11 +0100
committerJoe Orton <jorton@apache.org>2004-03-10 22:06:11 +0100
commit6895aee83834906539cfc6276051e64225ea336a (patch)
treee0e108b27aff6f29c8b50102172b62b9a9e2f9b8 /os
parent* modules/standard/mod_autoindex.c (index_directory): If stat() fails (diff)
downloadapache2-6895aee83834906539cfc6276051e64225ea336a.tar.xz
apache2-6895aee83834906539cfc6276051e64225ea336a.zip
* os/unix/unixd.c (unixd_accept): Eliminate now-redundant call to
apr_os_sock_get(); let APR check for accept returning zero on TPF. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102925 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os')
-rw-r--r--os/unix/unixd.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 2a5caba6ba..082b3cf6a7 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -458,19 +458,12 @@ AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr,
{
apr_socket_t *csd;
apr_status_t status;
- int sockdes;
*accepted = NULL;
status = apr_socket_accept(&csd, lr->sd, ptrans);
if (status == APR_SUCCESS) {
*accepted = csd;
- apr_os_sock_get(&sockdes, csd);
-#ifdef TPF
- if (sockdes == 0) { /* 0 is invalid socket for TPF */
- return APR_EINTR;
- }
-#endif
- return status;
+ return APR_SUCCESS;
}
if (APR_STATUS_IS_EINTR(status)) {