Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 23994 invoked from network); 7 Nov 2001 21:58:20 -0000 Received: from unknown (HELO osaka.betaversion.org) (192.18.49.133) by daedalus.apache.org with SMTP; 7 Nov 2001 21:58:20 -0000 Received: (qmail 11785 invoked from network); 7 Nov 2001 22:00:53 -0000 Received: from nagoya.betaversion.org (192.18.49.131) by osaka.betaversion.org with SMTP; 7 Nov 2001 22:00:53 -0000 Received: (qmail 23452 invoked by uid 97); 7 Nov 2001 21:58:09 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 23436 invoked by uid 97); 7 Nov 2001 21:58:08 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 23425 invoked by uid 97); 7 Nov 2001 21:58:08 -0000 Date: 7 Nov 2001 21:46:28 -0000 Message-ID: <20011107214628.50148.qmail@icarus.apache.org> From: costin@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/isapi jk_isapi_plugin.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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 * - * 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 * * Author: Larry Isaacs * * Author: Ignacio J. Ortega * - * 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 * - * 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 -- To unsubscribe, e-mail: For additional commands, e-mail: