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: [PATHCH] ./jk/native2/server/apache2/jk_service_apache2.c
Date Fri, 23 Jan 2004 15:54:16 GMT
Hi Bill,
> Checking the CVS logs, It was fixed on 12/2/03, so 4.1.30 will be the
> first
> 4.1.x version with the fix.  Prior to then, yes it did use the value from
> Apache for getServerPort.

> ----- Original Message -----
> From: "Kyle VanderBeek" <kylev-jakarta@kylev.com>
> To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
> Sent: Thursday, January 22, 2004 1:22 PM
> Subject: Re: [PATHCH] ./jk/native2/server/apache2/jk_service_apache2.c


> On Thu, Jan 22, 2004 at 01:16:45PM -0800, Bill Barker wrote:
>> However, it is the correct value to pass to Tomcat.  Tomcat correctly
>> uses
>> this value for getLocalPort.  The value of getServerPort (which is the
>> one
>> used for redirection) is taken from the Host header (as required by the
> 2.4
>> servlet spec).

so does this mean that the problem was in Tomcat and not in mod_jk2; 
and that the bugzilla
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16901
should be closed with 'wrong approach - fixed in Tomcat' ??

if so then remains the question if the patch below is the correct replacement for apr_sockaddr_port_get():

# patch for APR 1.0 compatiblity
#
--- jk_service_apache2.c.orig	Tue Sep 30 18:16:14 2003
+++ jk_service_apache2.c	Wed Jan 21 17:43:14 2004
@@ -343,7 +343,6 @@
 static int JK_METHOD jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
                                          jk_worker_t *worker, void *serverObj)
 {
-    apr_port_t port;
     char *ssl_temp      = NULL;
     jk_workerEnv_t *workerEnv;
     request_rec *r=serverObj;
@@ -377,8 +376,7 @@
                              r->server->server_hostname);
 
     /* get the real port (otherwise redirect failed) */
-    apr_sockaddr_port_get(&port,r->connection->local_addr);
-    s->server_port = port;
+    s->server_port = r->connection->local_addr->port;
 
     s->server_software = (char *)ap_get_server_version();


votes?

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