From commits-return-7785-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Wed Dec 05 18:59:03 2007 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 67778 invoked from network); 5 Dec 2007 18:59:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Dec 2007 18:59:03 -0000 Received: (qmail 78570 invoked by uid 500); 5 Dec 2007 18:58:51 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 78514 invoked by uid 500); 5 Dec 2007 18:58:51 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 78505 invoked by uid 99); 5 Dec 2007 18:58:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2007 10:58:51 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2007 18:58:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A71D1A9832; Wed, 5 Dec 2007 10:58:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r601469 - in /activemq/activemq-cpp/tags/activemq-cpp-2.1.3: configure.ac src/main/activemq/network/SocketInputStream.cpp src/main/activemq/network/TcpSocket.cpp Date: Wed, 05 Dec 2007 18:58:30 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071205185831.5A71D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Wed Dec 5 10:58:30 2007 New Revision: 601469 URL: http://svn.apache.org/viewvc?rev=601469&view=rev Log: Creating new tag for a 2.1.3 release http://issues.apache.org/activemq/browse/AMQCPP-154 Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac?rev=601469&r1=601468&r2=601469&view=diff ============================================================================== --- activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac (original) +++ activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac Wed Dec 5 10:58:30 2007 @@ -79,6 +79,7 @@ AC_CHECK_HEADERS([uuid.h uuid/uuid.h], [AC_DEFINE([HAVE_UUID_T], [1], [Define if uuid_t exists.])]) AC_CHECK_HEADERS([objbase.h]) AC_CHECK_HEADERS([repcdce.h]) +AC_CHECK_HEADERS([stropts.h]) AC_CHECK_HEADERS([sys/filio.h]) AC_CHECK_HEADERS([sys/ioctl.h]) AC_CHECK_HEADERS([sys/select.h]) @@ -116,8 +117,8 @@ else # Assuming Sun Compiler and adding in optimization # because autoconf can't seem to figure it out. - PLAT_CXXFLAGS="-mt -w -O5" - PLAT_LIBS+="-library=stlport4" + PLAT_CXXFLAGS="-library=stlport4 -mt -w -O5" + PLAT_LIBS="$PLAT_LIBS -library=stlport4" fi ;; Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp?rev=601469&r1=601468&r2=601469&view=diff ============================================================================== --- activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp (original) +++ activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp Wed Dec 5 10:58:30 2007 @@ -32,7 +32,9 @@ // Pick up FIONREAD on Solaris 2.5. #ifdef HAVE_SYS_FILIO_H #include -#include + #ifdef HAVE_STROPTS_H + #include + #endif #include #endif Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp?rev=601469&r1=601468&r2=601469&view=diff ============================================================================== --- activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp (original) +++ activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp Wed Dec 5 10:58:30 2007 @@ -189,7 +189,12 @@ checkResult( ::getaddrinfo( host, NULL, &hints, &res_ptr ) ); - assert(res_ptr->ai_addr->sa_family == AF_INET); + if( res_ptr == NULL || res_ptr->ai_addr->sa_family != AF_INET ){ + throw SocketException( + __FILE__, __LINE__, + "TcpSocket::connect - getaddrinfo failed, is hostname correct?" ); + } + // Porting: On both 32bit and 64 bit systems that we compile to soo far, sin_addr // is a 32 bit value, not an unsigned long. assert( sizeof( ( ( sockaddr_in* )res_ptr->ai_addr )->sin_addr.s_addr ) == 4 );