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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
