tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From <cost...@covalent.net>
Subject RE: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date Tue, 02 Apr 2002 15:52:30 GMT
I will apply the patch to 1.3.

Are we still maintaining the second copy of jk in 3.3 tree ? 

Larry - can we start removing the duplicated util and c code ?
IMHO the j-t-c code ( the 'native1' side ) is as stable as the 
one in 3.3, and it would simplify our life to deal with a single
one. 

Costin


> did somebody report these patches to apache 1.3 ?
> 
> -
> Henri Gomez                 ___[_]____
> EMAIL : hgomez@slib.fr        (. .)                     
> PGP KEY : 697ECEDD    ...oOOo..(_)..oOOo...
> PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 
> 
> 
> 
> >-----Original Message-----
> >From: costin@apache.org [mailto:costin@apache.org]
> >Sent: Tuesday, April 02, 2002 2:42 AM
> >To: jakarta-tomcat-connectors-cvs@apache.org
> >Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0
> >mod_jk.c
> >
> >
> >costin      02/04/01 16:42:11
> >
> >  Modified:    jk/native/apache-2.0 mod_jk.c
> >  Log:
> >  If jk config is broken, report the error - but don't exit.
> >  
> >  Revision  Changes    Path
> >  1.41      +4 -4      
> >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.40
> >  retrieving revision 1.41
> >  diff -u -r1.40 -r1.41
> >  --- mod_jk.c	28 Feb 2002 22:45:50 -0000	1.40
> >  +++ mod_jk.c	2 Apr 2002 00:42:11 -0000	1.41
> >  @@ -60,7 +60,7 @@
> >    * Description: Apache 2 plugin for Jakarta/Tomcat          
> >               *
> >    * Author:      Gal Shachor <shachor@il.ibm.com>            
> >               *
> >    *                 Henri Gomez <hgomez@slib.fr>             
> >                  *
> >  - * Version:     $Revision: 1.40 $                           
> >                *
> >  + * Version:     $Revision: 1.41 $                           
> >                *
> >    
> >***************************************************************
> >************/
> >   
> >   /*
> >  @@ -1507,9 +1507,9 @@
> >       /*     if(map_alloc(&init_map)) { */
> >       if( ! map_read_properties(init_map, conf->worker_file)) {
> >           if( map_size( init_map ) == 0 ) {
> >  -            jk_error_exit(APLOG_MARK, APLOG_EMERG, s, 
> >  -                          pconf, "No worker file and no 
> >worker options in httpd.conf \n"
> >  -                          "use JkWorkerFile or JkWorker to 
> >set workers");
> >  +            ap_log_error(APLOG_MARK, APLOG_STARTUP | 
> >APLOG_NOERRNO, APLOG_EMERG, 
> >  +                         NULL, "No worker file and no 
> >worker options in httpd.conf \n"
> >  +                          "use JkWorkerFile to set workers\n");
> >               return;
> >           }
> >       }
> >  
> >  
> >  
> >
> >--
> >To unsubscribe, e-mail:   
> <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
> For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>
> 
> 
> --
> To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
> For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>
> 
> 


--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message