Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 79620 invoked from network); 2 May 2008 23:51:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 May 2008 23:51:19 -0000 Received: (qmail 10981 invoked by uid 500); 2 May 2008 23:51:20 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 10937 invoked by uid 500); 2 May 2008 23:51:20 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 10923 invoked by uid 99); 2 May 2008 23:51:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 16:51:20 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 23:50:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 314E923889FE; Fri, 2 May 2008 16:50:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652951 - in /apr/apr/trunk: CHANGES network_io/unix/sockaddr.c Date: Fri, 02 May 2008 23:50:47 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080502235048.314E923889FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Fri May 2 16:50:47 2008 New Revision: 652951 URL: http://svn.apache.org/viewvc?rev=652951&view=rev Log: apr_getservbyname(): Use proper method for converting port to host byte order. PR 44903. Submitted by: Chris Taylor Reviewed by: trawick Modified: apr/apr/trunk/CHANGES apr/apr/trunk/network_io/unix/sockaddr.c Modified: apr/apr/trunk/CHANGES URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=652951&r1=652950&r2=652951&view=diff ============================================================================== --- apr/apr/trunk/CHANGES [utf-8] (original) +++ apr/apr/trunk/CHANGES [utf-8] Fri May 2 16:50:47 2008 @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes for APR 1.4.0 + *) apr_getservbyname(): Use proper method for converting port + to host byte order. PR 44903. + [Chris Taylor ] + *) Introduce apr_pollset_wakeup() for interrupting the blocking apr_pollset_poll call. [Mladen Turk] Modified: apr/apr/trunk/network_io/unix/sockaddr.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sockaddr.c?rev=652951&r1=652950&r2=652951&view=diff ============================================================================== --- apr/apr/trunk/network_io/unix/sockaddr.c (original) +++ apr/apr/trunk/network_io/unix/sockaddr.c Fri May 2 16:50:47 2008 @@ -711,7 +711,7 @@ return APR_EINVAL; if ((se = getservbyname(servname, NULL)) != NULL){ - sockaddr->port = htons(se->s_port); + sockaddr->port = ntohs(se->s_port); sockaddr->servname = apr_pstrdup(sockaddr->pool, servname); sockaddr->sa.sin.sin_port = se->s_port; return APR_SUCCESS;