summaryrefslogtreecommitdiffstats
path: root/modules/proxy
diff options
context:
space:
mode:
authorBrian Havard <bjh@apache.org>2010-04-12 20:12:43 +0200
committerBrian Havard <bjh@apache.org>2010-04-12 20:12:43 +0200
commit9128497953d583b022c1357d509b9664d9e98879 (patch)
treeff65c0c04d88748a9854b2e7114adefd1bd9702d /modules/proxy
parentTransform (diff)
downloadapache2-9128497953d583b022c1357d509b9664d9e98879.tar.xz
apache2-9128497953d583b022c1357d509b9664d9e98879.zip
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
Diffstat (limited to 'modules/proxy')
-rw-r--r--modules/proxy/mod_proxy_fdpass.c5
1 files changed, 1 insertions, 4 deletions
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;
}