Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 68303 invoked from network); 2 Feb 2004 11:58:40 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 2 Feb 2004 11:58:40 -0000 Received: (qmail 80954 invoked by uid 500); 2 Feb 2004 11:58:27 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 80899 invoked by uid 500); 2 Feb 2004 11:58:26 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 80885 invoked by uid 500); 2 Feb 2004 11:58:26 -0000 Received: (qmail 80873 invoked from network); 2 Feb 2004 11:58:26 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 2 Feb 2004 11:58:26 -0000 Received: (qmail 20962 invoked by uid 1198); 2 Feb 2004 10:58:26 -0000 Date: 2 Feb 2004 10:58:26 -0000 Message-ID: <20040202105826.20961.qmail@minotaur.apache.org> From: hgomez@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N hgomez 2004/02/02 02:58:26 Modified: jk/native2/common jk_channel_apr_socket.c Log: Fix problem with port higher than 32K. Should fix BR 17579. Provided by NorW and Gunter Knauf Revision Changes Path 1.36 +4 -4 jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c Index: jk_channel_apr_socket.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- jk_channel_apr_socket.c 29 Jan 2004 14:17:41 -0000 1.35 +++ jk_channel_apr_socket.c 2 Feb 2004 10:58:26 -0000 1.36 @@ -76,7 +76,7 @@ int ndelay; apr_sockaddr_t *addr; char *host; - short port; + apr_port_t port; int keepalive; int timeout; }; @@ -92,7 +92,7 @@ */ static int JK_METHOD jk2_channel_apr_resolve(jk_env_t *env, char *host, - short port, + apr_port_t port, jk_channel_apr_private_t *rc); static int JK_METHOD jk2_channel_apr_close(jk_env_t *env, jk_channel_t *_this, @@ -168,7 +168,7 @@ jk_channel_apr_private_t *socketInfo= (jk_channel_apr_private_t *)(ch->_privatePtr); int rc; - short port=socketInfo->port; + apr_port_t port=socketInfo->port; if( socketInfo->host==NULL ) { char *localName=ch->mbean->localName; @@ -227,7 +227,7 @@ /** private: resolve the address on init */ static int JK_METHOD jk2_channel_apr_resolve(jk_env_t *env, - char *host, short port, + char *host, apr_port_t port, jk_channel_apr_private_t *rc) { int err; --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org