tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
Date Tue, 02 Apr 2002 19:10:43 GMT
costin      02/04/02 11:10:43

  Modified:    jk/native/apache-1.3 mod_jk.c
  Log:
  Port the change from apache2 - don't exit on jk error.
  
  Revision  Changes    Path
  1.24      +5 -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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- mod_jk.c	4 Dec 2001 19:51:01 -0000	1.23
  +++ mod_jk.c	2 Apr 2002 19:10:42 -0000	1.24
  @@ -61,7 +61,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    *              Dan Milstein <danmil@shore.net>                            *
    *              Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.23 $                                           *
  + * Version:     $Revision: 1.24 $                                           *
    ***************************************************************************/
   
   /*
  @@ -1305,9 +1305,9 @@
   #endif
               
   			/* we add the URI->WORKER MAP since workers using AJP14 will feed it */
  -			worker_env.uri_to_worker = conf->uw_map;
  +            worker_env.uri_to_worker = conf->uw_map;
               worker_env.virtual       = "*";     /* for now */
  -			worker_env.server_name   = (char *)ap_get_server_version();
  +            worker_env.server_name   = (char *)ap_get_server_version();
               if(wc_open(init_map, &worker_env, conf->log)) {
                   /* we don't need this any more so free it */
                   map_free(&init_map);
  @@ -1316,7 +1316,8 @@
           }
       }
       
  -    jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Error while opening the workers");
  +    aplog_error(APLOG_MARK, APLOG_ERR, NULL,
  +                "Error while opening the workers, jk will not work\n");
   }
   
   /*
  
  
  

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