From 9128497953d583b022c1357d509b9664d9e98879 Mon Sep 17 00:00:00 2001 From: Brian Havard Date: Mon, 12 Apr 2010 18:12:43 +0000 Subject: [PATCH] Remove usage of the APR private function apr_wait_for_io_or_timeout(), replacing it with the newly added apr_socket_wait(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@933341 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_reqtimeout.c | 3 +-- modules/proxy/mod_proxy_fdpass.c | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c index 6eee5961de..cec9e607da 100644 --- a/modules/filters/mod_reqtimeout.c +++ b/modules/filters/mod_reqtimeout.c @@ -24,7 +24,6 @@ #include "util_filter.h" #define APR_WANT_STRFUNC #include "apr_strings.h" -#include "apr_support.h" module AP_MODULE_DECLARE_DATA reqtimeout_module; @@ -219,7 +218,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f, } /* ... and wait for more */ - rv = apr_wait_for_io_or_timeout(NULL, ccfg->socket, 1); + rv = apr_socket_wait(ccfg->socket, APR_WAIT_READ); if (rv != APR_SUCCESS) break; diff --git a/modules/proxy/mod_proxy_fdpass.c b/modules/proxy/mod_proxy_fdpass.c index 5785fc9c3c..bac014fcee 100644 --- a/modules/proxy/mod_proxy_fdpass.c +++ b/modules/proxy/mod_proxy_fdpass.c @@ -24,9 +24,6 @@ #error This module only works on unix platforms with the correct OS support #endif -/* for apr_wait_for_io_or_timeout */ -#include "apr_support.h" - #include "mod_proxy_fdpass.h" module AP_MODULE_DECLARE_DATA proxy_fdpass_module; @@ -76,7 +73,7 @@ static apr_status_t socket_connect_un(apr_socket_t *sock, if ((rv == -1) && (errno == EINPROGRESS || errno == EALREADY) && (t > 0)) { - rv = apr_wait_for_io_or_timeout(NULL, sock, 0); + rv = apr_socket_wait(sock, APR_WAIT_WRITE); if (rv != APR_SUCCESS) { return rv; } -- 2.40.0