You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mm...@apache.org on 2004/02/02 18:38:04 UTC

cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c

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