andya 01/06/28 11:45:41
Modified: jk/native/domino tomcat_redirector.reg Makefile
jk_dsapi_plugin.c dsapifilter.h
Log:
Fixed more line end weirdness (what /is/ wrong with Visual Studio?) and added -fPIC
to CCFLAGS in Makefile which helps things along on Solaris.
Revision Changes Path
1.2 +9 -9 jakarta-tomcat-connectors/jk/native/domino/tomcat_redirector.reg
Index: tomcat_redirector.reg
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/domino/tomcat_redirector.reg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat_redirector.reg 2001/06/01 08:49:25 1.1
+++ tomcat_redirector.reg 2001/06/28 18:45:39 1.2
@@ -1,9 +1,9 @@
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Dsapi
Redirector\1.0]
-"log_file"="D:\\tomcat\\logs\\domino.log"
-"log_level"="debug"
-"worker_file"="D:\\tomcat\\conf\\workers.properties"
-"worker_mount_file"="D:\\tomcat\\conf\\uriworkermap.properties"
-"tomcat_start"="D:\\tomcat\\bin\\tomcat.bat start"
-"tomcat_stop"="D:\\tomcat\\bin\\tomcat.bat stop"
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Dsapi
Redirector\1.0]
+"log_file"="D:\\tomcat\\logs\\domino.log"
+"log_level"="debug"
+"worker_file"="D:\\tomcat\\conf\\workers.properties"
+"worker_mount_file"="D:\\tomcat\\conf\\uriworkermap.properties"
+"tomcat_start"="D:\\tomcat\\bin\\tomcat.bat start"
+"tomcat_stop"="D:\\tomcat\\bin\\tomcat.bat stop"
1.6 +1 -2 jakarta-tomcat-connectors/jk/native/domino/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 2001/06/22 23:18:41 1.5
+++ Makefile 2001/06/28 18:45:40 1.6
@@ -2,8 +2,7 @@
CC=gcc
LD=gcc -shared
-
-CCFLAGS=-Wall -O3
+CCFLAGS=-fPIC -Wall -O3
LDFLAGS=-shared
#################################################################################
1.10 +2 -7 jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c
Index: jk_dsapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_dsapi_plugin.c 2001/06/27 19:13:29 1.9
+++ jk_dsapi_plugin.c 2001/06/28 18:45:40 1.10
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: DSAPI plugin for Lotus Domino *
* Author: Andy Armstrong <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***************************************************************************/
/* Based on the IIS redirector by Gal Shachor <[EMAIL PROTECTED]> */
@@ -123,15 +123,12 @@
static int logLevel = JK_LOG_EMERG_LEVEL;
static jk_pool_t cfgPool;
-
-
static const char *logFile;
static const char *workerFile;
static const char *workerMountFile;
static const char *tomcatStart;
static const char *tomcatStop;
-
#if defined(JK_VERSION) && JK_VERSION >= MAKEVERSION(1, 2, 0, 1)
static jk_worker_env_t worker_env;
#endif
@@ -170,6 +167,7 @@
/* Read() is called by Tomcat to read from the request body (if any).
*/
static int JK_METHOD Read(jk_ws_service_t * s, void *b, unsigned l, unsigned *a);
+
/* Write() is called by Tomcat to send data back to the client.
*/
static int JK_METHOD Write(jk_ws_service_t * s, const void *b, unsigned l);
@@ -265,11 +263,8 @@
}
#endif
-
/* Get the value of a server (CGI) variable as a string
-
*/
-
static int GetVariable(private_ws_t *ws, char *hdrName,
char *buf, DWORD bufsz, char **dest, const
char *dflt)
{
1.3 +3 -3 jakarta-tomcat-connectors/jk/native/domino/dsapifilter.h
Index: dsapifilter.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/dsapifilter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsapifilter.h 2001/06/08 15:02:57 1.2
+++ dsapifilter.h 2001/06/28 18:45:40 1.3
@@ -95,10 +95,10 @@
unsigned int securePort;
void *privateContext;
- int (*GetRequest) (struct _FilterContext * context, FilterRequest *
request,
+ int (*GetRequest) (struct _FilterContext *context, FilterRequest *
request,
unsigned int *errID);
- int (*GetRequestContents) (struct _FilterContext * context, char
**contents,
+ int (*GetRequestContents) (struct _FilterContext *context, char
**contents,
unsigned int
*errID);
int (*GetServerVariable) (struct _FilterContext * context, char *name,
void *buffer,
@@ -143,7 +143,7 @@
}
ServerSupportTypes;
-/*---
+/*---
* 'data1' for server support function 'kWriteResponseHeaders'
*/
typedef struct
