summaryrefslogtreecommitdiffstats
path: root/server/listen.c
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/listen.c
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/listen.c')
-rw-r--r--server/listen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/listen.c b/server/listen.c
index 49a115a3a6..778894e5a9 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -159,7 +159,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
ap_sock_disable_nagle(s);
#endif
- if ((stat = apr_bind(s, server->bind_addr)) != APR_SUCCESS) {
+ if ((stat = apr_socket_bind(s, server->bind_addr)) != APR_SUCCESS) {
ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, stat, p,
"make_sock: could not bind to address %pI",
server->bind_addr);
@@ -167,7 +167,7 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
return stat;
}
- if ((stat = apr_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
+ if ((stat = apr_socket_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_ERR, stat, p,
"make_sock: unable to listen for connections "
"on address %pI",
@@ -295,7 +295,7 @@ static const char *alloc_listener(process_rec *process, char *addr, apr_port_t p
sa = sa->next;
status = apr_socket_create(&new->sd, new->bind_addr->family,
- SOCK_STREAM, process->pool);
+ SOCK_STREAM, 0, process->pool);
#if APR_HAVE_IPV6
/* What could happen is that we got an IPv6 address, but this system