apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r654248 - in /apr/apr/branches/1.3.x: CHANGES network_io/unix/sendrecv.c
Date Wed, 07 May 2008 20:10:15 GMT
Author: jim
Date: Wed May  7 13:10:13 2008
New Revision: 654248

URL: http://svn.apache.org/viewvc?rev=654248&view=rev
Log:
Combine Darwin sendfile stuff to one combined "fix"

Modified:
    apr/apr/branches/1.3.x/CHANGES
    apr/apr/branches/1.3.x/network_io/unix/sendrecv.c

Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=654248&r1=654247&r2=654248&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Wed May  7 13:10:13 2008
@@ -8,9 +8,6 @@
   *) Use /dev/urandom in preference to /dev/random as entropy source
      for apr_generate_random_bytes.  PR 44881.  [Bojan Smojver]
 
-  *) Support OS/X sendfile by using writev in lieu of hdtr vecs
-     miscounted by the OS.  [Geoff Greer <angryparsley mipsisrisc.com>]
-
   *) Implement apr_proc_wait_all_procs for windows.
      The implementation uses tool help library present
      on Windows 2000 and later. APR_ENOTIMPL is returned
@@ -47,7 +44,9 @@
      allocation.  [David Jones <oscaremma gmail.com>]
 
   *) Implement Darwin-semantic (9.0.0 and later) sendfile support.
-     [William Rowe, Jim Jagielski]
+     Use writev in lieu of hdtr vecs since how Darwin counts the
+     data is undocumented. [Geoff Greer <angryparsley mipsisrisc.com>,
+     William Rowe, Jim Jagielski]
 
   *) Implemented the APR_FOPEN_SPARSE flag, permits win32 to create
      sparse data files.  Also bestow apr_fileinfo_t csize field for

Modified: apr/apr/branches/1.3.x/network_io/unix/sendrecv.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/network_io/unix/sendrecv.c?rev=654248&r1=654247&r2=654248&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/network_io/unix/sendrecv.c (original)
+++ apr/apr/branches/1.3.x/network_io/unix/sendrecv.c Wed May  7 13:10:13 2008
@@ -468,6 +468,7 @@
                           flags);        /* undefined, set to 0 */
 
             bytes_to_send -= nbytes;
+            (*offset) += nbytes;
             if (rv == -1) {
                 if (errno == EAGAIN) {
                     if (sock->timeout > 0) {



Mime
View raw message