diff options
| author | Jim Jagielski <jim@apache.org> | 2008-05-07 20:07:52 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2008-05-07 20:07:52 +0000 |
| commit | 7f48a1bc52580a513abfd1d77464408d182547f6 (patch) | |
| tree | 5c370205ab9f1332772c1ef932052468cb3e2afd /network_io/unix/sendrecv.c | |
| parent | b96669ee031aa4b4ab9a9ed8bf3efe0cf580c46e (diff) | |
| download | apr-7f48a1bc52580a513abfd1d77464408d182547f6.tar.gz | |
Oops... forgot to combine the CHANGES :)
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@654247 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io/unix/sendrecv.c')
| -rw-r--r-- | network_io/unix/sendrecv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c index ab7eba79c..a64e8211b 100644 --- a/network_io/unix/sendrecv.c +++ b/network_io/unix/sendrecv.c @@ -406,9 +406,9 @@ do_select: #elif defined(DARWIN) /* OS/X Release 10.5 or greater */ -apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file, - apr_hdtr_t * hdtr, apr_off_t * offset, - apr_size_t * len, apr_int32_t flags) +apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file, + apr_hdtr_t *hdtr, apr_off_t *offset, + apr_size_t *len, apr_int32_t flags) { apr_off_t nbytes = 0; apr_off_t bytes_to_send = *len; @@ -468,6 +468,7 @@ apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file, flags); /* undefined, set to 0 */ bytes_to_send -= nbytes; + (*offset) += nbytes; if (rv == -1) { if (errno == EAGAIN) { if (sock->timeout > 0) { |