Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 50049 invoked from network); 15 Nov 2004 23:07:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Nov 2004 23:07:07 -0000 Received: (qmail 20102 invoked by uid 500); 15 Nov 2004 23:07:06 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 20073 invoked by uid 500); 15 Nov 2004 23:07:06 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 20060 invoked by uid 99); 15 Nov 2004 23:07:06 -0000 X-ASF-Spam-Status: No, hits=1.6 required=10.0 tests=DNS_FROM_RFC_ABUSE,DNS_FROM_RFC_POST,SPF_HELO_PASS X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Message-ID: <41993695.2040309@btopenworld.com> Date: Mon, 15 Nov 2004 23:07:01 +0000 From: Julian Foad Reply-To: dev@apr.apache.org User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6) Gecko/20040113 X-Accept-Language: en-gb, en, en-us MIME-Version: 1.0 To: dev@apr.apache.org Subject: [PATCH] Remove a spurious CR character from within a source line Content-Type: multipart/mixed; boundary="------------030906050007060705070008" X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. --------------030906050007060705070008 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit See subject line and log message within patch. - Julian --------------030906050007060705070008 Content-Type: text/plain; name="apr-cr.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="apr-cr.patch" Remove a spurious carriage return from the middle of a line. No functional change. * apr/network_io/unix/sendrecv.c (apr_socket_sendfile): Remove a spurious carriage return. Index: apr/network_io/unix/sendrecv.c =================================================================== --- apr/network_io/unix/sendrecv.c (revision 65585) +++ apr/network_io/unix/sendrecv.c (working copy) @@ -316,7 +316,7 @@ apr_status_t apr_socket_sendfile(apr_soc *len); /* number of bytes to send */ } while (rv == -1 && errno == EINTR); - if ((rv == -1) && (errno == EAGAIN || errno == EWOULDBLOCK) + if ((rv == -1) && (errno == EAGAIN || errno == EWOULDBLOCK) && (sock->timeout > 0)) { do_select: arv = apr_wait_for_io_or_timeout(NULL, sock, 0); --------------030906050007060705070008--