cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c

[mturk]

mturk       2002/10/09 10:10:24

  Modified:    jk/native2/server/apache13 mod_jk2.c
  Log:
  Skip the checking of default hostname and port. Using
  that scheme the same behaviour is on all web servers.
  
  Revision  Changes    Path
  1.25      +4 -8      jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
  
  Index: mod_jk2.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_jk2.c 4 Oct 2002 16:23:42 -0000       1.24
  +++ mod_jk2.c 9 Oct 2002 17:10:24 -0000       1.25
  @@ -437,7 +437,6 @@
   {
       jk_uriEnv_t *uriEnv;
       jk_env_t *env;
  -    int port;
               
       if(r->proxyreq) {
           return DECLINED;
  @@ -450,13 +449,10 @@
       /* get_env() */
       env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv );
           
  -    port = ap_get_server_port(r);
  -    if (ap_is_default_port(port, r))
  -        port = 0;
       uriEnv = workerEnv->uriMap->mapUri(env, workerEnv->uriMap,
  -                r->server->is_virtual ? ap_get_server_name(r) : NULL,
  -                port,
  -                r->uri);
  +                                       ap_get_server_name(r),
  +                                       ap_get_server_port(r),
  +                                       r->uri);
       
       if(uriEnv==NULL || uriEnv->workerName==NULL) {
           workerEnv->globalEnv->releaseEnv( workerEnv->globalEnv, env );
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>