Commit 3e9d3df7 authored Apr 30, 2000 by Sascha Schumann

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

parent 1945cd25

server/mpm/dexter/dexter.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)");

server/mpm/mpmt_pthread/mpmt_pthread.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)");