cvs commit: jakarta-tomcat-connectors/jk/src/native/iis jk_isapi_plugin.c

[hgomez]

hgomez      01/06/08 07:38:53

  Modified:    jk/src/native/iis jk_isapi_plugin.c
  Log:
  Updated params passed at worker init (ajp14 login/autoconf purposes)
  
  Revision  Changes    Path
  1.3       +7 -2      jakarta-tomcat-connectors/jk/src/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_isapi_plugin.c 2001/06/07 14:13:11     1.2
  +++ jk_isapi_plugin.c 2001/06/08 14:38:48     1.3
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: ISAPI plugin for IIS/PWS                                   *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
  - * Version:     $Revision: 1.2 $                                               *
  + * Version:     $Revision: 1.3 $                                               *
    ***************************************************************************/
   
   #include <httpext.h>
  @@ -129,6 +129,8 @@
   static char worker_file[MAX_PATH * 2];
   static char worker_mount_file[MAX_PATH * 2];
   
  +static jk_worker_env_t worker_env;
  +
   struct isapi_private_data {
       jk_pool_t p;
       
  @@ -640,7 +642,9 @@
               if(map_alloc(&map)) {
                   if(map_read_properties(map, worker_file)) {
                                        /* we add the URI->WORKER MAP since workers 
using AJP14 will feed it */
  -                    if(wc_open(map, uw_map, logger)) {
  +                                     worker_env.uri_to_worker = uw_map;
  +                                     GET_SERVER_VARIABLE_VALUE("SERVER_SOFTWARE", 
worker_end.server_name);
  +                    if(wc_open(map, worker_env, logger)) {
                           rc = JK_TRUE;
                       }
                   }
  @@ -794,6 +798,7 @@
       s->ssl_cert_len = 0;
       s->ssl_cipher   = NULL;
       s->ssl_session  = NULL;
  +     s->ssl_keysize  = -1;
   
       s->headers_names    = NULL;
       s->headers_values   = NULL;