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

[jfclere]

jfclere     01/06/26 08:01:24

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Arrange the server_name and server_port logic.
  Note the apr_sockaddr_port_get().
  
  Revision  Changes    Path
  1.10      +8 -3      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_jk.c  2001/06/22 15:19:13     1.9
  +++ mod_jk.c  2001/06/26 15:01:21     1.10
  @@ -59,7 +59,7 @@
    * Description: Apache 2 plugin for Jakarta/Tomcat                         *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
    *                   Henri Gomez <[EMAIL PROTECTED]>                               *
  - * Version:     $Revision: 1.9 $                                           *
  + * Version:     $Revision: 1.10 $                                           *
    ***************************************************************************/
   
   /*
  @@ -365,6 +365,9 @@
                                                   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 */
   
  @@ -391,13 +394,15 @@
                                r->server->port
                                );
   
  -#ifdef NOTNEEDEDFORNOW
  +#if 1
       /* Wrong:    s->server_name  = (char *)ap_get_server_name( r ); */
       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_port= htons( r->connection->local_addr.sin_port );
       /* Wrong: s->server_port  = r->server->port; */