From 1901b23ef9e26bf97229843ae5e93e916133a105 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Mon, 15 Nov 1999 19:50:25 +0000 Subject: [PATCH] Moving Unix socket IOL's to use APR. Also fixed a small bug in ap_recv. We should NEVER return a status of APR_EAGAIN and say -1 bytes read. This can cause some strange bugs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84120 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/dexter/dexter.c | 2 +- server/mpm/mpmt_pthread/mpmt_pthread.c | 2 +- server/mpm/prefork/prefork.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c index dc0ec76dc0..c6f7e94856 100644 --- a/server/mpm/dexter/dexter.c +++ b/server/mpm/dexter/dexter.c @@ -750,7 +750,7 @@ static void process_socket(ap_context_t *p, ap_socket_t *sock, long conn_id) } sock_disable_nagle(csd); - iol = unix_attach_socket(csd); + iol = unix_attach_socket(sock); if (iol == NULL) { if (errno == EBADF) { ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, errno, NULL, diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c index 383724dc51..3102e63f60 100644 --- a/server/mpm/mpmt_pthread/mpmt_pthread.c +++ b/server/mpm/mpmt_pthread/mpmt_pthread.c @@ -737,7 +737,7 @@ static void process_socket(ap_context_t *p, ap_socket_t *sock, int my_child_num, sock_disable_nagle(csd); - iol = unix_attach_socket(csd); + iol = unix_attach_socket(sock); if (iol == NULL) { if (errno == EBADF) { ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL, diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 9e96ef354f..b4a90d77c9 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -2218,7 +2218,7 @@ static void child_main(int child_num_arg) sock_disable_nagle(sockdes); - iol = unix_attach_socket(sockdes); + iol = unix_attach_socket(csd); if (iol == NULL) { if (errno == EBADF) { ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL, -- 2.40.0