tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
Date Sun, 28 Apr 2002 00:23:42 GMT
nacho       02/04/27 17:23:42

  Modified:    jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Log:
  * Some last bugs, correctly initalizing things, starting the response, and workerEnv correctly
  
  * It seems that isapi_redirector2.dll based on jk2 has started to exist at this point ;),
briefly tested against tc33 old ajp13, and works nicely :)..
  
  Revision  Changes    Path
  1.11      +3 -9      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_isapi_plugin.c	27 Apr 2002 00:48:33 -0000	1.10
  +++ jk_isapi_plugin.c	28 Apr 2002 00:23:42 -0000	1.11
  @@ -60,7 +60,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Larry Isaacs <larryi@apache.org>                           *
    * Author:      Ignacio J. Ortega <nacho@apache.org>                       *
  - * Version:     $Revision: 1.10 $                                           *
  + * Version:     $Revision: 1.11 $                                           *
    ***************************************************************************/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -485,7 +485,7 @@
           rPool->reset(env, rPool);
           
           rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool );
  -        
  +        rc=HSE_STATUS_SUCCESS;
           lpEcb->dwHttpStatusCode = HTTP_STATUS_OK;
           env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
                  "HttpExtensionProc service() returned OK\n");
  @@ -567,6 +567,7 @@
       env->l->jkLog(env, env->l,  JK_LOG_DEBUG, "Using server root %s.\n", server_root);
       env->l->jkLog(env, env->l,  JK_LOG_DEBUG, "Using worker file %s.\n", worker_file);
       env->l->jkLog(env, env->l,  JK_LOG_DEBUG, "Using uri select %d.\n", uri_select_option);
  +    workerEnv->init(env,workerEnv);
       return rc;
   }
   
  @@ -787,13 +788,6 @@
       }
   
       env->l->jkLog(env, env->l, JK_LOG_ERROR, "JK2 Config Created");
  -
  -    jkb = workerEnv->globalEnv->createBean2( workerEnv->globalEnv,
  -                                             workerEnv->pool,
  -                                             "uri", NULL );
  -    newUri=jkb->object;
      
  -    newUri->workerEnv=workerEnv;
  -    
       return env;
   }
  
  
  
  1.12      +2 -5      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_service_iis.c	27 Apr 2002 00:48:33 -0000	1.11
  +++ jk_service_iis.c	28 Apr 2002 00:23:42 -0000	1.12
  @@ -98,10 +98,6 @@
           return JK_ERR;
       }
       
  -    if (!s->response_started) {
  -        return JK_OK;
  -    }
  -
       if( lpEcb == NULL ) {
           env->l->jkLog(env,env->l, JK_LOG_ERROR, 
                         "jk_ws_service_t::start_response, no lpEcp\n");
  @@ -320,6 +316,8 @@
       s->ssl_session  = NULL;
       s->ssl_key_size = -1;
   
  +    jk2_map_default_create(env, &s->headers_out, s->pool );
  +    jk2_map_default_create(env, &s->attributes, s->pool );
       jk2_map_default_create(env, &s->headers_in, s->pool );
   //    s->headers_values   = NULL;
   //  s->num_headers      = 0;
  @@ -420,7 +418,6 @@
               
               cnt -= 2; /* For our two special headers */
               /* allocate an extra header slot in case we need to add a content-length header
*/
  -            jk2_map_default_create(env, &s->headers_in, s->pool );
               for(i = 0, tmp = headers_buf ; *tmp && i < cnt ; ) {
                   int real_header = JK_TRUE;
                   char *headerName;
  
  
  

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