Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 10461 invoked from network); 2 Feb 2004 17:41:12 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 2 Feb 2004 17:41:12 -0000 Received: (qmail 60976 invoked by uid 500); 2 Feb 2004 17:38:01 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 60913 invoked by uid 500); 2 Feb 2004 17:38:01 -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 60714 invoked by uid 500); 2 Feb 2004 17:37:59 -0000 Received: (qmail 60647 invoked from network); 2 Feb 2004 17:37:58 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 2 Feb 2004 17:37:58 -0000 Received: (qmail 8218 invoked by uid 1333); 2 Feb 2004 17:38:04 -0000 Date: 2 Feb 2004 17:38:04 -0000 Message-ID: <20040202173804.8217.qmail@minotaur.apache.org> From: mmanders@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.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 mmanders 2004/02/02 09:38:04 Modified: jk/native/apache-2.0 mod_jk.c Log: Updated how we get the server port to work with APR 1.0 as well as previous versions. Patch submitted by Guenter Knauf. Revision Changes Path 1.91 +2 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- mod_jk.c 5 Nov 2003 09:15:41 -0000 1.90 +++ mod_jk.c 2 Feb 2004 17:38:04 -0000 1.91 @@ -482,8 +482,6 @@ { request_rec *r = private_data->r; - apr_port_t port; - char *ssl_temp = NULL; s->jvm_route = NULL; /* Used for sticky session routing */ @@ -518,8 +516,7 @@ s->server_name = (char *)ap_get_server_name(r); /* 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; /* XXX : � la jk2 ???*/ /* s->server_port = ap_get_server_port(r); */ --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org