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

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index dc0ec76dc04bea216d5ed42997c9a520d888af52..c6f7e94856007f75ccc2e2f3fd4428cbc60094f3 100644 (file)
--- 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 383724dc51a9abdeac9f1d679a9351f593c12382..3102e63f6048cdb3c9e1fa566b3373c96bffb414 100644 (file)
--- 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 9e96ef354f6e37a43545d52bddff5ccb9932e5d4..b4a90d77c9484ef0b486fe37b8cded41d4179b34 100644 (file)
--- 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,