cvs commit: jakarta-tomcat/src/native/mod_jk/apache2.0 mod_jk.c

[hgomez]

hgomez      01/09/05 06:36:36

  Modified:    src/native/mod_jk/apache2.0 mod_jk.c
  Log:
  Correct server name/port for Apache 2.0
  The good code was allready in J-T-C
  Submitted by: Jean-Frederic Clere - [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.18      +5 -2      jakarta-tomcat/src/native/mod_jk/apache2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/apache2.0/mod_jk.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_jk.c  2001/09/05 10:02:14     1.17
  +++ mod_jk.c  2001/09/05 13:36:35     1.18
  @@ -407,6 +407,7 @@
                              jk_server_conf_t *conf)
   {
       request_rec *r      = private_data->r;
  +    apr_port_t port;
       char *ssl_temp      = NULL;
       s->jvm_route        = NULL; /* Used for sticky session routing */
   
  @@ -433,8 +434,10 @@
                                r->server->port
                                );
   
  -     s->server_name  = (char *)ap_get_server_name( r );
  -     s->server_port  = r->server->port;
  +    s->server_name= (char *)(r->hostname ? r->hostname :   
  +                 r->server->server_hostname);              
  +    apr_sockaddr_port_get(&port,r->connection->local_addr);
  +    s->server_port = port;                                 
       s->server_software = ap_get_server_version();
   
       s->method       = (char *)r->method;