Mailing-List: contact dev-help@apr.apache.org; run by ezmlm
Precedence: bulk
Message-ID: <48220D55.7050500@apache.org>
Date: Wed, 07 May 2008 22:13:09 +0200
From: Ruediger Pluem <rpluem@apache.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
 rv:1.8.1.13) Gecko/20080313 SeaMonkey/1.1.9
MIME-Version: 1.0
To: dev@apr.apache.org
Subject: Re: svn commit: r654247 - in /apr/apr/trunk: CHANGES
 network_io/unix/sendrecv.c
References: <20080507200754.2BD0223889C0@eris.apache.org>
In-Reply-To: <20080507200754.2BD0223889C0@eris.apache.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit


On 05/07/2008 10:07 PM, jim@apache.org wrote:
> Author: jim
> Date: Wed May  7 13:07:52 2008
> New Revision: 654247
> 
> URL: http://svn.apache.org/viewvc?rev=654247&view=rev
> Log:
> Oops... forgot to combine the CHANGES :)
> 
> Modified:
>     apr/apr/trunk/CHANGES
>     apr/apr/trunk/network_io/unix/sendrecv.c
> 
> Modified: apr/apr/trunk/CHANGES
> URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=654247&r1=654246&r2=654247&view=diff
> ==============================================================================
> --- apr/apr/trunk/CHANGES [utf-8] (original)
> +++ apr/apr/trunk/CHANGES [utf-8] Wed May  7 13:07:52 2008
> @@ -18,9 +18,6 @@
>       to host byte order.  PR 44903.
>       [Chris Taylor <ctaylor wadeford.plus.com>]
>  
> -  *) Support OS/X sendfile by using writev in lieu of hdtr vecs
> -     miscounted by the OS.  [Geoff Greer <angryparsley mipsisrisc.com>]
> -
>    *) Introduce apr_pool_pre_cleanup_register() for registering
>       a cleanup that is called before any subpool is destroyed
>       within apr_pool_clear or apr_pool_destroy.
> 
> Modified: apr/apr/trunk/network_io/unix/sendrecv.c
> URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sendrecv.c?rev=654247&r1=654246&r2=654247&view=diff
> ==============================================================================
> --- apr/apr/trunk/network_io/unix/sendrecv.c (original)
> +++ apr/apr/trunk/network_io/unix/sendrecv.c Wed May  7 13:07:52 2008
> @@ -406,9 +406,9 @@
>  #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 @@
>                            flags);        /* undefined, set to 0 */
>  
>              bytes_to_send -= nbytes;
> +            (*offset) += nbytes;
>              if (rv == -1) {
>                  if (errno == EAGAIN) {
>                      if (sock->timeout > 0) {
> 

Sorry for being confused, but as far as I understand your svn log message this should
be only an adjustment of the CHANGES file and not the code. So what does this code
change relate to?

Regards

Rüdiger