summaryrefslogtreecommitdiffstats
path: root/server/mpm/netware
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2003-09-03 21:27:12 +0200
committerJeff Trawick <trawick@apache.org>2003-09-03 21:27:12 +0200
commitaa21671e13767135f0ee3f88d6a3ff6d039e6534 (patch)
tree4076c4ce92c1c44bd68937d2550b470462fb4892 /server/mpm/netware
parentPoint to the correct download location. (diff)
downloadapache2-aa21671e13767135f0ee3f88d6a3ff6d039e6534.tar.xz
apache2-aa21671e13767135f0ee3f88d6a3ff6d039e6534.zip
switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create, 2.1-dev won't build with apr and apr-util's 0.9 branch anymore git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/netware')
-rw-r--r--server/mpm/netware/mpm_netware.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 4c206ab42f..8be51cc6d5 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -461,7 +461,7 @@ void worker_main(void *arg)
wouldblock_retry = MAX_WB_RETRIES;
while (wouldblock_retry) {
- if ((stat = apr_accept(&csd, sd, ptrans)) == APR_SUCCESS) {
+ if ((stat = apr_socket_accept(&csd, sd, ptrans)) == APR_SUCCESS) {
break;
}
else {
@@ -523,13 +523,13 @@ void worker_main(void *arg)
* occur in mobile IP.
*/
ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf,
- "apr_accept: giving up.");
+ "apr_socket_accept: giving up.");
clean_child_exit(APEXIT_CHILDFATAL, my_worker_num, ptrans,
bucket_alloc);
}
else {
ap_log_error(APLOG_MARK, APLOG_ERR, stat, ap_server_conf,
- "apr_accept: (client socket)");
+ "apr_socket_accept: (client socket)");
clean_child_exit(1, my_worker_num, ptrans, bucket_alloc);
}
}