andya 2003/11/14 05:08:05
Modified:jk/native2/server/dsapi jk_dsapi_plugin.c
dsapi_redirector2.reg dsapi.dsp config.h
Added: jk/native2/server/dsapi INSTALL.txt BUILD.txt
Log:
Various changes, mainly cosmetic and some documentation now.
Revision ChangesPath
1.2 +229 -274
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_dsapi_plugin.c 13 Nov 2003 17:10:56 - 1.1
+++ jk_dsapi_plugin.c 14 Nov 2003 13:08:05 - 1.2
@@ -102,27 +102,6 @@
/* Domino DSAPI filter definitions */
#include dsapifilter.h
-#if !defined(DLLEXPORT)
-#if defined(WIN32) !defined(TESTING)
-#define DLLEXPORT __declspec(dllexport)
-#else
-#define DLLEXPORT
-#endif
-#endif
-
-/* Configuration tags */
-#define SERVER_ROOT_TAG (serverRoot)
-#define WORKER_FILE_TAG (workersFile)
-#define TOMCAT_START_TAG (tomcatStart)
-#define TOMCAT_STOP_TAG (tomcatStop)
-
-#define VERSION 2.0.0
-#define VERSION_STRING Jakarta/DSAPI/ VERSION
-
-#define FILTERDESC Apache Tomcat Interceptor ( VERSION_STRING
)
-
-#define SERVERDFLT Lotus Domino
-
#ifdef 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);
@@ -130,27 +109,22 @@
#define LOGGER logger.win32
#endif
-#define REGISTRY_LOCATIONSoftware\\Apache Software Foundation\\Jakarta Dsapi
Redirector\\2.0
-
-#define TOMCAT_STARTSTOP_TO 3 /* 30 seconds */
-
-#define CONTENT_LENGTH Content-length/* Name of CL header */
-
static char libFileName[MAX_PATH];
static char iniFileName[MAX_PATH];
-static int iniFileUsed = JK_FALSE;
-static int isInited = JK_FALSE;
+static int iniFileUsed = JK_FALSE;
+static int isInited= JK_FALSE;
static const char *tomcatStart = NULL;
static const char *tomcatStop= NULL;
static const char *workersFile = NULL;
static const char *serverRoot= NULL;
+static int tomcatTimeout = TOMCAT_STARTSTOP_TO;
+
+static const char *crlf = \r\n;
static jk_workerEnv_t *workerEnv;
static apr_pool_t *jk_globalPool;
-static const char *crlf = \r\n;
-
/* Per request private data */
typedef struct private_ws {
/* These get passed in by Domino and are used to access various
@@ -174,9 +148,9 @@
/* Case insentive memcmp() clone
*/
#ifdef HAVE_MEMICMP
-#define NoCaseMemCmp(ci, cj, l) _memicmp((void *) (ci), (void *) (cj), (l))
+#define noCaseMemCmp(ci, cj, l) _memicmp((void *) (ci), (void *) (cj), (l))
#else
-static int NoCaseMemCmp(const char *ci, const char *cj, int len) {
+static int noCaseMemCmp(const char *ci, const char *cj, int len) {
if (0 == memcmp(ci, cj, len)) {
return 0;
}
@@ -197,9 +171,9 @@
/* Case insentive strcmp() clone
*/
#ifdef HAVE_STRICMP
-#define NoCaseStrCmp(si, sj) _stricmp((void *) (si), (void *) (sj))
+#define noCaseStrCmp(si, sj) _stricmp((void *) (si), (void *) (sj))
#else
-static int NoCaseStrCmp(const char *si, const char *sj) {
+static int noCaseStrCmp(const char *si, const char *sj) {
if (0 == strcmp(si, sj)) {
return 0;
}
@@ -220,7 +194,7 @@
* plen length of pattern
* returns 1 if there's a match otherwise 0
*/
-static int FindPathElem(const char *str, int slen, const char *ptn, int plen) {
+static int scanPath(const char *str, int slen, const char *ptn, int plen) {
const char *sp = str;
while (slen = plen) {
@@ -230,7 +204,7 @@
* suspicion that a Windows hosted server might accept URIs
* containing \.
*/
- if (NoCaseMemCmp(sp, ptn, plen) == 0
+ if (noCaseMemCmp(sp, ptn, plen) == 0
(sp == str || sp[-1] == '\\' || sp[-1] == '/')
(slen == plen || sp[plen] == '\\' || sp[plen] == '/')) {
return 1;
@@ -258,6 +232,7 @@
}
#endif
+#ifdef _DEBUG
static void _printf(const char *msg, ...) {
char buf[512]; /* dangerous fixed size buffer */
va_list ap;
@@ -266,11 +241,12 @@
va_end(ap);
AddInLogMessageText(Debug: %s, NOERROR,
