tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
Date Fri, 17 Dec 2004 18:16:39 GMT
mturk       2004/12/17 10:16:39

  Modified:    jk/native/apache-1.3 mod_jk.c
  Log:
  Remove duplicating uri because map_uri now properly reverts the
  changes made when jsessionid is found.
  
  Revision  Changes    Path
  1.61      +3 -4      jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- mod_jk.c	17 Dec 2004 03:14:56 -0000	1.60
  +++ mod_jk.c	17 Dec 2004 18:16:39 -0000	1.61
  @@ -1926,8 +1926,7 @@
   
           if (conf) {
               jk_logger_t *l = conf->log ? conf->log : main_log;
  -            char *uri = ap_pstrdup(r->pool, r->uri);
  -            char *worker = map_uri_to_worker(conf->uw_map, uri, l);
  +            char *worker = map_uri_to_worker(conf->uw_map, r->uri, l);
   
               /* Don't know the worker, ForwardDirectories is set, there is a
                * previous request for which the handler is JK_HANDLER (as set by
  @@ -1950,7 +1949,7 @@
                   ap_table_setn(r->notes, JK_WORKER_ID, worker);
               }
               else if (conf->alias_dir != NULL) {
  -                char *clean_uri = uri;
  +                char *clean_uri = ap_pstrdup(r->pool, r->uri);
                   ap_no2slash(clean_uri);
                   /* Automatically map uri to a context static file */
                   jk_log(l, JK_LOG_DEBUG,
  
  
  

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