cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c

[nacho]

nacho       02/05/18 15:43:27

  Modified:    jk/native2/common jk_worker_ajp13.c
  Log:
  *  Added check for a null uriEnv, IIS 2 phase process couldnt put a uriEnv in the 
service struct so was issuing a NPE
  
  Revision  Changes    Path
  1.24      +2 -2      jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
  
  Index: jk_worker_ajp13.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_worker_ajp13.c 16 May 2002 23:46:01 -0000      1.23
  +++ jk_worker_ajp13.c 18 May 2002 22:43:27 -0000      1.24
  @@ -621,7 +621,7 @@
       jk2_worker_ajp13_getEndpoint( env, w, &e );
   
   #ifdef HAS_APR
  -    if( s->uriEnv->timing == JK_TRUE ) {
  +    if( s->uriEnv!=NULL && s->uriEnv->timing == JK_TRUE ) {
           e->stats->startTime=s->startTime;
           e->stats->jkStartTime=e->stats->connectedTime=apr_time_now();
           if(e->stats->startTime==0)
  @@ -641,7 +641,7 @@
       }
   
   #ifdef HAS_APR
  -    if( s->uriEnv->timing == JK_TRUE ) {
  +    if( s->uriEnv!=NULL && s->uriEnv->timing == JK_TRUE ) {
           apr_time_t reqTime;
   
           e->stats->endTime=apr_time_now();
  
  
  

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