tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From G√ľnter Knauf <efl...@gmx.net>
Subject Re: [PATCH] ./native2/common/jk_channel_apr_socket.c - use apr_port_t instead of short for port
Date Mon, 02 Feb 2004 00:10:21 GMT
Hi,
> This would also allow closing of Bug 17579 since the recent changeover to
> APR for mod_jk2 (now using jk_channel_apr_socket.c)
thanks for the pointer! Showed that my recent patch was incomplete...; so next try:

http://www.gknw.com/test/jk_channel_apr_socket.c.diff
==========================================================================
# Patch to solve http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17579
#
--- ./jk/native2/common/jk_channel_apr_socket.c.orig    Thu Jan 29 18:23:28 2004
+++ ./jk/native2/common/jk_channel_apr_socket.c         Mon Feb 02 00:49:56 2004
@@ -74,9 +74,9 @@
  */
 struct jk_channel_apr_private {
     int ndelay;
+    apr_port_t port;
     apr_sockaddr_t *addr;
     char *host;
-    short 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;


Guenter.


---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message