cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c

[nacho]

nacho       02/05/18 15:40:48

  Modified:    jk/native2/server/isapi jk_service_iis.c
  Log:
  * Now i_r2.dll starts jk when the filter is first loaded, and later when first used 
reads the config file and continues..
  * Added properies file config in addition to Rehistry one
  * Changed names of Regitry and properties init settings to match wk2.p file ones 
server_root->serverRoot and so on..
  
  Revision  Changes    Path
  1.16      +21 -7     
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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_service_iis.c  10 May 2002 23:15:35 -0000      1.15
  +++ jk_service_iis.c  18 May 2002 22:40:47 -0000      1.16
  @@ -90,7 +90,7 @@
       int headerCount;
       
       env->l->jkLog(env,env->l, JK_LOG_DEBUG, 
  -                  "Into jk_ws_service_t::start_response\n");
  +                  "Into jk_ws_service_t::head\n");
   
       if (s->status< 100 || s->status > 1000) {
           env->l->jkLog(env,env->l, JK_LOG_ERROR, 
  @@ -100,7 +100,7 @@
       
       if( lpEcb == NULL ) {
           env->l->jkLog(env,env->l, JK_LOG_ERROR, 
  -                      "jk_ws_service_t::start_response, no lpEcp\n");
  +                      "jk_ws_service_t::head, no lpEcp\n");
           return JK_ERR;
       }
       
  @@ -109,7 +109,7 @@
       /*
        * Create the status line
        */
  -    if (!s->msg) {
  +    if (s->msg==NULL) {
           reason = "";
       } else {
           reason = s->msg;
  @@ -154,7 +154,7 @@
                                         (LPDWORD)&len_of_status,
                                         (LPDWORD)headers_str)) {
           env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  -                      "jk_ws_service_t::start_response, ServerSupportFunction 
failed\n");
  +                      "jk_ws_service_t::head, ServerSupportFunction failed\n");
           return JK_ERR;
       }       
       
  @@ -317,9 +317,23 @@
       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 );
  +    if (JK_OK!=jk2_map_default_create(env, &s->headers_out, s->pool )){
  +        env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  +               "jk_ws_service_t::init, Failed to create headers_out map \n");
  +        return JK_ERR;
  +
  +    }
  +    if (JK_OK!=jk2_map_default_create(env, &s->attributes, s->pool )){
  +        env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  +               "jk_ws_service_t::init, Failed to create attributes map \n");
  +        return JK_ERR;
  +
  +    }
  +    if (JK_OK!=jk2_map_default_create(env, &s->headers_in, s->pool )){
  +        env->l->jkLog(env, env->l, JK_LOG_ERROR, 
  +               "jk_ws_service_t::init, Failed to create headers_in map \n");
  +        return JK_ERR;
  +    }
   //    s->headers_values   = NULL;
   //  s->num_headers      = 0;
       
  
  
  

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