Return-Path: X-Original-To: apmail-apr-dev-archive@www.apache.org Delivered-To: apmail-apr-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C986310BC1 for ; Sat, 13 Jul 2013 22:20:09 +0000 (UTC) Received: (qmail 67198 invoked by uid 500); 13 Jul 2013 22:20:09 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 67000 invoked by uid 500); 13 Jul 2013 22:20:08 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 66989 invoked by uid 99); 13 Jul 2013 22:20:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Jul 2013 22:20:08 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of trawick@gmail.com designates 209.85.217.173 as permitted sender) Received: from [209.85.217.173] (HELO mail-lb0-f173.google.com) (209.85.217.173) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Jul 2013 22:20:02 +0000 Received: by mail-lb0-f173.google.com with SMTP id v1so8502273lbd.32 for ; Sat, 13 Jul 2013 15:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Nf8IZH3Xt/9bwb+BEfAEDU14w/8sSWAz+sr02S3jYNQ=; b=LSPdnG6OmPHeaFCdsh7RBXwiwRE3/DuUh42EwDmQjLiDEnuSYFQL1t2cHFMi71iARc ilSlPH35p/ZElsPO9u7gth9/+fjsWaMgR+MARBUwleFprjvXELQobrBrMLeywktsNUzk QN3GvDtegU26vZQClH+/H24hl1Ih2BU6uptqI5R9ARGm17f+B03jeo6vEcudKXmPly/O PVZKW43JOljOkwLXwjazkkmlgM3Z8KTdc20Boi9EhXio948kQU0ebJ+rNX0gHOevAygr ijJhpSzWnF+oR2MGJi7YSrtxC7ZuIm8CiIcoRPjwcsvAt0wH2PulkJDeZKH/DZeD6QW4 2Xlw== MIME-Version: 1.0 X-Received: by 10.152.9.102 with SMTP id y6mr22217749laa.17.1373753982038; Sat, 13 Jul 2013 15:19:42 -0700 (PDT) Received: by 10.114.175.231 with HTTP; Sat, 13 Jul 2013 15:19:41 -0700 (PDT) In-Reply-To: <20130713155454.EB43A23888E2@eris.apache.org> References: <20130713155454.EB43A23888E2@eris.apache.org> Date: Sat, 13 Jul 2013 18:19:41 -0400 Message-ID: Subject: Re: svn commit: r1502807 - in /apr/apr/branches/1.4.x: ./ build/apr_network.m4 From: Jeff Trawick To: APR Developer List Cc: commits@apr.apache.org Content-Type: multipart/alternative; boundary=089e0158acf01bb86b04e16c06f6 X-Virus-Checked: Checked by ClamAV on apache.org --089e0158acf01bb86b04e16c06f6 Content-Type: text/plain; charset=ISO-8859-1 On Sat, Jul 13, 2013 at 11:54 AM, wrote: > Author: rjung > Date: Sat Jul 13 15:54:54 2013 > New Revision: 1502807 > > URL: http://svn.apache.org/r1502807 > Log: > Fix broken test for O_NONBLOCK inheritance. > > Followup to r1449570 resp. r1449569 (1.5.x) > resp. r1449568 (trunk) which miss the variable > declaration. > > Backport of r1502804 from trunk resp. r1502805 > (1.5.x). > need CHANGES entry to describe regression in 1.4.8 > > Modified: > apr/apr/branches/1.4.x/ (props changed) > apr/apr/branches/1.4.x/build/apr_network.m4 > > Propchange: apr/apr/branches/1.4.x/ > > ------------------------------------------------------------------------------ > Merged /apr/apr/trunk:r1502804 > > Modified: apr/apr/branches/1.4.x/build/apr_network.m4 > URL: > http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/apr_network.m4?rev=1502807&r1=1502806&r2=1502807&view=diff > > ============================================================================== > --- apr/apr/branches/1.4.x/build/apr_network.m4 (original) > +++ apr/apr/branches/1.4.x/build/apr_network.m4 Sat Jul 13 15:54:54 2013 > @@ -570,6 +570,9 @@ AC_DEFUN([APR_CHECK_O_NONBLOCK_INHERITED > #ifdef HAVE_SYS_SOCKET_H > #include > #endif > +#ifdef HAVE_SYS_TIME_H > +#include > +#endif > #ifdef HAVE_SYS_SELECT_H > #include > #endif > @@ -590,6 +593,8 @@ int main(void) { > int listen_port, rc; > struct sockaddr_in sa; > socklen_t sa_len; > + fd_set fds; > + struct timeval tv; > > listen_s = socket(AF_INET, SOCK_STREAM, 0); > if (listen_s < 0) { > > > -- Born in Roswell... married an alien... http://emptyhammock.com/ --089e0158acf01bb86b04e16c06f6 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
On Sat, Jul 13, 2013 at 11:54 AM, <<= a href=3D"mailto:rjung@apache.org" target=3D"_blank">rjung@apache.org&g= t; wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex"> Author: rjung
Date: Sat Jul 13 15:54:54 2013
New Revision: 1502807

URL: http://sv= n.apache.org/r1502807
Log:
Fix broken test for O_NONBLOCK inheritance.

Followup to r1449570 resp. r1449569 (1.5.x)
resp. r1449568 (trunk) which miss the variable
declaration.

Backport of r1502804 from trunk resp. r1502805
(1.5.x).

need CHANGES entry to describe= regression in 1.4.8
=A0

Modified:
=A0 =A0 apr/apr/branches/1.4.x/ =A0 (props changed)
=A0 =A0 apr/apr/branches/1.4.x/build/apr_network.m4

Propchange: apr/apr/branches/1.4.x/
---------------------------------------------------------------------------= ---
=A0 Merged /apr/apr/trunk:r1502804

Modified: apr/apr/branches/1.4.x/build/apr_network.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/b= uild/apr_network.m4?rev=3D1502807&r1=3D1502806&r2=3D1502807&vie= w=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D
--- apr/apr/branches/1.4.x/build/apr_network.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_network.m4 Sat Jul 13 15:54:54 2013 @@ -570,6 +570,9 @@ AC_DEFUN([APR_CHECK_O_NONBLOCK_INHERITED
=A0#ifdef HAVE_SYS_SOCKET_H
=A0#include <sys/socket.h>
=A0#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
=A0#ifdef HAVE_SYS_SELECT_H
=A0#include <sys/select.h>
=A0#endif
@@ -590,6 +593,8 @@ int main(void) {
=A0 =A0 =A0int listen_port, rc;
=A0 =A0 =A0struct sockaddr_in sa;
=A0 =A0 =A0socklen_t sa_len;
+ =A0 =A0fd_set fds;
+ =A0 =A0struct timeval tv;

=A0 =A0 =A0listen_s =3D socket(AF_INET, SOCK_STREAM, 0);
=A0 =A0 =A0if (listen_s < 0) {





--
Born in Rosw= ell... married an alien...
http://emptyhammock.com/
--089e0158acf01bb86b04e16c06f6--