tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmand...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
Date Mon, 02 Feb 2004 18:23:55 GMT
mmanders    2004/02/02 10:23:55

  Modified:    jk/native2/server/apache2 jk_service_apache2.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.38      +2 -4      jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
  
  Index: jk_service_apache2.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- jk_service_apache2.c	22 Jan 2004 09:19:55 -0000	1.37
  +++ jk_service_apache2.c	2 Feb 2004 18:23:55 -0000	1.38
  @@ -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;
  @@ -376,8 +375,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;
   
       s->server_software = (char *)ap_get_server_version();
   
  
  
  

---------------------------------------------------------------------
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