diff options
| author | Jeff Trawick <trawick@apache.org> | 2003-09-03 21:27:12 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2003-09-03 21:27:12 +0200 |
| commit | aa21671e13767135f0ee3f88d6a3ff6d039e6534 (patch) | |
| tree | 4076c4ce92c1c44bd68937d2550b470462fb4892 /server/connection.c | |
| parent | Point to the correct download location. (diff) | |
| download | apache2-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/connection.c')
| -rw-r--r-- | server/connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/connection.c b/server/connection.c index 8d88e147fb..9bbdb7968c 100644 --- a/server/connection.c +++ b/server/connection.c @@ -167,7 +167,7 @@ AP_DECLARE(void) ap_lingering_close(conn_rec *c) /* Shut down the socket for write, which will send a FIN * to the peer. */ - if (apr_shutdown(csd, APR_SHUTDOWN_WRITE) != APR_SUCCESS + if (apr_socket_shutdown(csd, APR_SHUTDOWN_WRITE) != APR_SUCCESS || c->aborted) { apr_socket_close(csd); return; @@ -183,7 +183,7 @@ AP_DECLARE(void) ap_lingering_close(conn_rec *c) apr_socket_opt_set(csd, APR_INCOMPLETE_READ, 1); while (1) { nbytes = sizeof(dummybuf); - rc = apr_recv(csd, dummybuf, &nbytes); + rc = apr_socket_recv(csd, dummybuf, &nbytes); if (rc != APR_SUCCESS || nbytes == 0) break; |