tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmand...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date Fri, 04 Apr 2003 20:26:22 GMT
mmanders    2003/04/04 12:26:21

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Updated to build correctly for NetWare.
  
  Revision  Changes    Path
  1.70      +11 -7     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.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- mod_jk.c	2 Apr 2003 22:48:01 -0000	1.69
  +++ mod_jk.c	4 Apr 2003 20:26:20 -0000	1.70
  @@ -510,10 +510,10 @@
   	s->server_name  = (char *)ap_get_server_name(r);
   
       /* get the real port (otherwise redirect failed) */
  -    /* apr_sockaddr_port_get(&port,r->connection->local_addr); */
  -    /* s->server_port = port; */
  -    /* XXX :  la jk2 */
  -	s->server_port  = ap_get_server_port(r);
  +    apr_sockaddr_port_get(&port,r->connection->local_addr);
  +    s->server_port = port;
  +    /* XXX :  la jk2 ???*/
  +	/* s->server_port  = ap_get_server_port(r); */
   
       s->server_software = (char *)ap_get_server_version();
   
  @@ -1880,7 +1880,11 @@
                   map_free(&conf->automount);
               if (conf->uw_map)
                   uri_worker_map_free(&conf->uw_map, conf->log);
  -            jk_close_file_logger(&conf->log);
  +            /* Since we are now using apache to do logging, this 
  +             * cleanup will just cause problems so don't do it
  +             *
  +             * jk_close_file_logger(&conf->log);
  +             */
           }
           s = s->next;
       }
  @@ -2023,7 +2027,7 @@
       return overrides;
   }
   
  -static int jk_log_to_file(jk_logger_t *l,
  +static int JK_METHOD jk_log_to_file(jk_logger_t *l,
                             int level,
                             const char *what)
   {
  
  
  

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