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

diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index 6eee5961de95d97a55ca8f972fa6d4b86ec9bb55..cec9e607da5b27175ae8de48b97f47399d94309e 100644 (file)
--- 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 5785fc9c3ce63f7ff33ecd0a4e2bffdcd06bbe24..bac014fcee251307f514a690c1f6a7dd14a8492a 100644 (file)
--- 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;
         }