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

[jfclere]

jfclere     01/09/05 07:43:48

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Clean some useless code - and compare it with TC3.x code -
  
  Revision  Changes    Path
  1.20      +3 -26     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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_jk.c  2001/09/05 13:00:26     1.19
  +++ mod_jk.c  2001/09/05 14:43:48     1.20
  @@ -60,7 +60,7 @@
    * Description: Apache 2 plugin for Jakarta/Tomcat                         *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
    *                 Henri Gomez <[EMAIL PROTECTED]>                               *
  - * Version:     $Revision: 1.19 $                                           *
  + * Version:     $Revision: 1.20 $                                           *
    ***************************************************************************/
   
   /*
  @@ -408,37 +408,14 @@
                   r->server->port
                   );
   
  -#if 1
  -    /* Wrong:    s->server_name  = (char *)ap_get_server_name( r ); */
  +    /* get server name */
       s->server_name= (char *)(r->hostname ? r->hostname :
                    r->server->server_hostname);
   
   
  +    /* get the real port (otherwise redirect failed) */
       apr_sockaddr_port_get(&port,r->connection->local_addr);
       s->server_port = port;
  -
  -    /* Wrong: s->server_port  = r->server->port; */
  -
  -   
  -    /*    Winners:  htons( r->connection->local_addr.sin_port )
  -                      (r->hostname ? r->hostname :
  -                             r->server->server_hostname),
  -    */
  -    /* printf( "Port %u %u %u %s %s %s %d %d \n",
  -        ap_get_server_port( r ),
  -        htons( r->connection->local_addr.sin_port ),
  -        ntohs( r->connection->local_addr.sin_port ),
  -        ap_get_server_name( r ),
  -        (r->hostname ? r->hostname : r->server->server_hostname),
  -        r->hostname,
  -        r->connection->base_server->port,
  -        r->server->port
  -        );
  -    */
  -#else
  -    s->server_name  = (char *)ap_get_server_name( r );
  -    s->server_port  = r->server->port;
  -#endif
   
       s->server_software = (char *)ap_get_server_version();