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/isapi jk_isapi_plugin.c
Date Wed, 07 Nov 2001 21:46:28 GMT
costin      01/11/07 13:46:28

  Modified:    jk/native/netscape jk_nsapi_plugin.c
               jk/native/iis jk_isapi_plugin.c
               jk/native/isapi jk_isapi_plugin.c
  Log:
  Remove deps on ajp12, make ajp13 the new default.
  
  Revision  Changes    Path
  1.6       +3 -3      jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c
  
  Index: jk_nsapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_nsapi_plugin.c	2001/06/18 14:37:33	1.5
  +++ jk_nsapi_plugin.c	2001/11/07 21:46:28	1.6
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: NSAPI plugin for Netscape servers                          *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.5 $                                           *
  + * Version:     $Revision: 1.6 $                                           *
    ***************************************************************************/
   
   
  @@ -68,11 +68,11 @@
   #include "jk_pool.h"
   #include "jk_service.h"
   #include "jk_worker.h"
  -#include "jk_ajp12_worker.h"
   
   #include "nsapi.h"
   
   #define URI_PATTERN "path"
  +#define DEFAULT_WORKER_NAME ("ajp13")
   
   struct nsapi_private_data {
       jk_pool_t p;
  @@ -355,7 +355,7 @@
       }
   
       if(!worker_name) {
  -        worker_name = JK_AJP12_WORKER_NAME;
  +        worker_name = DEFAULT_WORKER_NAME;
       }
   
       worker = wc_get_worker_for_name(worker_name, logger);
  
  
  
  1.9       +3 -3      jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_isapi_plugin.c	2001/10/15 00:06:45	1.8
  +++ jk_isapi_plugin.c	2001/11/07 21:46:28	1.9
  @@ -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.8 $                                           *
  + * Version:     $Revision: 1.9 $                                           *
    ***************************************************************************/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -76,11 +76,11 @@
   #include "jk_pool.h"
   #include "jk_service.h"
   #include "jk_worker.h"
  -#include "jk_ajp12_worker.h"
   #include "jk_uri_worker_map.h"
   
   #define VERSION_STRING "Jakarta/ISAPI/1.0b1"
   
  +#define DEFAULT_WORKER_NAME ("ajp13")
   /*
    * We use special headers to pass values from the filter to the 
    * extension. These values are:
  @@ -1068,7 +1068,7 @@
           s->query_string = t;
       } else {
           s->query_string = private_data->lpEcb->lpszQueryString;
  -        *worker_name    = JK_AJP12_WORKER_NAME;
  +        *worker_name    = DEFAULT_WORKER_NAME;
           GET_SERVER_VARIABLE_VALUE("URL", s->req_uri);       
           if (unescape_url(s->req_uri) < 0)
               return JK_FALSE;
  
  
  
  1.2       +1 -2      jakarta-tomcat-connectors/jk/native/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_isapi_plugin.c	2001/06/25 09:16:22	1.1
  +++ jk_isapi_plugin.c	2001/11/07 21:46:28	1.2
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: ISAPI plugin for Tomcat                                    *
    * Author:      Andy Armstrong <andy@tagish.com>                           *
  - * Version:     $Revision: 1.1 $                                           *
  + * Version:     $Revision: 1.2 $                                           *
    ***************************************************************************/
   
   /* Based on the the server redirector which was, in turn, based on the IIS 
  @@ -81,7 +81,6 @@
   #include "jk_pool.h"
   #include "jk_service.h"
   #include "jk_worker.h"
  -#include "jk_ajp12_worker.h"
   #include "jk_uri_worker_map.h"
   
   #include <stdarg.h>
  
  
  

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