Use F_SETFL for setting the O_NONBLOCK status flag. F_SETFD is for setting

file descriptor flags (like FD_CLOEXEC).

PR: #47

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85115 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index fcebdcd2b1aaf57ef19f81f492d5ff9580ad91df..b2f8d5cf7466bdea6d2c20fd5126a5cbf5406b5f 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -1174,7 +1174,7 @@ int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
     }
     ap_register_cleanup(pconf, &pipe_of_death[0], cleanup_fd, cleanup_fd);
     ap_register_cleanup(pconf, &pipe_of_death[1], cleanup_fd, cleanup_fd);
-    if (fcntl(pipe_of_death[0], F_SETFD, O_NONBLOCK) == -1) {
+    if (fcntl(pipe_of_death[0], F_SETFL, O_NONBLOCK) == -1) {
         ap_log_error(APLOG_MARK, APLOG_ERR, errno,
                      (const server_rec*) server_conf,
                      "fcntl: O_NONBLOCKing (pipe_of_death)");

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index ee736b584e1c474d9938e4ebee2273ea9eadea6c..7f300c7db2ca1752b45ad7fc1baeb3c01adb6be1 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -1186,7 +1186,7 @@ int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
         exit(1);
     }
 
-    if (fcntl(pipe_of_death[0], F_SETFD, O_NONBLOCK) == -1) {
+    if (fcntl(pipe_of_death[0], F_SETFL, O_NONBLOCK) == -1) {
         ap_log_error(APLOG_MARK, APLOG_ERR, errno,
                      (const server_rec*) server_conf,
                      "fcntl: O_NONBLOCKing (pipe_of_death)");