cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi jk_dsapi_plugin.c

2004-04-29 Thread andya
andya   2004/04/29 05:22:38

  Modified:jk/native2/server/dsapi jk_dsapi_plugin.c
  Log:
  Switched to parsing hostname, port directly from the request header because it seems 
that the Domino GetServerVariable() API clobbers the Remote_User CGI variable and 
maybe others. This meant that Remote_User was unavailable to Domino for all requests 
not handled by the redirector.
  
  Revision  ChangesPath
  1.10  +21 -11
jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c
  
  Index: jk_dsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jk_dsapi_plugin.c 28 Apr 2004 15:06:46 -  1.9
  +++ jk_dsapi_plugin.c 29 Apr 2004 12:22:38 -  1.10
  @@ -834,6 +834,7 @@
   int rc;
   FilterRequest fr;
   int result = kFilterNotHandled;
  +char *h = NULL;
   
   /* TODO: presumably this return code should be checked */
   rc = context-GetRequest(context, fr, errID);
  @@ -844,6 +845,7 @@
   jk_uriEnv_t *uriEnv = NULL;
   int errID;
   char buf[256];  /* enough for the server's name */
  +char *colon;
   char *serverName;
   size_t serverNameSz;
   int serverPort;
  @@ -853,19 +855,27 @@
   
   /* env-l-jkLog(env, env-l, JK_LOG_DEBUG, parsedRequest() - %s\n, uri); 
*/
   
  -if (!context-GetServerVariable(context, SERVER_PORT, buf, sizeof(buf), 
errID)) {
  -return rejectWithError(context, Failed to retrieve SERVER_PORT);
  +/* We used to call the context-GetServerVariable() API here but doing so
  + * seems to clobber some of the server's CGI variables in the case where
  + * we don't handle the request.
  + *
  + * Note also that we're using a static buffer for the host header. 
Presumably
  + * hostnames longer than 255 characters are either rare or illegal and 
there's
  + * no buffer overrun risk because Domino errors if the supplied buffer is 
too
  + * small.
  + */
  +if (!reqData-GetHeader(context, host, buf, sizeof(buf), errID)) {
  +return rejectWithError(context, Failed to retrieve host);
   }
   
  -serverPort = atoi(buf);
  -
  -if (!context-GetServerVariable(context, SERVER_NAME, buf, sizeof(buf), 
errID)) {
  -return rejectWithError(context, Failed to retrieve SERVER_NAME);
  +serverName = buf;
  +/* Parse out the port number */
  +if (colon = strchr(serverName, ':'), NULL != colon) {
  +*colon++ = '\0';
  +serverPort = atoi(colon);
  +} else {
  +serverPort = 80;
   }
  -
  -serverName = buf;   /* note serverName just aliases buf
  - * and will be destroyed if buf is reused
  - */
   
   serverNameSz = strlen(serverName) + 1;
   
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi jk_dsapi_plugin.c

2004-04-29 Thread andya
andya   2004/04/29 10:25:32

  Modified:jk/native2/server/dsapi jk_dsapi_plugin.c
  Log:
  Minor changes to remove warnings.
  
  Revision  ChangesPath
  1.12  +24 -13
jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c
  
  Index: jk_dsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_dsapi_plugin.c 29 Apr 2004 17:05:17 -  1.11
  +++ jk_dsapi_plugin.c 29 Apr 2004 17:25:32 -  1.12
  @@ -27,6 +27,7 @@
   #include stdio.h
   #include string.h
   #include ctype.h
  +#include stdarg.h
   
   /* If we're building under Windows get windows.h. This must be included
* before any APR includes because APR itself does a #include windows.h
  @@ -109,6 +110,19 @@
   
   } private_ws_t;
   
  +#if defined(TESTING)
  +static void AddInLogMessageText(char *fmt, unsigned short err, ...) {
  + va_list ap;
  + va_start(ap, err);
  +
  + printf(Debug: );
  + vprintf(fmt, ap);
  + printf(\n);
  +
  + va_end(ap);
  +}
  +#endif
  +
   /* Case insentive memcmp() clone
*/
   #ifdef HAVE_MEMICMP
  @@ -648,20 +662,19 @@
   
   /* Get the info from the lookup buffer
*/
  -static int getLookupInfo(FilterContext *context, char *pMatch, int itemNumber, char 
**pInfo, int *pInfoLen) {
  +static int getLookupInfo(FilterContext *context, char *pMatch, WORD itemNumber, 
char **pInfo) {
   unsigned int reserved = 0;
   unsigned int errID;
   char *pValue = NULL;
   WORD lValue, type;
   STATUS error;
   
  -if (NULL == pMatch || NULL == pInfo || NULL == pInfoLen || (itemNumber  0)) {
  +if (NULL == pMatch || NULL == pInfo || (itemNumber  0)) {
   return -1;
   }
   
   /* Initialize output */
   *pInfo = NULL;
  -*pInfoLen = 0;
   
   /* Check the type and length of the info */
   pValue = (char *) NAMELocateItem(pMatch, itemNumber, type, lValue);
  @@ -671,6 +684,7 @@
   }
   
   lValue -= sizeof(WORD); /* remove datatype word included in the list length */
  + lValue++; /* Include length of terminator */
   
   /* check the value type */
   if (type != TYPE_TEXT_LIST  type != TYPE_TEXT) {
  @@ -678,13 +692,12 @@
   }
   
   /* Allocate space for the info. This memory will be freed automatically when 
the thread terminates */
  -if (*pInfo = context-AllocMem(context, lValue+1, reserved, errID), NULL == 
*pInfo) {
  +if (*pInfo = context-AllocMem(context, lValue, reserved, errID), NULL == 
*pInfo) {
   return -1;
   }
   
   /* Get the info */
  -if (error = NAMEGetTextItem(pMatch, itemNumber, 0, *pInfo, lValue + 1), !error) 
{
  -*pInfoLen = lValue + 1;
  +if (error = NAMEGetTextItem(pMatch, itemNumber, 0, *pInfo, lValue), !error) {
   return 0;
   }
   
  @@ -693,7 +706,7 @@
   
   /* Lookup the user and return the user's full name
*/
  -static int getUserName(FilterContext *context, char *userName, char **pUserName, 
int *pUserNameLen) {
  +static int getUserName(FilterContext *context, char *userName, char **pUserName) {
   STATUS error = NOERROR;
   HANDLE hLookup = NULLHANDLE;
   unsigned short nMatches = 0;
  @@ -702,13 +715,12 @@
   char *pMatch = NULL;
   int rc = -1;
   
  -if (NULL == userName || NULL == pUserName || NULL == pUserNameLen) {
  +if (NULL == userName || NULL == pUserName) {
   return rc;
   }
   
   /* Initializae output */
   *pUserName = NULL;
  -*pUserNameLen = 0;
   
   /* do the name lookup */
   error = NAMELookup(NULL, 0, 1, $Users, 1, userName, 2, FullName, hLookup);
  @@ -732,7 +744,7 @@
   }
   
   /* Get the full name from the info we got back */
  -if (getLookupInfo(context, pMatch, 0, pUserName, pUserNameLen)) {
  +if (getLookupInfo(context, pMatch, 0, pUserName)) {
   goto done;
   }
   
  @@ -850,8 +862,7 @@
   
   /* If the REMOTE_USER CGI variable doesn't work try asking Domino */
   if (s-remote_user[0] == '\0'  fr-userName[0] != '\0') {
  -int len;
  -getUserName(ws-context, fr-userName, s-remote_user, len);
  +getUserName(ws-context, fr-userName, s-remote_user);
   }
   
   GETVARIABLE(SERVER_PROTOCOL, s-protocol, );
  
  
  

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



RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi jk_dsapi_plugin.c

2004-04-29 Thread help
This is a computer-generated response confirming that your e-mail
message was received by There. Please do not respond to this message.

Thank you for contacting us. We will make every effort to respond to
your message as soon as possible.

Please do not send multiple e-mail messages (regarding the same
subject) before you have received a response as this can cause confusion and
possibly delay our response to you.

Our Customer Support team is also available via the Live Help link on There
Central, from the Help link on www.there.com, or in-world (Get HelpThere
Live Help).  Live Help is available M-F, 2-8pm PT.

Thank You,

There Customer Support

[THREAD ID: 1-1R8G1F]

-Original Message-
From: [EMAIL PROTECTED]
Sent: 4/29/2004 10:25:32 AM
To: [EMAIL PROTECTED]
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi 
jk_dsapi_plugin.c   

andya   2004/04/29 10:25:32

  Modified:jk/native2/server/dsapi jk_dsapi_plugin.c
  Log:
  Minor changes to remove warnings.
  
  Revision  ChangesPath
  1.12  +24 -13
jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c
  
  Index: jk_dsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_dsapi_plugin.c 29 Apr 2004 17:05:17 -  1.11
  +++ jk_dsapi_plugin.c 29 Apr 2004 17:25:32 -  1.12
  @@ -27,6 +27,7 @@
   #include stdio.h
   #include string.h
   #include ctype.h
  +#include stdarg.h
   
   /* If we're building under Windows get windows.h. This must be included
* before any APR includes because APR itself does a #include windows.h
  @@ -109,6 +110,19 @@
   
   } private_ws_t;
   
  +#if defined(TESTING)
  +static void AddInLogMessageText(char *fmt, unsigned short err, ...) {
  + va_list ap;
  + va_start(ap, err);
  +
  + printf(Debug: );
  + vprintf(fmt, ap);
  + printf(\n);
  +
  + va_end(ap);
  +}
  +#endif
  +
   /* Case insentive memcmp() clone
*/
   #ifdef HAVE_MEMICMP
  @@ -648,20 +662,19 @@
   
   /* Get the info from the lookup buffer
*/
  -static int getLookupInfo(FilterContext *context, char *pMatch, int itemNumber, char 
**pInfo, int *pInfoLen) {
  +static int getLookupInfo(FilterContext *context, char *pMatch, WORD itemNumber, 
char **pInfo) {
   unsigned int reserved = 0;
   unsigned int errID;
   char *pValue = NULL;
   WORD lValue, type;
   STATUS error;
   
  -if (NULL == pMatch || NULL == pInfo || NULL == pInfoLen || (itemNumber  0)) {
  +if (NULL == pMatch || NULL == pInfo || (itemNumber  0)) {
   return -1;
   }
   
   /* Initialize output */
   *pInfo = NULL;
  -*pInfoLen = 0;
   
   /* Check the type and length of the info */
   pValue = (char *) NAMELocateItem(pMatch, itemNumber, type, lValue);
  @@ -671,6 +684,7 @@
   }
   
   lValue -= sizeof(WORD); /* remove datatype word included in the list length */
  + lValue++; /* Include length of terminator */
   
   /* check the value type */
   if (type != TYPE_TEXT_LIST  type != TYPE_TEXT) {
  @@ -678,13 +692,12 @@
   }
   
   /* Allocate space for the info. This memory will be freed automatically when 
the thread terminates */
  -if (*pInfo = context-AllocMem(context, lValue+1, reserved, errID), NULL == 
*pInfo) {
  +if (*pInfo = context-AllocMem(context, lValue, reserved, errID), NULL == 
*pInfo) {
   return -1;
   }
   
   /* Get the info */
  -if (error = NAMEGetTextItem(pMatch, itemNumber, 0, *pInfo, lValue + 1), !error) 
{
  -*pInfoLen = lValue + 1;
  +if (error = NAMEGetTextItem(pMatch, itemNumber, 0, *pInfo, lValue), !error) {
   return 0;
   }
   
  @@ -693,7 +706,7 @@
   
   /* Lookup the user and return the user's full name
*/
  -static int getUserName(FilterContext *context, char *userName, char **pUserName, 
int *pUserNameLen) {
  +static int getUserName(FilterContext *context, char *userName, char **pUserName) {
   STATUS error = NOERROR;
   HANDLE hLookup = NULLHANDLE;
   unsigned short nMatches = 0;
  @@ -702,13 +715,12 @@
   char *pMatch = NULL;
   int rc = -1;
   
  -if (NULL == userName || NULL == pUserName || NULL == pUserNameLen) {
  +if (NULL == userName || NULL == pUserName) {
   return rc;
   }
   
   /* Initializae output */
   *pUserName = NULL;
  -*pUserNameLen = 0;
   
   /* do the name lookup */
   error = NAMELookup(NULL, 0, 1, $Users, 1, userName, 2, FullName, hLookup);
  @@ -732,7 +744,7 @@
   }
   
   /* Get the full name from the info we got back */
  -if (getLookupInfo(context, pMatch, 0, pUserName, pUserNameLen)) {
  +if (getLookupInfo(context, pMatch, 0, pUserName)) {
   goto done;
   }
   
  @@ -850,8 +862,7

cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi jk_dsapi_plugin.c

2004-04-29 Thread andya
andya   2004/04/29 10:37:32

  Modified:jk/native2/server/dsapi jk_dsapi_plugin.c
  Log:
  More minor tidying up.
  
  Revision  ChangesPath
  1.13  +12 -11
jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c
  
  Index: jk_dsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jk_dsapi_plugin.c 29 Apr 2004 17:25:32 -  1.12
  +++ jk_dsapi_plugin.c 29 Apr 2004 17:37:32 -  1.13
  @@ -112,14 +112,14 @@
   
   #if defined(TESTING)
   static void AddInLogMessageText(char *fmt, unsigned short err, ...) {
  - va_list ap;
  - va_start(ap, err);
  +va_list ap;
  +va_start(ap, err);
   
  - printf(Debug: );
  - vprintf(fmt, ap);
  - printf(\n);
  +printf(Debug: );
  +vprintf(fmt, ap);
  +printf(\n);
   
  - va_end(ap);
  +va_end(ap);
   }
   #endif
   
  @@ -648,8 +648,9 @@
   diagnostic = Unspecified error;
   }
   
  -// This assumes that we're just going to expand the diagnostic into
  -// the page body.
  +/* This assumes that we're just going to expand the diagnostic into
  + * the page body.
  + */
   bufSz = strlen(msg) + strlen(diagnostic) + 1;
   
   mbuf = context-AllocMem(context, bufSz, 0, errID);
  @@ -669,7 +670,7 @@
   WORD lValue, type;
   STATUS error;
   
  -if (NULL == pMatch || NULL == pInfo || (itemNumber  0)) {
  +if (NULL == pMatch || NULL == pInfo) {
   return -1;
   }
   
  @@ -684,7 +685,7 @@
   }
   
   lValue -= sizeof(WORD); /* remove datatype word included in the list length */
  - lValue++; /* Include length of terminator */
  +lValue++; /* Include length of terminator */
   
   /* check the value type */
   if (type != TYPE_TEXT_LIST  type != TYPE_TEXT) {
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi jk_dsapi_plugin.c dsapifilter.h config.h

2004-04-28 Thread andya
andya   2004/04/28 08:06:47

  Modified:jk/native2/server/dsapi jk_dsapi_plugin.c dsapifilter.h
config.h
  Log:
  Removed notesapi dependencies and NO_CAPI switch.
  
  Revision  ChangesPath
  1.9   +6 -29 
jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c
  
  Index: jk_dsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_dsapi_plugin.c 29 Mar 2004 14:13:36 -  1.8
  +++ jk_dsapi_plugin.c 28 Apr 2004 15:06:46 -  1.9
  @@ -49,25 +49,16 @@
   #include jk_worker.h
   #include apr_general.h
   
  -#ifndef NO_CAPI
  -/* Domino stuff */
  -#include global.h
  -#include addin.h
  -#else
  -#include stdarg.h
  -#define NOERROR 0
  -#endif
  -
   /* Domino DSAPI filter definitions */
   #include dsapifilter.h
   
  +int JK_METHOD jk2_logger_domino_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t 
*result, const char *type, const char *name);
  +
   #if defined(TESTING)
   #define LOGGER  logger.printf
   int JK_METHOD jk2_logger_printf_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t 
*result, const char *type, const char *name);
  -#elif defined(WIN32)
  -#define LOGGER  logger.win32
   #else
  -#define LOGGER  logger.file
  +#define LOGGER  logger.domino
   #endif
   
   #ifdef WIN32
  @@ -184,22 +175,6 @@
   return 0;
   }
   
  -#ifdef NO_CAPI
  -/* Alternative to the Domino function */
  -static void AddInLogMessageText(char *msg, unsigned short code, ...) {
  -va_list ap;
  -
  -if (code != NOERROR) {
  -printf(Error %d: , code);
  -}
  -
  -va_start(ap, code);
  -vprintf(msg, ap);
  -va_end(ap);
  -printf(\n);
  -}
  -#endif
  -
   #ifdef _DEBUG
   static void _printf(const char *msg, ...) {
   char buf[512];  /* dangerous fixed size buffer */
  @@ -1118,6 +1093,8 @@
*/
   #ifdef TESTING
   env-registerFactory(env, logger.printf, jk2_logger_printf_factory);
  +#else
  +env-registerFactory(env, logger.domino, jk2_logger_domino_factory );
   #endif
   
   jkb = env-createBean2(env, env-globalPool, LOGGER, );
  
  
  
  1.2   +195 -317  jakarta-tomcat-connectors/jk/native2/server/dsapi/dsapifilter.h
  
  Index: dsapifilter.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/dsapifilter.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dsapifilter.h 13 Nov 2003 17:10:56 -  1.1
  +++ dsapifilter.h 28 Apr 2004 15:06:47 -  1.2
  @@ -1,329 +1,207 @@
  -/*
  +/*
  + * Copyright 1999-2001,2004 The Apache Software Foundation.
*
  - *  File:  dsapifilter.h
  + * Licensed under the Apache License, Version 2.0 (the License);
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
*
  - *  Copyright (c)1999 Iris Associates
  + *  http://www.apache.org/licenses/LICENSE-2.0
*
  - *---*/
  -
  -#if !defined(DSAPIFILTER_H)
  -#define DSAPIFILTER_H
  -
  -#ifdef __cplusplus
  -extern C
  -{
  -#endif
  -
  -/*---
  - *  Types and Defines
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an AS IS BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
*/
   
  -#define kInterfaceVersion   2
  -#define kMaxFilterDesc   255
  -
  - typedef unsigned char LMBCS;
  -
  - typedef enum
  - {
  - kFilterNotHandled = 0,
  - kFilterHandledRequest = 1,
  - kFilterHandledEvent = 2,
  - kFilterError = 3
  - }
  - FilterReturnCode;
  -
  -/*--
  - *  Filter interface
  - */
  -
  -/*---
  -*  events to register for
  -*/
  - typedef enum
  - {
  - kFilterRawRequest = 0x01,
  - kFilterParsedRequest = 0x02,
  - kFilterAuthUser = 0x04,
  - kFilterUserNameList = 0x08,
  - kFilterMapURL = 0x10,
  - kFilterResponse = 0x20,
  - kFilterRawWrite = 0x40,
  - kFilterEndRequest = 0x80,
  - kFilterAny = 0xFF
  - }
  - EventFlags;
  -
  -/*---
  - *  filter initialization data
  - */
  - typedef struct
  - {
  - unsigned int serverFilterVersion;
  - unsigned int appFilterVersion;
  - unsigned int eventFlags;
  - 

cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi jk_dsapi_plugin.c

2004-03-29 Thread andya
andya   2004/03/29 06:13:36

  Modified:jk/native2/server/dsapi jk_dsapi_plugin.c
  Log:
  Fixed silly SR related typo.
  
  Revision  ChangesPath
  1.8   +3 -3  
jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c
  
  Index: jk_dsapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_dsapi_plugin.c 26 Mar 2004 13:52:39 -  1.7
  +++ jk_dsapi_plugin.c 29 Mar 2004 14:13:36 -  1.8
  @@ -516,7 +516,7 @@
   LONG rc;
   char *val;
   
  -rc = RegQueryValueEx(hkey, key, (LPunsigned int) 0, type, NULL, sz);
  +rc = RegQueryValueEx(hkey, key, (unsigned int) 0, type, NULL, sz);
   if (rc != ERROR_SUCCESS || type != REG_SZ) {
   return NULL;
   }
  @@ -525,7 +525,7 @@
   return NULL;
   }
   
  -rc = RegQueryValueEx(hkey, key, (LPunsigned int) 0, type, val, sz);
  +rc = RegQueryValueEx(hkey, key, (unsigned int) 0, type, val, sz);
   if (rc == ERROR_SUCCESS) {
   return makeAbsolutePath(env, base, val);
   }
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi jk_dsapi_plugin.c

2004-02-24 Thread hgomez
hgomez  2004/02/24 00:44:43

  Modified:jk/native2/include jk_env.h jk_worker.h jk_logger.h jk_msg.h
jk_requtil.h jk_md5.h jk_pool.h jk_map.h
jk_channel.h jk_shm.h jk_bean.h jk_uriEnv.h
jk_global.h jk_config.h jk_handler.h jk_service.h
jk_objCache.h jk_workerEnv.h jk_uriMap.h
jk_endpoint.h jk_vm.h jk_mutex.h
   jk/native2/common jk_logger_win32.c jk_shm.c jk_channel_un.c
jk_mutex_thread.c jk_workerEnv.c jk_worker_run.c
jk_user.c jk_vm_default.c jk_logger_file.c
jk_pool_apr.c jk_uriMap.c jk_nwmain.c jk_mutex.c
jk_msg_ajp.c jk_requtil.c jk_mutex_proc.c
jk_config_file.c jk_channel.c jk_channel_jni.c
jk_signal.c jk_env.c jk_worker_jni.c
jk_handler_response.c jk_registry.h jk_objCache.c
jk_registry.c jk_worker_lb.c
jk_channel_apr_socket.c jk_md5.c jk_uriEnv.c
jk_map.c jk_endpoint.c jk_config.c
jk_handler_logon.c jk_worker_ajp13.c
jk_worker_status.c
   jk/native2/server/aolserver jk_ns.h jk_logger_ns.c
jk_service_ns.c nsjk2.c
   jk/native2/server/apache13 mod_jk2.c jk_service_apache13.c
   jk/native2/server/isapi jk_isapi_plugin.c
jk_iis_thread_pool.c jk_iis.h jk_service_iis.c
   jk/native2/jni jk_jni_aprImpl.c
   jk/native2/server/dsapi/test test.c printf_logger.c
   jk/native2/server/apache2 jk_service_apache2.c
jk_logger_apache2.c mod_jk2.c jk_map_aprtable.c
jk_apache2.h
   jk/native2 CHANGES.txt
   jk/native2/server/dsapi jk_dsapi_plugin.c
  Log:
  Update to Apache License 2.0.

  Move the LB recovery strategy to env area.

  

  
  Revision  ChangesPath
  1.23  +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_env.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_env.h.diff?r1=1.22r2=1.23
  
  
  1.34  +16 -62jakarta-tomcat-connectors/jk/native2/include/jk_worker.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h.diff?r1=1.33r2=1.34
  
  
  1.10  +16 -57jakarta-tomcat-connectors/jk/native2/include/jk_logger.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_logger.h.diff?r1=1.9r2=1.10
  
  
  1.16  +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_msg.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h.diff?r1=1.15r2=1.16
  
  
  1.10  +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h.diff?r1=1.9r2=1.10
  
  
  1.3   +16 -58jakarta-tomcat-connectors/jk/native2/include/jk_md5.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_md5.h.diff?r1=1.2r2=1.3
  
  
  1.11  +16 -57jakarta-tomcat-connectors/jk/native2/include/jk_pool.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_pool.h.diff?r1=1.10r2=1.11
  
  
  1.18  +16 -57jakarta-tomcat-connectors/jk/native2/include/jk_map.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_map.h.diff?r1=1.17r2=1.18
  
  
  1.20  +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_channel.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_channel.h.diff?r1=1.19r2=1.20
  
  
  1.9   +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_shm.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_shm.h.diff?r1=1.8r2=1.9
  
  
  1.10  +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_bean.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_bean.h.diff?r1=1.9r2=1.10
  
  
  1.21  +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_uriEnv.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_uriEnv.h.diff?r1=1.20r2=1.21
  
  
  1.22  +34 -57jakarta-tomcat-connectors/jk/native2/include/jk_global.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h.diff?r1=1.21r2=1.22
  
  
  1.11  +15 -56jakarta-tomcat-connectors/jk/native2/include/jk_config.h
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat-connectors/jk/native2/include/jk_config.h.diff?r1=1.10r2=1.11
  
  
  1.9   +15 -57jakarta-tomcat-connectors/jk/native2/include/jk_handler.h