Hi
-- Virus Warning Message (on uusnwa0p) Found virus WORM_NETSKY.Z in file Notice.txt .exe (in Notice.zip) The file is deleted. - Important notice! -- Virus Warning Message (on uusnwa0p) Notice.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Document
-- Virus Warning Message (on uusnwa0p) Found virus WORM_NETSKY.Z in file Details.txt .exe (in Details.zip) The file is deleted. - Important details! -- Virus Warning Message (on uusnwa0p) Details.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Document
-- Virus Warning Message (on uusnwa0p) -- Found virus WORM_NETSKY.Z in file Data.txt .exe (in Data.zip) The uncleanable file is deleted. - Important data! -- Virus Warning Message (on uusnwa0p) -- Data.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Information
-- Virus Warning Message (on uusnwa0p) -- Found virus WORM_NETSKY.Z in file Part-2.txt .exe (in Part-2.zip) The uncleanable file is deleted. - Important! -- Virus Warning Message (on uusnwa0p) -- Part-2.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
mmanders2004/08/09 15:30:53 Modified:jk/native/common jk_ajp_common.c Log: The variables being referenced by the format strings were in the wrong order. Revision ChangesPath 1.57 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c Index: jk_ajp_common.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- jk_ajp_common.c 1 Mar 2004 13:51:48 - 1.56 +++ jk_ajp_common.c 9 Aug 2004 22:30:53 - 1.57 @@ -801,7 +801,7 @@ jk_log(l, JK_LOG_ERROR, "ajp_connection_tcp_get_message: " "Error - Wrong message format 0x%04x from %s\n", - jk_dump_hinfo(&ae->worker->worker_inet_addr, buf), header); + header, jk_dump_hinfo(&ae->worker->worker_inet_addr, buf)); } return JK_FALSE; } @@ -818,7 +818,7 @@ jk_log(l, JK_LOG_ERROR, "ajp_connection_tcp_get_message: " "Error - Wrong message format 0x%04x from %s\n", - jk_dump_hinfo(&ae->worker->worker_inet_addr, buf), header); + header, jk_dump_hinfo(&ae->worker->worker_inet_addr, buf)); } return JK_FALSE; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Site changes
** ** WARNING: WinProxy has detected a virus in file attached to this e-mail message! The attachment has been automatically removed to protect your network. WinProxy Administrator: [EMAIL PROTECTED] 06/16/04 16:33:48 WinProxy (Version 5.1 R1d (5.0.50.10)) - http://www.Ositis.com/ Antivirus Vendor: Panda Software Scan Engine Version: 2.10.1.6_3.1.5.211 Pattern File Version: 3.79120 (Timestamp: 2004/06/15 10:01:55) Machine name: STAG-DOWNLOAD Machine IP address: 61.95.203.145 Server: 209.237.227.199 Client: 192.168.100.102 Protocol: SMTP Virus: "W32/Bagle.N.worm" found! Attachment: Info.pif ** ** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Thanks :)
** ** WARNING: WinProxy has detected a virus in file attached to this e-mail message! The attachment has been automatically removed to protect your network. WinProxy Administrator: [EMAIL PROTECTED] 06/09/04 11:03:53 WinProxy (Version 5.1 R1d (5.0.50.10)) - http://www.Ositis.com/ Antivirus Vendor: Panda Software Scan Engine Version: 2.10.1.6_3.1.5.211 Pattern File Version: 3.78749 (Timestamp: 2004/06/08 11:33:36) Machine name: STAG-DOWNLOAD Machine IP address: 61.95.203.145 Server: 209.237.227.199 Client: 192.168.100.102 Protocol: SMTP Virus: "W32/Bagle.N.worm" found! Attachment: MoreInfo.pif ** ** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.h
mmanders2004/05/25 15:32:55 Modified:jk/native/common jk_connect.h Log: Fixed define if building for NetWare and using LIBC (i.e. Apache2). Revision ChangesPath 1.8 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_connect.h Index: jk_connect.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jk_connect.h 1 Mar 2004 13:37:38 - 1.7 +++ jk_connect.h 25 May 2004 22:32:55 - 1.8 @@ -26,7 +26,7 @@ #include "jk_logger.h" #include "jk_global.h" -#ifndef WIN32 +#if !defined(WIN32) && !(defined(NETWARE) && defined(__NOVELL_LIBC__)) #define closesocket close #endif - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
You cannot do that!
I am shocked about your document! - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders2004/04/06 09:40:57 Modified:jk/native build.xml Log: Updated build rev for NetWare modules. Revision ChangesPath 1.40 +4 -4 jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- build.xml 22 Jul 2003 21:45:38 - 1.39 +++ build.xml 6 Apr 2004 16:40:57 - 1.40 @@ -126,7 +126,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -436,7 +436,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Your letter
Your document is attached. ** ** WARNING: WinProxy has detected a prohibited file type attached to this e-mail message! The attachment has been automatically removed to protect your network. WinProxy Administrator: [EMAIL PROTECTED] 03/12/04 09:10:06 WinProxy (Version 5.0 R1c (5.0.50.8)) - http://www.Ositis.com/ Machine name: Proxy Machine IP address: 216.201.132.30 Client: Cwalker Protocol: SMTP Attachment: your_letter.pif ** ** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.dsp
mmanders2004/02/02 13:58:55 Modified:jk/native2/server/apache2 mod_jk2.dsp Log: Removed obsolete files. Patch from Guenter Knauf. Revision ChangesPath 1.7 +0 -12 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp Index: mod_jk2.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_jk2.dsp 22 Oct 2002 11:56:42 - 1.6 +++ mod_jk2.dsp 2 Feb 2004 21:58:55 - 1.7 @@ -109,10 +109,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_channel_socket.c -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_channel_un.c # End Source File # Begin Source File @@ -185,15 +181,7 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_nwmain.c -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_objCache.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_pool.c # End Source File # Begin Source File - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 STATUS.txt
mmanders2004/02/02 12:12:07 Modified:jk/native2 STATUS.txt Log: Fixed fat fingers. Read then commit. Thanks Guenter. Revision ChangesPath 1.4 +2 -2 jakarta-tomcat-connectors/jk/native2/STATUS.txt Index: STATUS.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/STATUS.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- STATUS.txt2 Feb 2004 18:24:54 - 1.3 +++ STATUS.txt2 Feb 2004 20:12:07 - 1.4 @@ -5,7 +5,7 @@ 2.0.4 : in progress 2.0.3 : not released -2.0.2 : released Bivenber 27, 2002 +2.0.2 : released November 27, 2002 2.0.1 : released October 6, 2002 2.0.0 : released September 30, 2002 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 STATUS.txt
mmanders2004/02/02 10:24:54 Modified:jk/native2 STATUS.txt Log: Updated to reflect current status. Patch submitted by Guenter Knauf. Revision ChangesPath 1.3 +4 -2 jakarta-tomcat-connectors/jk/native2/STATUS.txt Index: STATUS.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/STATUS.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- STATUS.txt8 Oct 2002 15:00:18 - 1.2 +++ STATUS.txt2 Feb 2004 18:24:54 - 1.3 @@ -3,7 +3,9 @@ Release: -2.0.2 : in progress +2.0.4 : in progress +2.0.3 : not released +2.0.2 : released Bivenber 27, 2002 2.0.1 : released October 6, 2002 2.0.0 : released September 30, 2002 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
mmanders2004/02/02 10:23:55
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Updated how we get the server port to work with APR 1.0 as well as previous
versions.Patch submitted by Guenter Knauf.
Revision ChangesPath
1.38 +2 -4
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_service_apache2.c 22 Jan 2004 09:19:55 - 1.37
+++ jk_service_apache2.c 2 Feb 2004 18:23:55 - 1.38
@@ -343,7 +343,6 @@
static int JK_METHOD jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
jk_worker_t *worker, void *serverObj)
{
-apr_port_t port;
char *ssl_temp = NULL;
jk_workerEnv_t *workerEnv;
request_rec *r=serverObj;
@@ -376,8 +375,7 @@
s->server_name= (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
-apr_sockaddr_port_get(&port,r->connection->local_addr);
-s->server_port = port;
+s->server_port = r->connection->local_addr->port;
s->server_software = (char *)ap_get_server_version();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
mmanders2004/02/02 10:21:08
Modified:jk/native2/common jk_worker_status.c
Log:
Fix problem dereferencing a NULL value if shared memory/scoreboard information isn't
available. Patch provided by Guenter Knauf and NormW.
Revision ChangesPath
1.46 +11 -5 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- jk_worker_status.c30 Oct 2003 20:08:36 - 1.45
+++ jk_worker_status.c2 Feb 2004 18:21:08 - 1.46
@@ -717,7 +717,7 @@
}
}
/* Create a top section - not used currently */
-s->jkprintf(env, s, "MXAgent: mod_jk\n" );
+s->jkprintf(env, s, "MXAgent: mod_jk2\n" );
s->jkprintf(env, s, "\n" );
for( i=0; i < env->_objects->size( env, env->_objects ); i++ ) {
@@ -1004,9 +1004,12 @@
/* Update the scoreboard's version - all other
jk2 processes will see this and update
*/
-if( shm!=NULL && shm->head!=NULL )
+if( shm!=NULL && shm->head!=NULL ) {
shm->head->lbVer++;
-s->jkprintf(env, s, "Updated config %d", shm->head->lbVer );
+s->jkprintf(env, s, "Updated config version to %d\n", shm->head->lbVer
);
+} else {
+s->jkprintf(env, s, "Update detected. No scoreboard.\n" );
+}
}
@@ -1017,9 +1020,12 @@
/* Update the scoreboard's version - all other
jk2 processes will see this and update
*/
-if( shm!=NULL && shm->head!=NULL )
+if( shm!=NULL && shm->head!=NULL ) {
shm->head->lbVer++;
-s->jkprintf(env, s, "Updated config version to %d\n", shm->head->lbVer );
+s->jkprintf(env, s, "Updated config version to %d\n", shm->head->lbVer
);
+} else {
+s->jkprintf(env, s, "Reload requested. No scoreboard.\n" );
+}
return JK_OK;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c
mmanders2004/02/02 09:59:56
Modified:jk/native2/common jk_channel_socket.c
Log:
Fix problem with port higher than 32K. Provided by Guenter Knauf. Fixed compile
problem for NetWare even though this isn't built for NetWare (or any other platform.)
Revision ChangesPath
1.62 +11 -5 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- jk_channel_socket.c 29 Jan 2004 14:17:41 - 1.61
+++ jk_channel_socket.c 2 Feb 2004 17:59:56 - 1.62
@@ -100,7 +100,7 @@
int ndelay;
struct sockaddr_in addr;
char *host;
-short port; /* Should be unsigned - big ports will fail */
+unsigned short port;
int keepalive;
int timeout;
};
@@ -116,7 +116,7 @@
*/
static int JK_METHOD jk2_channel_socket_resolve(jk_env_t *env, char *host,
- short port,
+ unsigned short port,
struct sockaddr_in *rc);
static int JK_METHOD jk2_channel_socket_close(jk_env_t *env, jk_channel_t *ch,
@@ -276,16 +276,22 @@
/** private: resolve the address on init
*/
-static int JK_METHOD jk2_channel_socket_resolve(jk_env_t *env, char *host, short
port,
+static int JK_METHOD jk2_channel_socket_resolve(jk_env_t *env, char *host, unsigned
short port,
struct sockaddr_in *rc)
{
int x;
/* TODO: Should be updated for IPV6 support. */
-/* for now use the correct type, in_addr_t */
+/* for now use the correct type, in_addr_t */
+
+/* except on NetWare because of MetroWerks strictness */
+#ifdef NETWARE
+u_long laddr;
+#else
in_addr_t laddr;
+#endif
-rc->sin_port = htons((short)port);
+rc->sin_port = htons((unsigned short)port);
rc->sin_family = AF_INET;
/* Check if we only have digits in the string */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mmanders2004/02/02 09:38:04
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Updated how we get the server port to work with APR 1.0 as well as previous
versions. Patch submitted by Guenter Knauf.
Revision ChangesPath
1.91 +2 -5 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mod_jk.c 5 Nov 2003 09:15:41 - 1.90
+++ mod_jk.c 2 Feb 2004 17:38:04 - 1.91
@@ -482,8 +482,6 @@
{
request_rec *r = private_data->r;
-apr_port_t port;
-
char *ssl_temp = NULL;
s->jvm_route= NULL;/* Used for sticky session routing */
@@ -518,8 +516,7 @@
s->server_name = (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
-apr_sockaddr_port_get(&port,r->connection->local_addr);
-s->server_port = port;
+s->server_port = r->connection->local_addr->port;
/* XXX : à la jk2 ???*/
/* s->server_port = ap_get_server_port(r); */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c
mmanders2004/01/26 16:49:36
Modified:jk/native2/common jk_uriEnv.c
Log:
When changing to MATCH_TYPE_SUFFIX (prefix = NULL) reset prefix_len to 0.
Revision ChangesPath
1.52 +1 -0 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- jk_uriEnv.c 30 Oct 2003 20:10:17 - 1.51
+++ jk_uriEnv.c 27 Jan 2004 00:49:36 - 1.52
@@ -462,6 +462,7 @@
*/
uriEnv->suffix = uri;
uriEnv->prefix = NULL;
+uriEnv->prefix_len = 0;
uriEnv->suffix_len = strlen(uri);
uriEnv->match_type = MATCH_TYPE_SUFFIX;
if( uriEnv->mbean->debug > 0 ) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 NWGNUmakefile
mmanders2004/01/22 08:42:31 Added: jk/native/apache-2.0 NWGNUmakefile Log: Makefile for building NetWare version of mod_jk submitted by Guenter Knauf ([EMAIL PROTECTED]). Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native/apache-2.0/NWGNUmakefile Index: NWGNUmakefile === # # Makefile for mod_jk (uses the build system of Apache2 - gnu make) # created by Guenter Knauf <[EMAIL PROTECTED]> # #ifeq ($(strip $(JAVA_HOME)),) [EMAIL PROTECTED] You must set the JAVA_HOME environment var pointing to the NetWare Java SDK! #endif # # Declare the sub-directories to be built here # SUBDIRS = \ $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and # paths to tools # include $(AP_WORK)\build\NWGNUhead.inc # # build this level's files # # Make sure all needed macro's are defined # JKCOMMON = ../common # # These directories will be at the beginning of the include list, followed by # INCDIRS # XINCDIRS += \ $(JKCOMMON) \ $(AP_WORK)/include \ $(NWOS) \ $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/srclib/apr/include \ $(AP_WORK)/srclib/apr-util/include \ $(AP_WORK)/srclib/apr \ $(JAVA_HOME)/include \ $(JAVA_HOME)/include/netware \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ $(EOLIST) # # These defines will come after DEFINES # XDEFINES += \ -D__NOVELL_LIBC__ \ $(EOLIST) # # These flags will be added to the link.opt file # XLFLAGS += \ $(EOLIST) # # These values will be appended to the correct variables based on the value of # RELEASE # ifeq "$(RELEASE)" "debug" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq "$(RELEASE)" "noopt" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq "$(RELEASE)" "release" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif # # These are used by the link target if an NLM is being generated # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # NLM_NAME = mod_jk # # This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) plugin for Jakarta/Tomcat $(JK_VERSION_STR) # # This is used by the link '-copy ' directive. # If left blank, the ASF copyright defined in NWGNUtail.inc will be used. # NLM_COPYRIGHT = # # This is used by the '-threadname' directive. If left blank, # NLM_NAME Thread will be used. # NLM_THREAD_NAME = JK Module # # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # NLM_VERSION = $(JK_VERSION) # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE= 32768 # # If this is specified it will be used by the link '-entry' directive # NLM_ENTRY_SYM = _LibCPrelude # # If this is specified it will be used by the link '-exit' directive # NLM_EXIT_SYM = _LibCPostlude # # If this is specified it will be used by the link '-check' directive # NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # XDCDATA = # # If there is an NLM target, put it here # TARGET_nlm = \ $(OBJDIR)/mod_jk.nlm \ $(EOLIST) # # If there is an LIB target,
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
mmanders2004/01/06 13:44:20
Modified:jk/native/common jk_ajp_common.c
Log:
Fixed logic when attempting to reuse connections in ajp_send_request. If the send
is successful, we needed to get out of the while loop. If the ping/pong or the
request failed, try and reuse without getting out of the loop.
Revision ChangesPath
1.44 +6 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- jk_ajp_common.c 5 Jan 2004 22:42:03 - 1.43
+++ jk_ajp_common.c 6 Jan 2004 21:44:20 - 1.44
@@ -1025,14 +1025,18 @@
err++;
}
+/* If we got an error or can't send data, then try to get a pooled */
+/* connection and try again. If we are succesful, break out of this */
+/* loop. */
if (err || ajp_connection_tcp_send_message(ae, op->request, l) == JK_FALSE)
{
jk_log(l, JK_LOG_INFO,
"Error sending request try another pooled connection\n");
jk_close_socket(ae->sd);
ae->sd = -1;
ajp_reuse_connection(ae, l);
- break;
}
+else
+break;
}
/*
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
mmanders2004/01/05 14:42:03
Modified:jk/native/common jk_ajp_common.c
Log:
Updated to build properly for NetWare with recent socket additions.
Revision ChangesPath
1.43 +4 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- jk_ajp_common.c 5 Nov 2003 09:15:39 - 1.42
+++ jk_ajp_common.c 5 Jan 2004 22:42:03 - 1.43
@@ -72,6 +72,9 @@
#ifdef AS400
#include "util_ebcdic.h"
#endif
+#if defined(NETWARE) && defined(__NOVELL_LIBC__)
+#include "novsock2.h"
+#endif
const char *response_trans_headers[] = {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
mmanders2004/01/05 14:41:53 Modified:jk/native/common jk_global.h Log: Updated to build properly for NetWare with recent socket additions. Revision ChangesPath 1.26 +7 -2 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- jk_global.h 5 Nov 2003 09:15:39 - 1.25 +++ jk_global.h 5 Jan 2004 22:41:53 - 1.26 @@ -90,8 +90,13 @@ #include #else #include +#if defined(NETWARE) && defined(__NOVELL_LIBC__) +#include "novsock2.h" +#define __sys_socket_h__ +#define __netdb_h__ +#define __netinet_in_h__ +#endif #include - #include #include #ifndef NETWARE - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c
mmanders2004/01/05 14:37:48 Modified:jk/native/common jk_connect.c Log: Added check for AF_INET (IPV4) type address from APR (when used). Revision ChangesPath 1.16 +14 -28jakarta-tomcat-connectors/jk/native/common/jk_connect.c Index: jk_connect.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_connect.c 5 Nov 2003 09:15:39 - 1.15 +++ jk_connect.c 5 Jan 2004 22:37:48 - 1.16 @@ -66,35 +66,9 @@ */ -#if defined(NETWARE) && defined(__NOVELL_LIBC__) -/* Since we want to use WinSock functionality here, don't allow the - * non-winsock headers - */ -#define __sys_types_h__ -#define __sys_socket_h__ -#define __netdb_h__ -#define __netinet_in_h__ -#define __arpa_inet_h__ -#define __sys_timeval_h__ -#endif - #include "jk_connect.h" #include "jk_util.h" -#if defined(NETWARE) && defined(__NOVELL_LIBC__) -/* Now remove the defines so that including the WinSock headers won't cause - * complaining - */ -#undef __sys_types_h__ -#undef __sys_socket_h__ -#undef __netdb_h__ -#undef __netinet_in_h__ -#undef __arpa_inet_h__ -#undef __sys_timeval_h__ - -#include -#endif - #ifdef HAVE_APR #include "apr_network_io.h" #include "apr_errno.h" @@ -138,7 +112,7 @@ #ifdef HAVE_APR apr_pool_t *context; -apr_sockaddr_t *remote_sa; +apr_sockaddr_t *remote_sa, *temp_sa; char *remote_ipaddr; /* May be we could avoid to recreate it each time ? */ @@ -147,6 +121,18 @@ if (apr_sockaddr_info_get(&remote_sa, host, APR_UNSPEC, (apr_port_t)port, 0, context) != APR_SUCCESS) +return JK_FALSE; + +/* Since we are only handling AF_INET (IPV4) address (in_addr_t) */ +/* make sure we find one of those. */ +temp_sa = remote_sa; +while ((NULL != temp_sa) && (AF_INET != temp_sa->family)) +temp_sa = temp_sa->next; + +/* if temp_sa is set, we have a valid address otherwise, just return */ +if (NULL != temp_sa) +remote_sa = temp_sa; +else return JK_FALSE; apr_sockaddr_ip_get(&remote_ipaddr, remote_sa); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/common/build get_ver.awk
mmanders2003/11/21 09:58:20
Added: common/build get_ver.awk
Log:
Awk script submitted by Guenter Knauf to help building for NetWare.
Revision ChangesPath
1.1 jakarta-tomcat-connectors/common/build/get_ver.awk
Index: get_ver.awk
===
BEGIN {
# fetch mod_jk version numbers from input file and writes them to STDOUT
while ((getline < ARGV[1]) > 0) {
if (match ($0, /^#define JK_VERMAJOR [^"]+/)) {
jk_ver_major = substr($3, 1, length($3));
}
else if (match ($0, /^#define JK_VERMINOR [^"]+/)) {
jk_ver_minor = substr($3, 1, length($3));
}
else if (match ($0, /^#define JK_VERFIX [^"]+/)) {
jk_ver_fix = substr($3, 1, length($3));
}
else if (match ($0, /^#define JK_VERISRELEASE [^"]+/)) {
jk_ver_isrelease = substr($3, 1, length($3));
}
else if (match ($0, /^#define JK_VERBETA [^"]+/)) {
jk_ver_isbeta = substr($3, 1, length($3));
}
else if (match ($0, /^#define JK_BETASTRING [^"]+/)) {
jk_ver_betastr = substr($3, 2, length($3) - 2);
}
}
jk_ver = jk_ver_major "," jk_ver_minor "," jk_ver_fix;
jk_ver_str = jk_ver_major "." jk_ver_minor "." jk_ver_fix;
if (jk_ver_isrelease != 1) {
jk_ver_str = jk_ver_str "-dev";
}
if (jk_ver_isbeta == 1) {
jk_ver_str = jk_ver_str "-beta-" jk_ver_betastr;
}
# fetch Apache version numbers from input file and writes them to STDOUT
if (ARGV[2]) {
if (match (ARGV[2], /ap_release.h/)) {
while ((getline < ARGV[2]) > 0) {
if (match ($0, /^#define AP_SERVER_MAJORVERSION "[^"]+"/)) {
ap_ver_major = substr($3, 2, length($3) - 2);
}
else if (match ($0, /^#define AP_SERVER_MINORVERSION "[^"]+"/)) {
ap_ver_minor = substr($3, 2, length($3) - 2);
}
else if (match ($0, /^#define AP_SERVER_PATCHLEVEL/)) {
ap_ver_str_patch = substr($3, 2, length($3) - 2);
if (match (ap_ver_str_patch, /[0-9][0-9]*/)) {
ap_ver_patch = substr(ap_ver_str_patch, RSTART, RLENGTH);
}
}
}
ap_ver_str = ap_ver_major "." ap_ver_minor "." ap_ver_str_patch;
}
if (match (ARGV[2], /httpd.h/)) {
while ((getline < ARGV[2]) > 0) {
if (match ($0, /^#define SERVER_BASEREVISION "[^"]+"/)) {
ap_ver_str = substr($3, 2, length($3) - 2);
}
}
}
print "AP_VERSION_STR = " ap_ver_str "";
}
print "JK_VERSION = " jk_ver "";
print "JK_VERSION_STR = " jk_ver_str "";
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 NWGNUmakefile
mmanders2003/11/19 16:26:30 Added: jk/native2/server/apache2 NWGNUmakefile Log: Makefile submitted by Guenter Knauf to build for NetWare. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile Index: NWGNUmakefile === # # Makefile for mod_jk2 (uses the build system of Apache2 - gnu make) # created by Guenter Knauf <[EMAIL PROTECTED]> # # # Declare the sub-directories to be built here # SUBDIRS = \ $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and # paths to tools # include $(AP_WORK)\build\NWGNUhead.inc # # build this level's files # # Make sure all needed macro's are defined # JKCOMMON = ../../common JKINCLUDE = ../../include # # These directories will be at the beginning of the include list, followed by # INCDIRS # XINCDIRS += \ $(JKCOMMON) \ $(JKINCLUDE) \ $(AP_WORK)/include \ $(NWOS) \ $(AP_WORK)/modules/arch/netware \ $(AP_WORK)/srclib/apr/include \ $(AP_WORK)/srclib/apr-util/include \ $(AP_WORK)/srclib/apr \ $(AP_WORK)/srclib/pcre \ $(JAVA_HOME)/include \ $(JAVA_HOME)/include/netware \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ -relax_pointers \ $(EOLIST) # # These defines will come after DEFINES # XDEFINES += \ -D__NOVELL_LIBC__ \ -D_POSIX_SOURCE \ -DHAS_APR \ $(EOLIST) # -DHAS_PCRE # # These flags will be added to the link.opt file # XLFLAGS += \ $(EOLIST) # # These values will be appended to the correct variables based on the value of # RELEASE # ifeq "$(RELEASE)" "debug" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq "$(RELEASE)" "noopt" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif ifeq "$(RELEASE)" "release" XINCDIRS += \ $(EOLIST) XCFLAGS += \ $(EOLIST) XDEFINES += \ $(EOLIST) XLFLAGS += \ $(EOLIST) endif # # These are used by the link target if an NLM is being generated # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # NLM_NAME = mod_jk2 # # This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) plugin for Jakarta/Tomcat $(JK_VERSION_STR) # # This is used by the link '-copy ' directive. # If left blank, the ASF copyright defined in NWGNUtail.inc will be used. # NLM_COPYRIGHT = # # This is used by the '-threadname' directive. If left blank, # NLM_NAME Thread will be used. # NLM_THREAD_NAME = JK2 Module # # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # NLM_VERSION = $(JK_VERSION) # # If this is specified, it will override the default of 64K # #NLM_STACK_SIZE = 32768 NLM_STACK_SIZE= 49152 # # If this is specified it will be used by the link '-entry' directive # NLM_ENTRY_SYM = _LibCPrelude # # If this is specified it will be used by the link '-exit' directive # NLM_EXIT_SYM = _LibCPostlude # # If this is specified it will be used by the link '-check' directive # NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # XDCDATA = # # If there i
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_global.h
mmanders2003/11/19 15:58:20
Modified:jk/native2/include jk_global.h
Log:
Patch submitted by Guenter Knauf to get mod_jk2 to build for NetWare.
Revision ChangesPath
1.20 +38 -24jakarta-tomcat-connectors/jk/native2/include/jk_global.h
Index: jk_global.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_global.h 30 Oct 2003 20:11:33 - 1.19
+++ jk_global.h 19 Nov 2003 23:58:20 - 1.20
@@ -133,24 +133,28 @@
#include
#else
#include
-#include
-
-#include
-#include
-#ifndef NETWARE
-#include
-#include
-#include
-#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(CYGWIN)
-#include
-#endif
-#if !defined(HPUX11) && !defined(AS400)
-#include
+#ifdef __NOVELL_LIBC__
+#include
+#else
+#include
+
+#include
+#include
+#ifndef NETWARE
+#include
+#include
+#include
+#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(CYGWIN)
+#include
+#endif
+#if !defined(HPUX11) && !defined(AS400)
+#include
+#endif
#endif
+
+#include
+#include
#endif
-
-#include
-#include
#endif
#ifdef WIN32
@@ -219,11 +223,19 @@
#endif
#if defined(WIN32) || defined(NETWARE)
-#define JK_METHOD __stdcall
-#define C_LEVEL_TRY_START __try {
-#define C_LEVEL_TRY_END }
-#define C_LEVEL_FINALLY_START __finally {
-#define C_LEVEL_FINALLY_END }
+#ifdef __GNUC__
+#define JK_METHOD
+#define C_LEVEL_TRY_START
+#define C_LEVEL_TRY_END
+#define C_LEVEL_FINALLY_START
+#define C_LEVEL_FINALLY_END
+#else
+#define JK_METHOD __stdcall
+#define C_LEVEL_TRY_START __try {
+#define C_LEVEL_TRY_END }
+#define C_LEVEL_FINALLY_START __finally {
+#define C_LEVEL_FINALLY_END }
+#endif
#define PATH_SEPERATOR (';')
#define PATH_SEPARATOR_STR (";")
#define FILE_SEPERATOR ('\\')
@@ -238,8 +250,10 @@
#define strncasecmp strnicmp
#endif
-#ifndef vsnprintf
-#define vsnprintf _vsnprintf
+#ifndef __NOVELL_LIBC__
+#ifndef vsnprintf
+#define vsnprintf _vsnprintf
+#endif
#endif
#else
#define JK_METHOD
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_nwmain.c
mmanders2003/11/19 15:57:29
Modified:jk/native2/common jk_nwmain.c
Log:
Patch submitted by Guenter Knauf to handle CLIB/LibC issues on NetWare.
Revision ChangesPath
1.4 +56 -1 jakarta-tomcat-connectors/jk/native2/common/jk_nwmain.c
Index: jk_nwmain.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_nwmain.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_nwmain.c 4 Feb 2003 07:39:58 - 1.3
+++ jk_nwmain.c 19 Nov 2003 23:57:29 - 1.4
@@ -71,6 +71,12 @@
*/
#include
+
+/* Apache 2/APR uses NOVELL_LIBC which has a different way of handling
+ * "library" nlms. If we aren't on LIBC, use the old method
+ */
+
+#ifndef __NOVELL_LIBC__
#include
#include
@@ -91,4 +97,53 @@
{
ExitThread (TSR_THREAD, 0);
}
+#else /* __NOVELL_LIBC__ */
+
+/* Since we are on LibC, we need to handle our own startup and shutdown */
+
+#include
+#include "novsock2.h"
+
+int _NonAppStart
+(
+void*NLMHandle,
+void*errorScreen,
+const char *cmdLine,
+const char *loadDirPath,
+size_t uninitializedDataLength,
+void*NLMFileHandle,
+int (*readRoutineP)( int conn, void *fileHandle, size_t offset,
+size_t nbytes, size_t *bytesRead, void *buffer ),
+size_t customDataOffset,
+size_t customDataSize,
+int messageCount,
+const char **messages
+)
+{
+#pragma unused(cmdLine)
+#pragma unused(loadDirPath)
+#pragma unused(uninitializedDataLength)
+#pragma unused(NLMFileHandle)
+#pragma unused(readRoutineP)
+#pragma unused(customDataOffset)
+#pragma unused(customDataSize)
+#pragma unused(messageCount)
+#pragma unused(messages)
+
+WSADATA wsaData;
+
+return WSAStartup((WORD) MAKEWORD(2, 0), &wsaData);
+}
+
+void _NonAppStop( void )
+{
+WSACleanup();
+}
+
+int _NonAppCheckUnload( void )
+{
+ return 0;
+}
+#endif /* __NOVELL_LIBC__ */
+
#endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c
mmanders2003/09/05 08:19:29 Modified:jk/native/common jk_connect.c Log: Added special case for NetWare since the MetroWerks compiler is so strict on types. Revision ChangesPath 1.14 +6 -1 jakarta-tomcat-connectors/jk/native/common/jk_connect.c Index: jk_connect.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jk_connect.c 30 Aug 2003 03:11:19 - 1.13 +++ jk_connect.c 5 Sep 2003 15:19:29 - 1.14 @@ -116,7 +116,12 @@ /* TODO: Should be updated for IPV6 support. */ /* for now use the correct type, in_addr_t */ +/* except on NetWare since the MetroWerks compiler is so strict */ +#if defined(NETWARE) +u_long laddr; +#else in_addr_t laddr; +#endif rc->sin_port = htons((short)port); rc->sin_family = AF_INET; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
mmanders2003/08/07 15:12:35 Modified:jk/native/apache-1.3 mod_jk.c Log: Added cleanup of automount member of config structure in exit_handler. Revision ChangesPath 1.41 +2 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- mod_jk.c 2 Jul 2003 07:09:09 - 1.40 +++ mod_jk.c 7 Aug 2003 22:12:35 - 1.41 @@ -1985,6 +1985,7 @@ uri_worker_map_free(&(conf->uw_map), conf->log); map_free(&(conf->uri_to_context)); map_free(&(conf->worker_properties)); +map_free(&(conf->automount)); if (conf->log) jk_close_file_logger(&(conf->log)); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders2003/07/22 14:45:38 Modified:jk/native build.xml Log: Updated link information for NetWare to reflect 1.2.5 version. Revision ChangesPath 1.39 +4 -4 jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- build.xml 4 Apr 2003 20:29:21 - 1.38 +++ build.xml 22 Jul 2003 21:45:38 - 1.39 @@ -126,7 +126,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -436,7 +436,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders2003/04/04 12:29:21 Modified:jk/native build.xml Log: Since NetWare is built (cross-compiled) on Windows, I had to add logic to know if we are actually targeting Windows or NetWare. If novellndk.home is defined and the path actually exists, we assume NetWare. Revision ChangesPath 1.38 +86 -86jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- build.xml 18 Feb 2003 17:53:57 - 1.37 +++ build.xml 4 Apr 2003 20:29:21 - 1.38 @@ -97,12 +97,12 @@ - - + + - + @@ -118,28 +118,28 @@ - - - - - + + + + + - + - - - - - - - - + + + + + + + + @@ -178,31 +178,31 @@ - + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -214,16 +214,16 @@ info="Building for NetWare platform with LibC libraries" /> - - + + - + - + @@ -257,15 +257,15 @@ - - - + + + - - + + - + @@ -283,35 +283,35 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - + - - - - - - + + + + + + @@ -385,14 +385,14 @@ - - + + - - - + + + @@ -413,37 +413,37 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mmanders2003/04/04 12:26:21
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Updated to build correctly for NetWare.
Revision ChangesPath
1.70 +11 -7 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- mod_jk.c 2 Apr 2003 22:48:01 - 1.69
+++ mod_jk.c 4 Apr 2003 20:26:20 - 1.70
@@ -510,10 +510,10 @@
s->server_name = (char *)ap_get_server_name(r);
/* get the real port (otherwise redirect failed) */
-/* apr_sockaddr_port_get(&port,r->connection->local_addr); */
-/* s->server_port = port; */
-/* XXX : à la jk2 */
- s->server_port = ap_get_server_port(r);
+apr_sockaddr_port_get(&port,r->connection->local_addr);
+s->server_port = port;
+/* XXX : à la jk2 ???*/
+ /* s->server_port = ap_get_server_port(r); */
s->server_software = (char *)ap_get_server_version();
@@ -1880,7 +1880,11 @@
map_free(&conf->automount);
if (conf->uw_map)
uri_worker_map_free(&conf->uw_map, conf->log);
-jk_close_file_logger(&conf->log);
+/* Since we are now using apache to do logging, this
+ * cleanup will just cause problems so don't do it
+ *
+ * jk_close_file_logger(&conf->log);
+ */
}
s = s->next;
}
@@ -2023,7 +2027,7 @@
return overrides;
}
-static int jk_log_to_file(jk_logger_t *l,
+static int JK_METHOD jk_log_to_file(jk_logger_t *l,
int level,
const char *what)
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant JkData.java
mmanders2003/04/04 12:17:52
Modified:jk/jkant/java/org/apache/jk/ant JkData.java
Log:
Added "unless" conditional support.
Revision ChangesPath
1.2 +7 -0
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/JkData.java
Index: JkData.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/JkData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JkData.java 7 Nov 2001 23:06:57 - 1.1
+++ JkData.java 4 Apr 2003 20:17:52 - 1.2
@@ -76,6 +76,7 @@
private String value;
private boolean isfile = false;
private String ifCond;
+String unlessCond;
Project project;
@@ -108,9 +109,15 @@
ifCond = s;
}
+public void setUnless( String s ) {
+unlessCond = s;
+}
+
public String getValue()
{
if( ifCond!=null && project.getProperty(ifCond) == null )
+return null;
+if (unlessCond != null && project.getProperty(unlessCond) != null)
return null;
return value;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk build.properties.sample
mmanders2003/04/04 11:02:34
Modified:jk build.properties.sample
Log:
Added additional paths necessary for building NetWare connectors.
Revision ChangesPath
1.16 +7 -1 jakarta-tomcat-connectors/jk/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.properties.sample 17 Oct 2002 18:18:48 - 1.15
+++ build.properties.sample 4 Apr 2003 19:02:34 - 1.16
@@ -45,9 +45,15 @@
so.profile=false
# tools for other directories
-# Metrowerks and novel ndk
+# Metrowerks and Novell ndk
#mw.home=d:/tools/mw/6.0
#novellndk.home=d:/tools/novell/ndk/nwsdk
+#novelllibc.home=d:/tools/novell/ndk/libc
+#build.compiler.base=${mw.home}
+#build.compiler.cc=${mw.home}/bin/mwccnlm
+#build.compiler.ld=${mw.home}/bin/mwldnlm
+#netscape.home=${iplanet.home}
+#option_no_reuse_worker=true
# MSVC
#mssdk.home=c:/Program Files/Microsoft Visual Studio/VC98
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders2003/01/16 13:00:57
Modified:jk/native build.xml
Log:
Removed netware exclusion on _REENTRANT define for NetWare. LibC now provides
necessary functionality and this allows us to run MP.
Revision ChangesPath
1.36 +5 -5 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 12 Jun 2002 15:30:01 - 1.35
+++ build.xml 16 Jan 2003 21:00:57 - 1.36
@@ -107,7 +107,7 @@
-
+
@@ -132,7 +132,7 @@
debug="${so.debug}"
taskDebug="0"
profile="${so.profile}" >
-
+
-
+
@@ -283,7 +283,7 @@
-
+
@@ -417,7 +417,7 @@
-
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mmanders2002/12/06 10:54:45
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Updated jk_handler to check result of call to worker->get_endpoint and handle a
failure. This call can fail if the allocation for the endpoint fails because of low
memory conditions causing a dereference of NULL when we try and access the endpoint.
Revision ChangesPath
1.61 +6 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mod_jk.c 25 Nov 2002 16:01:48 - 1.60
+++ mod_jk.c 6 Dec 2002 18:54:45 - 1.61
@@ -1740,7 +1740,9 @@
&jk_cleanup_endpoint, tpool );
}
#else */
-worker->get_endpoint(worker, &end, l);
+/* worker->get_endpoint might fail if we are out of memory so check */
+/* and handle it */
+if (worker->get_endpoint(worker, &end, l))
/* #endif */
{
int is_recoverable_error = JK_FALSE;
@@ -1767,6 +1769,8 @@
end->done(&end, l);
/* #endif */
}
+else /* this means we couldn't get an endpoint */
+rc = 0; /* just to make sure that we know we've failed */
}
#ifndef NO_GETTIMEOFDAY
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c
mmanders2002/12/06 10:52:50
Modified:jk/native/common jk_connect.c
Log:
Modified code to go through a WinSock code path on NetWare if building for Apache 2.
Revision ChangesPath
1.7 +31 -5 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_connect.c 30 Oct 2002 22:12:20 - 1.6
+++ jk_connect.c 6 Dec 2002 18:52:50 - 1.7
@@ -66,9 +66,35 @@
*/
+#if defined(NETWARE) && defined(__NOVELL_LIBC__)
+/* Since we want to use WinSock functionality here, don't allow the
+ * non-winsock headers
+ */
+#define __sys_types_h__
+#define __sys_socket_h__
+#define __netdb_h__
+#define __netinet_in_h__
+#define __arpa_inet_h__
+#define __sys_timeval_h__
+#endif
+
#include "jk_connect.h"
#include "jk_util.h"
+#if defined(NETWARE) && defined(__NOVELL_LIBC__)
+/* Now remove the defines so that including the WinSock headers won't cause
+ * complaining
+ */
+#undef __sys_types_h__
+#undef __sys_socket_h__
+#undef __netdb_h__
+#undef __netinet_in_h__
+#undef __arpa_inet_h__
+#undef __sys_timeval_h__
+
+#include
+#endif
+
/** resolve the host IP */
int jk_resolve(char *host,
@@ -140,7 +166,7 @@
ret = connect(sock,
(struct sockaddr *)addr,
sizeof(struct sockaddr_in));
-#ifdef WIN32
+#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
if(SOCKET_ERROR == ret) {
errno = WSAGetLastError() - WSABASEERR;
}
@@ -177,7 +203,7 @@
jk_log(l, JK_LOG_INFO, "jk_open_socket, connect() failed errno = %d\n",
errno);
jk_close_socket(sock);
} else {
-#ifdef WIN32
+#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
errno = WSAGetLastError() - WSABASEERR;
#endif /* WIN32 */
jk_log(l, JK_LOG_ERROR, "jk_open_socket, socket() failed errno = %d\n",
errno);
@@ -190,7 +216,7 @@
int jk_close_socket(int s)
{
-#ifdef WIN32
+#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
if(INVALID_SOCKET != s) {
return closesocket(s) ? -1 : 0;
}
@@ -256,7 +282,7 @@
len - rdlen,
0);
if(-1 == this_time) {
-#ifdef WIN32
+#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
if(SOCKET_ERROR == this_time) {
errno = WSAGetLastError() - WSABASEERR;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
mmanders2002/06/12 08:51:48
Modified:jk/native/apache-1.3 mod_jk.c
Log:
Added check for NO_GETTIMEOFDAY since gettimeofday isn't supported on all platforms.
Revision ChangesPath
1.27 +5 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_jk.c 21 Apr 2002 22:57:11 - 1.26
+++ mod_jk.c 12 Jun 2002 15:51:48 - 1.27
@@ -1526,9 +1526,11 @@
s.ws_private = &private_data;
s.pool = &private_data.p;
+#ifndef NO_GETTIMEOFDAY
if(conf->format != NULL) {
gettimeofday(&tv_begin, NULL);
}
+#endif
if(init_ws_service(&private_data, &s, conf)) {
jk_endpoint_t *end = NULL;
@@ -1553,6 +1555,7 @@
}
end->done(&end, l);
}
+#ifndef NO_GETTIMEOFDAY
if(conf->format != NULL) {
char *duration = NULL;
char *status = NULL;
@@ -1568,6 +1571,7 @@
ap_table_setn(r->notes, JK_DURATION, duration);
request_log_transaction(r,conf);
}
+#endif
}
jk_close_pool(&private_data.p);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders2002/06/12 08:30:01 Modified:jk/native build.xml Log: Updated to match new libc directory structure for NetWare builds. Revision ChangesPath 1.35 +1 -0 jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- build.xml 30 May 2002 07:12:28 - 1.34 +++ build.xml 12 Jun 2002 15:30:01 - 1.35 @@ -164,6 +164,7 @@ + -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk build.properties.sample
mmanders02/04/12 09:01:30
Modified:jk build.properties.sample
Log:
Added necessary flags for building NetWare version of mod_jk for Apache 2.
Revision ChangesPath
1.10 +4 -2 jakarta-tomcat-connectors/jk/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties.sample 20 Dec 2001 19:30:25 - 1.9
+++ build.properties.sample 12 Apr 2002 16:01:30 - 1.10
@@ -21,7 +21,6 @@
apache2.home=/opt/apache2
apache13.home=/opt/apache13
iplanet.home=/opt/iplanet6
-# iplanet.home=d:/tools/sdk/netscape
# APR location - by default the version included in Apache2 is used.
@@ -37,10 +36,13 @@
# Settings for building NetWare binaries. Uncomment these and modify for your
# environment to build NetWare binaries.
#
-# novellndk.dir=d:/tools/nwsdk
+# novellndk.dir=d:/tools/novell/ndk/nwsdk
+# novelllibc.dir=d:/tools/novell/ndk/libc
# build.compiler.base=d:/tools/mw/6.0
# build.compiler.cc=${build.compiler.base}/bin/mwccnlm
# build.compiler.ld=${build.compiler.base}/bin/mwldnlm
+# netscape.home=${iplanet.home}
+# option_no_reuse_worker=true
# Settings for building Windows binaries. Uncomment these and modify for your
# environment to build Windows binaries.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders02/04/12 08:57:31
Modified:jk/native build.xml
Log:
Added necessary flags for building NetWare version.
Revision ChangesPath
1.30 +32 -3 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 9 Apr 2002 21:42:55 - 1.29
+++ build.xml 12 Apr 2002 15:57:31 - 1.30
@@ -132,7 +132,7 @@
debug="${so.debug}"
taskDebug="0"
profile="${so.profile}" >
-
+
-
@@ -157,8 +157,12 @@
-
+
+
+
+
+
@@ -178,6 +182,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -205,6 +233,7 @@
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mmanders02/04/12 08:55:59
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Moved cleanup routine to the right place. At least on NetWare, the module is loaded
multiple times and the first time, cleanup wasn't happening. Since it is a pool
cleanup, I now register the cleanup where the pool is first used.
Revision ChangesPath
1.43 +31 -31jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mod_jk.c 11 Apr 2002 21:52:43 - 1.42
+++ mod_jk.c 12 Apr 2002 15:55:59 - 1.43
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.42 $ *
+ * Version: $Revision: 1.43 $ *
***/
/*
@@ -1328,6 +1328,35 @@
return DECLINED;
}
+/** Standard apache hook, cleanup jk
+ */
+static apr_status_t jk_apr_pool_cleanup(void *data)
+{
+server_rec *s = data;
+
+while (NULL != s)
+{
+jk_server_conf_t *conf =
+(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+
+
+if (conf)
+{
+wc_close(conf->log);
+if (conf->worker_properties)
+map_free(&conf->worker_properties);
+if (conf->uri_to_context)
+map_free(&conf->uri_to_context);
+if (conf->automount)
+map_free(&conf->automount);
+if (conf->uw_map)
+uri_worker_map_free(&conf->uw_map, conf->log);
+jk_close_file_logger(&conf->log);
+}
+s = s->next;
+}
+}
+
/** Create default jk_config. XXX This is mostly server-independent,
all servers are using something similar - should go to common.
*/
@@ -1390,6 +1419,7 @@
c->s = s;
+apr_pool_cleanup_register(p, s, jk_apr_pool_cleanup, jk_apr_pool_cleanup);
return c;
}
@@ -1466,35 +1496,6 @@
return overrides;
}
-/** Standard apache hook, cleanup jk
- */
-static apr_status_t jk_child_exit(void *data)
-{
-server_rec *s = data;
-
-while (NULL != s)
-{
-jk_server_conf_t *conf =
-(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
-
-
-if (conf)
-{
-wc_close(conf->log);
-if (conf->worker_properties)
-map_free(&conf->worker_properties);
-if (conf->uri_to_context)
-map_free(&conf->uri_to_context);
-if (conf->automount)
-map_free(&conf->automount);
-if (conf->uw_map)
-uri_worker_map_free(&conf->uw_map, conf->log);
-jk_close_file_logger(&conf->log);
-}
-s = s->next;
-}
-}
-
/** Standard apache callback, initialize jk.
*/
static void jk_child_init(apr_pool_t *pconf,
@@ -1503,7 +1504,6 @@
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
-apr_pool_cleanup_register(pconf, s, jk_child_exit, jk_child_exit);
/* init_jk( pconf, conf, s ); */
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mmanders02/04/11 14:52:43
Modified:jk/native/apache-2.0 mod_jk.c
Log:
Updated to build for Apache 2.0 on NetWare (LibC). Added a cleanup routine
Revision ChangesPath
1.42 +38 -8 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mod_jk.c 2 Apr 2002 00:42:11 - 1.41
+++ mod_jk.c 11 Apr 2002 21:52:43 - 1.42
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.41 $ *
+ * Version: $Revision: 1.42 $ *
***/
/*
@@ -90,12 +90,12 @@
* Jakarta (jk_) include files
*/
#ifdef NETWARE
-#define _SYS_TYPES_H_
-#define _NETDB_H_INCLUDED
-#define _IN_
-#define _INET_
-#define _SYS_TIMEVAL_H_
-#define _SYS_SOCKET_H_
+#define __sys_types_h__
+#define __sys_socket_h__
+#define __netdb_h__
+#define __netinet_in_h__
+#define __arpa_inet_h__
+#define __sys_timeval_h__
#endif
#include "jk_global.h"
#include "jk_util.h"
@@ -1281,7 +1281,7 @@
apr_pool_t *parent_pool= apr_pool_get_parent( rpool );
apr_pool_t *tpool= apr_pool_get_parent( parent_pool );
-apr_pool_userdata_get( &end, "jk_thread_endpoint", tpool );
+apr_pool_userdata_get( (void **)&end, "jk_thread_endpoint", tpool );
if(end==NULL ) {
worker->get_endpoint(worker, &end, l);
apr_pool_userdata_set( end , "jk_thread_endpoint",
@@ -1466,6 +1466,35 @@
return overrides;
}
+/** Standard apache hook, cleanup jk
+ */
+static apr_status_t jk_child_exit(void *data)
+{
+server_rec *s = data;
+
+while (NULL != s)
+{
+jk_server_conf_t *conf =
+(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+
+
+if (conf)
+{
+wc_close(conf->log);
+if (conf->worker_properties)
+map_free(&conf->worker_properties);
+if (conf->uri_to_context)
+map_free(&conf->uri_to_context);
+if (conf->automount)
+map_free(&conf->automount);
+if (conf->uw_map)
+uri_worker_map_free(&conf->uw_map, conf->log);
+jk_close_file_logger(&conf->log);
+}
+s = s->next;
+}
+}
+
/** Standard apache callback, initialize jk.
*/
static void jk_child_init(apr_pool_t *pconf,
@@ -1474,6 +1503,7 @@
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+apr_pool_cleanup_register(pconf, s, jk_child_exit, jk_child_exit);
/* init_jk( pconf, conf, s ); */
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_nwmain.c
mmanders02/04/11 14:50:25
Modified:jk/native/common jk_nwmain.c
Log:
Updated to build for Apache 2.0 on NetWare (LibC).
Revision ChangesPath
1.3 +56 -1 jakarta-tomcat-connectors/jk/native/common/jk_nwmain.c
Index: jk_nwmain.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_nwmain.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_nwmain.c 18 Jun 2001 14:15:59 - 1.2
+++ jk_nwmain.c 11 Apr 2002 21:50:25 - 1.3
@@ -58,7 +58,7 @@
/***
* Description: Netware Wrapper*
* Author: Mike Anderson <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***/
#ifdef NETWARE
@@ -71,6 +71,12 @@
*/
#include
+
+/* Apache 2/APR uses NOVELL_LIBC which has a different way of handling
+ * "library" nlms. If we aren't on LIBC, use the old method
+ */
+
+#ifndef __NOVELL_LIBC__
#include
#include
@@ -91,4 +97,53 @@
{
ExitThread (TSR_THREAD, 0);
}
+#else /* __NOVELL_LIBC__ */
+
+/* Since we are on LibC, we need to handle our own startup and shutdown */
+
+#include
+#include "novsock2.h"
+
+int _NonAppStart
+(
+void*NLMHandle,
+void*errorScreen,
+const char *cmdLine,
+const char *loadDirPath,
+size_t uninitializedDataLength,
+void*NLMFileHandle,
+int (*readRoutineP)( int conn, void *fileHandle, size_t offset,
+size_t nbytes, size_t *bytesRead, void *buffer ),
+size_t customDataOffset,
+size_t customDataSize,
+int messageCount,
+const char **messages
+)
+{
+#pragma unused(cmdLine)
+#pragma unused(loadDirPath)
+#pragma unused(uninitializedDataLength)
+#pragma unused(NLMFileHandle)
+#pragma unused(readRoutineP)
+#pragma unused(customDataOffset)
+#pragma unused(customDataSize)
+#pragma unused(messageCount)
+#pragma unused(messages)
+
+WSADATA wsaData;
+
+return WSAStartup((WORD) MAKEWORD(2, 0), &wsaData);
+}
+
+void _NonAppStop( void )
+{
+WSACleanup();
+}
+
+int _NonAppCheckUnload( void )
+{
+ return 0;
+}
+#endif /* __NOVELL_LIBC__ */
+
#endif
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_md5.c
mmanders02/04/11 14:50:03 Modified:jk/native/common jk_md5.c Log: Updated to build for NetWare. Revision ChangesPath 1.7 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_md5.c Index: jk_md5.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_md5.c 31 Oct 2001 14:03:22 - 1.6 +++ jk_md5.c 11 Apr 2002 21:50:03 - 1.7 @@ -103,7 +103,7 @@ /*** * Description: MD5 encoding wrapper * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.6 $ * + * Version: $Revision: 1.7 $ * ***/ /* @@ -497,13 +497,13 @@ char buf[JK_MD5_DIGESTSIZE + 1]; ap_MD5Init(&ctx); -ap_MD5Update(&ctx, org, strlen(org)); +ap_MD5Update(&ctx, org, strlen((const char *)org)); if (org2 != NULL) - ap_MD5Update(&ctx, org2, strlen(org2)); + ap_MD5Update(&ctx, org2, strlen((const char *)org2)); -ap_MD5Final(buf, &ctx); - return (jk_hextocstr(buf, dst, JK_MD5_DIGESTSIZE)); +ap_MD5Final((unsigned char *)buf, &ctx); + return (jk_hextocstr((unsigned char *)buf, dst, JK_MD5_DIGESTSIZE)); } #endif /* USE_APACHE_MD5 */ -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c
mmanders02/04/11 14:48:19
Modified:jk/native/common jk_jni_worker.c
Log:
Updated to build for Apache 2.0 on NetWare (using LibC).
Revision ChangesPath
1.11 +6 -2 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_jni_worker.c 11 Mar 2002 11:40:25 - 1.10
+++ jk_jni_worker.c 11 Apr 2002 21:48:19 - 1.11
@@ -59,7 +59,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.10 $ *
+ * Version: $Revision: 1.11 $ *
***/
#if !defined(WIN32) && !defined(NETWARE)
@@ -79,9 +79,13 @@
#endif
#ifdef NETWARE
+#ifdef __NOVELL_LIBC__
+#include
+#else
#include
#include
#endif
+#endif
#ifndef JNI_VERSION_1_1
#define JNI_VERSION_1_1 0x00010001
@@ -722,7 +726,7 @@
FreeLibrary(hInst);
}
-#elif defined(NETWARE)
+#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
int javaNlmHandle = FindNLMHandle("JVM");
if (0 == javaNlmHandle) {
/* if we didn't get a handle, try to load java and retry getting the */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java MwccCompiler.java
mmanders02/04/11 14:46:58
Modified:jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
MwccCompiler.java
Log:
More updates to allow building against Clib or LibC within the same project.
Revision ChangesPath
1.8 +15 -5
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
Index: MwldLinker.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MwldLinker.java 8 Mar 2002 16:13:26 - 1.7
+++ MwldLinker.java 11 Apr 2002 21:46:57 - 1.8
@@ -111,6 +111,7 @@
Commandline cmd = new Commandline();
File linkOpt = new File(buildDir, "link.opt");
File linkDef = new File(buildDir, "link.def");
+boolean useLibC = false;
String libtool=project.getProperty("build.compiler.ld");
if(libtool==null) libtool="mwldnlm";
@@ -152,14 +153,20 @@
JkData opt = (JkData) opts.nextElement();
String option = opt.getValue();
if( option == null ) continue;
+
linkOptPw.println( option );
+option = option.toLowerCase();
+
+// check to see if we are building using LibC
+if (option.indexOf("libc") > 0)
+useLibC = true;
}
// add the default startup code to the list of objects
-if (null == project.getProperty("use.novelllibc"))
-linkOptPw.println(libBase + "\\lib\\nwpre.obj");
-else
+if (useLibC)
linkOptPw.println("-llibcpre.o");
+else
+linkOptPw.println(libBase + "\\lib\\nwpre.obj");
// write the objects to link with to the .opt file
for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java MwccCompiler.java
mmanders02/03/08 08:13:26
Modified:jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
MwccCompiler.java
Log:
Updated to support building with LibC for NetWare.
Revision ChangesPath
1.7 +4 -1
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
Index: MwldLinker.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MwldLinker.java 16 Nov 2001 22:23:22 - 1.6
+++ MwldLinker.java 8 Mar 2002 16:13:26 - 1.7
@@ -156,7 +156,10 @@
}
// add the default startup code to the list of objects
-linkOptPw.println(libBase + "\\lib\\nwpre.obj");
+if (null == project.getProperty("use.novelllibc"))
+linkOptPw.println(libBase + "\\lib\\nwpre.obj");
+else
+linkOptPw.println("-llibcpre.o");
// write the objects to link with to the .opt file
for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
mmanders02/02/12 17:07:18
Modified:jk/native/common jk_ajp_common.c
Log:
Initialize secret before checking cache since we might return from inside of the
cache checking loop.
Revision ChangesPath
1.24 +9 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_ajp_common.c 6 Feb 2002 19:11:23 - 1.23
+++ jk_ajp_common.c 13 Feb 2002 01:07:18 - 1.24
@@ -59,7 +59,7 @@
* Description: common stuff for bi-directional protocols ajp13/ajp14. *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.23 $ *
+ * Version: $Revision: 1.24 $ *
***/
@@ -1235,6 +1235,14 @@
if (pThis && pThis->worker_private) {
ajp_worker_t *p = pThis->worker_private;
int cache_sz = jk_get_worker_cache_size(props, p->name, cache);
+
+/*
+ * Need to initialize secret here since we could return from inside
+ * of the following loop
+ */
+
+p->secret = jk_get_worker_secret(props, p->name );
+
if (cache_sz > 0) {
p->ep_cache = (ajp_endpoint_t **)malloc(sizeof(ajp_endpoint_t *) *
cache_sz);
if(p->ep_cache) {
@@ -1249,7 +1257,6 @@
}
}
}
-p->secret = jk_get_worker_secret(props, p->name );
} else {
jk_log(l, JK_LOG_ERROR, "In jk_worker_t::init, NULL parameters\n");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_sockbuf.c
mmanders01/12/04 14:51:57
Modified:jk/native/common jk_sockbuf.c
Log:
Added a cast in the call to send since Metrowerks 6.0 (used to build NetWare)
complains.
Revision ChangesPath
1.7 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_sockbuf.c
Index: jk_sockbuf.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_sockbuf.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_sockbuf.c 2001/12/04 19:39:55 1.6
+++ jk_sockbuf.c 2001/12/04 22:51:57 1.7
@@ -58,7 +58,7 @@
/***
* Description: Simple buffer object to handle buffered socket IO *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***/
#include "jk_global.h"
@@ -92,7 +92,7 @@
return JK_FALSE;
}
if(sz > SOCKBUF_SIZE) {
-return (send(sb->sd, buf, sz, 0) == (int)sz);
+return (send(sb->sd, (char *)buf, sz, 0) == (int)sz);
}
memcpy(sb->buf + sb->end, buf, sz);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c
mmanders01/11/29 12:02:44
Modified:jk/native/netscape jk_nsapi_plugin.c
Log:
Added default worker_env to prevent GPF during startup.
Set ssl_key_size to -1 for now until we can determine if this is available from the
webserver, and how to configure it (ala JkOptions for Apache module.)
Revision ChangesPath
1.7 +6 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_nsapi_plugin.c 2001/11/07 21:46:28 1.6
+++ jk_nsapi_plugin.c 2001/11/29 20:02:44 1.7
@@ -58,7 +58,7 @@
/***
* Description: NSAPI plugin for Netscape servers *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***/
@@ -89,6 +89,7 @@
static int init_on_other_thread_is_ok = JK_FALSE;
static jk_logger_t *logger = NULL;
+static jk_worker_env_tworker_env;
#ifdef NETWARE
int (*PR_IsSocketSecure)(SYS_NETFD *csd); /* pointer to PR_IsSocketSecure function
*/
@@ -131,7 +132,7 @@
jk_map_t *init_map = (jk_map_t *)init_d;
/* we add the URI->WORKER MAP since workers using AJP14 will feed it */
/* but where are they here in Netscape ? */
-if(wc_open(init_map, NULL, logger)) {
+if(wc_open(init_map, &worker_env, logger)) {
init_on_other_thread_is_ok = JK_TRUE;
} else {
jk_log(logger, JK_LOG_EMERG, "In init_workers_on_other_threads, failed\n");
@@ -269,7 +270,7 @@
int rc = REQ_ABORTED;
jk_map_t *init_map;
-fprintf(stderr, "In jk_init %s %s %s\n",worker_prp_file, log_level_str,
log_file);
+fprintf(stderr, "In jk_init.\n Worker file = %s.\n Log level = %s.\n Log
File = %s\n",worker_prp_file, log_level_str, log_file);
if(!worker_prp_file) {
worker_prp_file = JK_WORKER_FILE_DEF;
}
@@ -455,6 +456,8 @@
else
#endif
s->is_ssl = security_active;
+
+s->ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc */
if(s->is_ssl) {
s->ssl_cert = pblock_findval("auth-cert", private_data->rq->vars);
if(s->ssl_cert) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/netscape Makefile.nw
mmanders01/11/26 11:38:44 Removed: jk/native/netscape Makefile.nw Log: Removed since NetWare connectors can now be build using jkant. -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders01/11/26 11:37:58 Modified:jk/native build.xml Log: Updated to build NetWare modules correctly. Revision ChangesPath 1.20 +9 -3 jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- build.xml 2001/11/21 00:05:23 1.19 +++ build.xml 2001/11/26 19:37:58 1.20 @@ -54,10 +54,12 @@ + + @@ -87,7 +89,7 @@ - + @@ -267,8 +269,9 @@ + @@ -318,7 +321,8 @@ - @@ -356,9 +360,11 @@ + + -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_registry.c
mmanders01/11/26 11:36:15
Modified:jk/native/common jk_registry.c
Log:
Added casts necessary to build for NetWare since the worker_factory functions
currently being used don't match the prototype of the registerFactory method. The
MetroWerks compiler treats this as an error instead of just a warning.
Revision ChangesPath
1.9 +12 -6 jakarta-tomcat-connectors/jk/native/common/jk_registry.c
Index: jk_registry.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_registry.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_registry.c 2001/11/26 17:08:17 1.8
+++ jk_registry.c 2001/11/26 19:36:15 1.9
@@ -62,7 +62,7 @@
/***
* Description: Worker list*
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -129,14 +129,20 @@
printf("jk_registry_init: Assertion failed, env==NULL\n" );
return;
}
+ /**
+ * Because the functions being referenced here (apjp14_work_factory, and
+ * lb_worker_factory) don't match the prototype declared for registerFactory,
+ * and because the MetroWerks compiler (used for NetWare) treats this as an
+ * error, I'm casting the function pointers to (void *) - mmanders
+ */
#ifdef AJP12
- env->registerFactory( env, "worker", "ajp12", &ajp12_worker_factory );
+ env->registerFactory( env, "worker", "ajp12", (void *) &ajp12_worker_factory );
#endif
- env->registerFactory( env, "worker", "ajp13", &ajp14_worker_factory );
- env->registerFactory( env, "worker", "ajp14", &ajp14_worker_factory );
- env->registerFactory( env, "worker", "lb",&lb_worker_factory );
+ env->registerFactory( env, "worker", "ajp13", (void *) &ajp14_worker_factory );
+ env->registerFactory( env, "worker", "ajp14", (void *) &ajp14_worker_factory );
+ env->registerFactory( env, "worker", "lb",(void *) &lb_worker_factory );
#ifdef HAVE_JNI
- env->registerFactory( env, "worker", "jni", &jni_worker_factory );
+ env->registerFactory( env, "worker", "jni", (void *) &jni_worker_factory );
#endif
env->registerFactory( env, "channel", "socket", &jk_channel_socket_factory );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_handler_logon.c
mmanders01/11/26 11:34:40 Modified:jk/native/common jk_handler_logon.c Log: Added include of jk_md5.h so that the jk_md5 function is prototyped correctly. Revision ChangesPath 1.2 +2 -1 jakarta-tomcat-connectors/jk/native/common/jk_handler_logon.c Index: jk_handler_logon.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_handler_logon.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_handler_logon.c2001/11/26 17:03:25 1.1 +++ jk_handler_logon.c2001/11/26 19:34:40 1.2 @@ -58,7 +58,7 @@ /** * Description: AJP14 Login handler * Author: Henri Gomez <[EMAIL PROTECTED]> - * Version: $Revision: 1.1 $ + * Version: $Revision: 1.2 $ */ #include "jk_global.h" @@ -68,6 +68,7 @@ #include "jk_msg_buff.h" #include "jk_ajp_common.h" #include "jk_ajp14.h" +#include "jk_md5.h" #include "jk_logger.h" #include "jk_service.h" -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
mmanders01/11/26 11:34:00 Modified:jk/native/common jk_global.h Log: Removed some of the NetWare specific defines that only related to apache source files. Revision ChangesPath 1.15 +1 -10 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_global.h 2001/11/26 17:20:11 1.14 +++ jk_global.h 2001/11/26 19:34:00 1.15 @@ -59,20 +59,11 @@ * Description: Global definitions and include files that should exist * * anywhere * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.14 $ * + * Version: $Revision: 1.15 $ * ***/ #ifndef JK_GLOBAL_H #define JK_GLOBAL_H - -#ifdef NETWARE -#define _SYS_TYPES_H_ -#define _NETDB_H_INCLUDED -#define _IN_ -#define _INET_ -#define _SYS_TIMEVAL_H_ -#define _SYS_SOCKET_H_ -#endif #include "jk_version.h" -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
mmanders01/11/26 11:32:45 Modified:jk/native/apache-1.3 mod_jk.c Log: Added NetWare specific defines back into this file since they are ONLY related to this file (because of Winsock used to build this module). Revision ChangesPath 1.22 +14 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_jk.c 2001/11/21 00:09:22 1.21 +++ mod_jk.c 2001/11/26 19:32:45 1.22 @@ -61,7 +61,7 @@ * Author: Gal Shachor <[EMAIL PROTECTED]> * * Dan Milstein <[EMAIL PROTECTED]>* * Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.21 $ * + * Version: $Revision: 1.22 $ * ***/ /* @@ -79,6 +79,19 @@ #include "util_script.h" #include "util_date.h" #include "http_conf_globals.h" + +/* + * These defines are specific to this file and need to remain here for the + * NetWare connector. + */ +#ifdef NETWARE +#define _SYS_TYPES_H_ +#define _NETDB_H_INCLUDED +#define _IN_ +#define _INET_ +#define _SYS_TIMEVAL_H_ +#define _SYS_SOCKET_H_ +#endif /* * Jakarta (jk_) include files -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.nw
mmanders01/11/26 11:31:12 Removed: jk/native/apache-1.3 Makefile.nw Log: Removed since NetWare connectors can now be build using jkant. -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native/jni Makefile.nw
mmanders01/11/26 11:30:56 Removed: jk/native/jni Makefile.nw Log: Removed since NetWare connectors can now be build using jkant. -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
mmanders01/11/16 13:32:24
Modified:jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
Log:
Added alternate targets (since NLM names are limited to 8.3).
Revision ChangesPath
1.5 +15 -0
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
Index: MwldLinker.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MwldLinker.java 2001/11/12 23:31:58 1.4
+++ MwldLinker.java 2001/11/16 21:32:24 1.5
@@ -81,6 +81,21 @@
so.setExtension(".nlm");
so.duplicateTo( this );
project.setProperty("netware", "true");
+
+Enumeration e=altSoFiles.elements();
+while (e.hasMoreElements())
+{
+JkData data = (JkData) e.nextElement();
+String altSo = data.getValue();
+if (altSo == null)
+continue;
+else
+{
+so.setTarget(altSo);// set it on the master copy
+setTarget(altSo); // set it on ourself
+break;
+}
+}
}
public void execute() throws BuildException {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant SoTask.java
mmanders01/11/16 13:32:16
Modified:jk/jkant/java/org/apache/jk/ant SoTask.java
Log:
Added alternate targets (since NLM names are limited to 8.3).
Revision ChangesPath
1.20 +12 -0
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java
Index: SoTask.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SoTask.java 2001/11/12 23:34:47 1.19
+++ SoTask.java 2001/11/16 21:32:16 1.20
@@ -122,6 +122,7 @@
protected Vector exports= new Vector(); // used by the NetWare, win32
linkers
protected Vector modules= new Vector(); // used by the NetWare linker
protected Vector linkOpts = new Vector(); // used by the NetWare, win32
linkers
+protected Vector altSoFiles = new Vector(); // used by the NetWare linker
// Computed fields
protected Vector compileList; // [Source]
@@ -164,6 +165,7 @@
so.compileList=compileList;
so.compiler=compiler;
so.co_mapper=co_mapper;
+ so.altSoFiles=altSoFiles;
}
/** @deprecated use setTarget
@@ -242,6 +244,16 @@
public void addNLMModule(JkData module) {
module.setProject( project );
modules.add(module);
+}
+
+/**
+ * Add an alternate target since some platforms (NetWare) have file name
+ * limitations.
+ *
+ */
+public void addAltSoFile(JkData altSo) {
+ altSo.setProject( project );
+altSoFiles.add(altSo);
}
/** Set the target for this compilation. Don't include any
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders01/11/16 13:32:03 Modified:jk/native build.xml Log: Added alternate targets (since NLM names are limited to 8.3). Revision ChangesPath 1.15 +5 -0 jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- build.xml 2001/11/15 19:38:02 1.14 +++ build.xml 2001/11/16 21:32:03 1.15 @@ -68,6 +68,8 @@ + + + @@ -285,6 +288,8 @@ + + mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders01/11/15 11:38:02 Modified:jk/native build.xml Log: Added target for building netscape binaries. Revision ChangesPath 1.14 +134 -19 jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- build.xml 2001/11/12 23:36:13 1.13 +++ build.xml 2001/11/15 19:38:02 1.14 @@ -49,15 +49,51 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,7 +139,6 @@ - @@ -112,12 +147,14 @@ + + @@ -172,23 +209,6 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native build.properties.sample
mmanders01/11/15 11:37:42
Modified:jk/native build.properties.sample
Log:
Added defaults for netscape and windows.
Revision ChangesPath
1.3 +10 -0 jakarta-tomcat-connectors/jk/native/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.properties.sample,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties.sample 2001/11/07 15:26:52 1.2
+++ build.properties.sample 2001/11/15 19:37:42 1.3
@@ -6,6 +6,9 @@
# Same for Apache1.3
apache13.home=/usr
+# Same for Netscape
+netscape.home=d:/tools/sdk/netscape
+
# Compile-time options
so.debug=true
so.optimize=false
@@ -18,4 +21,11 @@
# build.compiler.base=d:/tools/mw/6.0
# build.compiler.cc=${build.compiler.base}/bin/mwccnlm
# build.compiler.ld=${build.compiler.base}/bin/mwldnlm
+
+# Settings for building Windows binaries. Uncomment these and modify for your
+# environment to build Windows binaries.
+#
+# build.compiler.base=c:/Program Files/Microsoft Visual Studio/VC98
+# build.compiler.cc=${build.compiler.base}/bin/cl
+# build.compiler.ld=${build.compiler.base}/bin/link
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/native build.xml
mmanders01/11/12 15:36:13 Modified:jk/native build.xml Log: Updated apache13 target to add win32 dependencies in. Added linkOpt tags in. Revision ChangesPath 1.13 +39 -16jakarta-tomcat-connectors/jk/native/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- build.xml 2001/11/11 01:16:20 1.12 +++ build.xml 2001/11/12 23:36:13 1.13 @@ -114,32 +114,36 @@ - - - - + + + + + + + + - - - - + + + + + + + + @@ -149,6 +153,22 @@ + + + + + + + + + + + + + + + + @@ -163,6 +183,8 @@ + + @@ -205,6 +227,7 @@ + -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant SoTask.java
mmanders01/11/12 15:34:47
Modified:jk/jkant/java/org/apache/jk/ant SoTask.java
Log:
Added a link options vector similar to imports, exports, etc.
Revision ChangesPath
1.19 +18 -6
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java
Index: SoTask.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SoTask.java 2001/11/11 01:14:52 1.18
+++ SoTask.java 2001/11/12 23:34:47 1.19
@@ -117,10 +117,11 @@
protected boolean optG=true;
protected boolean optimize=false;
protected boolean profile=false;
-protected Vector defines = new Vector();
-protected Vector imports = new Vector();// used by the NetWare linker
-protected Vector exports = new Vector();// used by the NetWare linker
-protected Vector modules = new Vector();// used by the NetWare linker
+protected Vector defines= new Vector();
+protected Vector imports= new Vector(); // used by the NetWare, win32
linkers
+protected Vector exports= new Vector(); // used by the NetWare, win32
linkers
+protected Vector modules= new Vector(); // used by the NetWare linker
+protected Vector linkOpts = new Vector(); // used by the NetWare, win32
linkers
// Computed fields
protected Vector compileList; // [Source]
@@ -158,6 +159,7 @@
so.imports=imports;
so.exports=exports;
so.modules=modules;
+ so.linkOpts=linkOpts;
so.srcList=srcList;
so.compileList=compileList;
so.compiler=compiler;
@@ -203,7 +205,7 @@
}
/**
- * Add an import file/symbol for NetWare platform
+ * Add an import file/symbol for NetWare or win32 platform
*
*
*/
@@ -213,13 +215,23 @@
}
/**
- * Add an export file/symbol for NetWare platform
+ * Add an export file/symbol for NetWare or win32 platform
*
*
*/
public void addExport(JkData exp) {
exp.setProject( project );
exports.add(exp);
+}
+
+/**
+ * Add a link option for NetWare or win32 platform
+ *
+ *
+ */
+public void addLinkOpt(JkData option) {
+ option.setProject( project );
+linkOpts.add(option);
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MsvcCompiler.java
mmanders01/11/12 15:33:48
Modified:jk/jkant/java/org/apache/jk/ant/compilers MsvcCompiler.java
Log:
Added a -c flag to only compile the source files. Linking will be handled in a
separate step.
Revision ChangesPath
1.2 +1 -1
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java
Index: MsvcCompiler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MsvcCompiler.java 2001/11/11 01:08:00 1.1
+++ MsvcCompiler.java 2001/11/12 23:33:48 1.2
@@ -133,7 +133,7 @@
String localCflags=cflags;
File ccOpt = new File(buildDir, "cc.opt");
if( localCflags==null ) {
-localCflags=new String("-nologo -MT -W3 -GX -O2");
+localCflags=new String("-nologo -MT -W3 -GX -O2 -c");
if( extra_cflags!=null ) {
localCflags+=" " + extra_cflags;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MsvcLinker.java
mmanders01/11/12 15:32:45
Modified:jk/jkant/java/org/apache/jk/ant/compilers MsvcLinker.java
Log:
Updated to use linkOpts from the build.xml file. Made the link.def more generic (in
case we don't declare exports on the link.)
Revision ChangesPath
1.2 +20 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java
Index: MsvcLinker.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MsvcLinker.java 2001/11/11 01:08:00 1.1
+++ MsvcLinker.java 2001/11/12 23:32:45 1.2
@@ -127,6 +127,15 @@
linkOptPw.print("/dll ");
linkOptPw.print("/incremental:no ");
+// write out any additional link options
+Enumeration opts = linkOpts.elements();
+while( opts.hasMoreElements() ) {
+JkData opt = (JkData) opts.nextElement();
+String option = opt.getValue();
+if( option == null ) continue;
+linkOptPw.println( option );
+}
+
// add debug information in if requested
if (optG)
{
@@ -145,14 +154,18 @@
}
// Write the library name to the def file
linkDefPw.println("LIBRARY\t\""+soFile+"\"");
-// write the exports to link with to the .def file
+
+// write the exported symbols to the .def file
Enumeration exps = exports.elements();
-linkDefPw.println("EXPORTS");
-while( exps.hasMoreElements() ) {
-JkData exp = (JkData) exps.nextElement();
-String name = exp.getValue();
-if( name==null ) continue;
-linkDefPw.println("\t" + name);
+if ( exps.hasMoreElements() )
+{
+linkDefPw.println("EXPORTS");
+while( exps.hasMoreElements() ) {
+JkData exp = (JkData) exps.nextElement();
+String name = exp.getValue();
+if( name==null ) continue;
+linkDefPw.println("\t" + name);
+}
}
}
catch (IOException ioe)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
mmanders01/11/12 15:31:58
Modified:jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
Log:
Updated to use linkOpts from the build.xml file.
Revision ChangesPath
1.4 +12 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
Index: MwldLinker.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MwldLinker.java 2001/11/10 16:49:16 1.3
+++ MwldLinker.java 2001/11/12 23:31:58 1.4
@@ -116,14 +116,9 @@
// write the link flags out
linkOptPw.println("-warnings off");
linkOptPw.println("-zerobss");
-linkOptPw.println("-desc \"Tomcat Connector\"");
linkOptPw.println("-o " + soFile + ".nlm");
-linkOptPw.println("-screenname \"System Console\"");
-linkOptPw.println("-nlmversion 1,20,2");
-linkOptPw.println("-nodefaults");
linkOptPw.println("-map " + soFile + ".map");
-linkOptPw.println("-threadname \"Tomcat JKThread\"");
-linkOptPw.println("-stacksize 64000");
+linkOptPw.println("-nodefaults");
// add debug information in if requested
if (optG)
@@ -133,12 +128,22 @@
linkOptPw.println("-sym codeview4");
linkOptPw.println("-osym " + soFile + ".NCV");
}
+
+// write out any additional link options
+Enumeration opts = linkOpts.elements();
+while( opts.hasMoreElements() ) {
+JkData opt = (JkData) opts.nextElement();
+String option = opt.getValue();
+if( option == null ) continue;
+linkOptPw.println( option );
+}
+
// add the default startup code to the list of objects
linkOptPw.println(libBase + "\\lib\\nwpre.obj");
// write the objects to link with to the .opt file
for( int i=0; imailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
cvs commit: jakarta-tomcat/src/doc Tomcat-on-NetWare-HowTo.html
mmanders01/10/24 09:31:21 Modified:src/doc Tomcat-on-NetWare-HowTo.html Log: Fixed errors related to new functionality in 3.3 release. Revision ChangesPath 1.3 +25 -19jakarta-tomcat/src/doc/Tomcat-on-NetWare-HowTo.html Index: Tomcat-on-NetWare-HowTo.html === RCS file: /home/cvs/jakarta-tomcat/src/doc/Tomcat-on-NetWare-HowTo.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Tomcat-on-NetWare-HowTo.html 2001/05/18 20:39:39 1.2 +++ Tomcat-on-NetWare-HowTo.html 2001/10/24 16:31:21 1.3 @@ -160,15 +160,15 @@ ; that will automatically close (-nsac) with the screen called Tomcat ; (-snTomcat) and the current working directory set to TOMCAT_HOME ; (-envCWD=$TOMCAT_HOME) -java -nsac -snTomcat -envCWD=$TOMCAT_HOME -classpath $TOMCAT_CLASSPATH -Dtomcat.home=SYS:\jakarta-tomcat.3.3 org.apache.tomcat.startup.Main %1 +java -nsac -snTomcat -envCWD=$TOMCAT_HOME -classpath $TOMCAT_CLASSPATH -Dtomcat.home=SYS:\jakarta-tomcat-3.3 org.apache.tomcat.startup.Main %1 %2 %3 %3 %5 %6 %7 %8 %9 As the comment states, you will need to make sure that TOMCAT_HOME points to the correct directory. By putting this NCF file in SYS:\System you can start Tomcat by just -typing tomcat at the system console. You can also +typing tomcat start at the system console. You can also add this to your autoexec.ncf to automatically start Tomcat when your system -comes up. The %1 at the end of the command line allows you also pass in -a --stop parameter to shutdown Tomcat. +comes up. The %1 ... %9 at the end of the command line allows you also pass in +additional parameters to Tomcat. Try tomcat help to see +a base list of parameters available. 2. @@ -185,27 +185,29 @@ the NetWare Web Manager. -In the Init section add: +In the Init section add the following 2 lines (if you see more than 2 lines, +your browser is wrapping the lines): Init fn="load-modules" funcs="jk_init,jk_service" shlib="sys:/jakarta-tomcat-3.3/bin/netscape/netware/i386/nsapi_rd.nlm" Init fn="jk_init" worker_file="sys:/jakarta-tomcat-3.3/conf/workers.properties" log_level="debug" log_file="sys:/jakarta-tomcat-3.3/logs/nsapi.log" -In the default object NameTrans section add: +In the default object NameTrans section add the following 3 lines: NameTrans fn="assign-name" from="/servlet/*" name="Tomcat" +NameTrans fn="assign-name" from="/*.jsp" name="Tomcat" NameTrans fn="assign-name" from="/examples/*" name="Tomcat" -Create a new configuration object by adding the following lines to the +Create a new configuration object by adding the following 4 lines to the end of the obj.conf file: -<Object name=Tomcat> +<Object name="Tomcat"> ObjectType fn="force-type" type="text/plain" -Service fn="jk_service" worker="ajp12" +Service fn="jk_service" worker="ajp13" </Object> Now stop and restart the NetWare Enterprise Web Server, make sure that Tomcat is running (i.e. run the tomcat.ncf file mentioned in Running -Tomcat Standalone and you should be +Tomcat Standalone) and you should be able to access http://server:port/examples/";> http://server:port/examples/. Additional configuration information can be found in Tomcat Netscape HowTo. @@ -215,15 +217,19 @@ To run Tomcat with Apache on NetWare, you need to download mod_jk.nlm and copy it to you NetWare server. A good location is the modules directory under your Apache installation. If you copy mod_jk.nlm there, then -a base configuration file called mod_jk.conf-auto is created when Tomcat -starts up that has a default set of Apache configuration directives that -map appropriate URIs from Apache to Tomcat. Just add the following line to -your httpd.conf file, replacing SYS:/jakarta-tomcat-3.3 with the directory where tomcat is -installed: -Include "SYS:/jakarta-tomcat-3.3/conf/mod_jk.conf-auto" +a base configuration file called mod_jk.conf can be generated by Tomcat that +has a default set of Apache configuration directives that +map appropriate URIs from Apache to Tomcat. First, run +tomcat jkconf (i.e. run the tomcat.ncf file mentioned +in Running Tomcat Standalone with a +jkconf parameter) to generate the file +<tomcat_home>/conf/auto/mod_jk.conf. Then add the following line to +your httpd.conf file, replacing SYS:/jakarta-tomcat-3.3 with the directory +where Tomcat is installed: +Include "SYS:/jakarta-tomcat-3.3/conf/auto/mod_jk.conf" You can also just copy the appropriate configur
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/http Cookies.java
mmanders01/10/18 07:06:23
Modified:src/share/org/apache/tomcat/util/http Cookies.java
Log:
Fixed a problem where a value containing a space was truncated at the space. The
RFC is somewhat vague in this reguard, but this patch matches functionality of other
versions of Tomcat and other servlet conainters. Fixes bug 4237.
Revision ChangesPath
1.10 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/util/http/Cookies.java
Index: Cookies.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/http/Cookies.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cookies.java 2001/07/19 05:51:30 1.9
+++ Cookies.java 2001/10/18 14:06:23 1.10
@@ -357,7 +357,7 @@
{
while( off < end ) {
byte b=bytes[off];
- if( b==' ' || b==';' || b==',' )
+ if( b==';' || b==',' )
return off;
off++;
}
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Http10Interceptor.java
mmanders01/10/03 15:13:45
Modified:src/share/org/apache/tomcat/modules/server
Http10Interceptor.java
Log:
Fix Bug #3944 request.getRemoteAddr() alays returning 127.0.0.1
Bug report from Alessandro Polverini
Since the base Request object set remoteAddr and remoteHost to defaults,
the checks around setting them off of the real request always succeed so the
real values are never used. Added calls to recycle these in the constructor.
This still allows for delayed setting, since the calls to set the values can be
expensive.
Revision ChangesPath
1.26 +4 -0
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java
Index: Http10Interceptor.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Http10Interceptor.java2001/09/22 22:05:31 1.25
+++ Http10Interceptor.java2001/10/03 22:13:45 1.26
@@ -209,6 +209,10 @@
public HttpRequest() {
super();
+
+// recycle these to remove the defaults
+remoteAddrMB.recycle();
+remoteHostMB.recycle();
}
public Object getAttribute(String name) {
if (name.equals("javax.servlet.request.X509Certificate")) {
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
mmanders01/08/22 09:58:29
Modified:src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
Added code to handle shutdown a little cleaner by setting soLinger to a small value
(0) just before we close the socket, and just logging any exceptions instead of doing
a stacktrace to the console. This helps make sure that the connections shutdown
cleanly on NetWare.
Revision ChangesPath
1.14 +7 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PoolTcpEndpoint.java 2001/08/12 03:57:52 1.13
+++ PoolTcpEndpoint.java 2001/08/22 16:58:29 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
1.13 2001/08/12 03:57:52 costin Exp $
- * $Revision: 1.13 $
- * $Date: 2001/08/12 03:57:52 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
1.14 2001/08/22 16:58:29 mmanders Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/08/22 16:58:29 $
*
*
*
@@ -291,12 +291,15 @@
s=new Socket("127.0.0.1", port );
}else{
s=new Socket(inet, port );
+// setting soLinger to a small value will help shutdown the
+// connection quicker
+s.setSoLinger(true, 0);
}
s.close();
// System.out.println("Closing socket " + port );
serverSocket.close(); // XXX?
} catch(Exception e) {
- e.printStackTrace();
+log("Caught exception trying to unlock accept.", e);
}
serverSocket = null;
}
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup StopTomcat.java
mmanders01/08/22 09:56:28
Modified:src/share/org/apache/tomcat/startup StopTomcat.java
Log:
Added code to handle shutdown a little cleaner by flushing the output stream and
wait for one second before trying to close the stream. This gives the backend a
chance to read the stream cleanly before it goes away.
Revision ChangesPath
1.11 +18 -0
jakarta-tomcat/src/share/org/apache/tomcat/startup/StopTomcat.java
Index: StopTomcat.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/StopTomcat.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StopTomcat.java 2001/08/21 05:35:26 1.10
+++ StopTomcat.java 2001/08/22 16:56:28 1.11
@@ -244,6 +244,15 @@
Socket socket = new Socket(address, portInt);
OutputStream os=socket.getOutputStream();
sendAjp12Stop( os, secret );
+
+// Setting soLinger to 0 will help make sure the connection is
+// closed on NetWare. If the other side closes the connection
+// first, we get a SocketException so catch and ignore it
+try {
+socket.setSoLinger(true, 0);
+}
+catch (java.net.SocketException ignore) {
+}
os.flush();
os.close();
// socket.close();
@@ -264,6 +273,15 @@
os.write( stopMessage );
if(secret!=null )
sendAjp12String( os, secret );
+
+// flush the stream and give the backend a chance to read the request
+// and shut down before we close the socket
+os.flush();
+try {
+Thread.sleep(1000);
+}
+catch (InterruptedException ignore) {
+}
}
/** Small AJP12 client util
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12.java
mmanders01/08/22 09:53:57 Modified:src/share/org/apache/tomcat/modules/server Ajp12.java Log: On some platforms (NetWare) calling System.exit without closing a socket leaves the socket in a timewait state for several minutes making it impossible to restart Tomcat quickly. Added code to handle shutdown a little cleaner. Revision ChangesPath 1.19 +7 -0 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java Index: Ajp12.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Ajp12.java2001/05/21 04:27:54 1.18 +++ Ajp12.java2001/08/22 16:53:57 1.19 @@ -282,6 +282,13 @@ // that stopping everything doesn't work - // need to figure // out what happens with the threads ( XXX ) +// until we remove the System.exit() call we +// also need to close the socket to allow the +// underlying layer to shutdown the connection +// properly. Setting soLinger small will +// speed this up. +socket.setSoLinger(true, 0); +sin.close(); System.exit(0); shutdown=true; return;
cvs commit: jakarta-tomcat/src/etc/jk mod_jk.conf-jni
mmanders01/08/14 19:40:37 Added: src/etc/jk mod_jk.conf-jni Log: Sample configuration file for use with JNI configuration. Revision ChangesPath 1.1 jakarta-tomcat/src/etc/jk/mod_jk.conf-jni Index: mod_jk.conf-jni === LoadModule jk_module modules/mod_jk.dll JkWorkersFile /jni_workers.properties JkLogFile logs/mod_jk-jni.log JkLogLevel error JkMount /*.jsp jni JkMount /servlet/* jni JkMount /examples/* jni
cvs commit: jakarta-tomcat/src/etc/jk jni_workers.properties
mmanders01/08/14 19:40:04 Modified:src/etc/jk jni_workers.properties Log: Updated file to match 3.3 configuration. Revision ChangesPath 1.2 +4 -8 jakarta-tomcat/src/etc/jk/jni_workers.properties Index: jni_workers.properties === RCS file: /home/cvs/jakarta-tomcat/src/etc/jk/jni_workers.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jni_workers.properties2000/09/09 23:21:20 1.1 +++ jni_workers.properties2001/08/15 02:40:04 1.2 @@ -16,12 +16,8 @@ # # Additional class path components. # -worker.jni.class_path=d:\tomcat\classes -worker.jni.class_path=d:\tomcat\lib\xml.jar -worker.jni.class_path=d:\tomcat\lib\jasper.jar -worker.jni.class_path=d:\tomcat\lib\servlet.jar -worker.jni.class_path=d:\tomcat\lib\webserver.jar -worker.jni.class_path=d:\sdk\jdk1.2.2\lib\tools.jar +worker.jni.class_path=d:\temp\tomcat\lib\container\tomcat-startup.jar +worker.jni.class_path=d:\temp\tomcat\lib\container\tomcat_modules.jar # worker.jni.class_path=d:\SQLLIB\java\db2java.zip # @@ -45,8 +41,8 @@ # # Setting the place for the stdout and stderr of tomcat # -worker.jni.stdout=d:\tomcat\jvm.stdout -worker.jni.stderr=d:\tomcat\jvm.stderr +worker.jni.stdout=d:\tomcat\logs\jvm.stdout +worker.jni.stderr=d:\tomcat\logs\jvm.stderr # # Setting the tomcat.home Java property
cvs commit: jakarta-tomcat/src/etc jni_server.xml
mmanders01/08/14 19:39:35 Added: src/etc jni_server.xml Log: Sample jni_server.xml that matches 3.3 setup. Revision ChangesPath 1.4 +176 -59 jakarta-tomcat/src/etc/jni_server.xml
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server JNIEndpoint.java
mmanders01/08/14 19:32:02
Modified:src/share/org/apache/tomcat/modules/server JNIEndpoint.java
Log:
Added necessary synchronization around notify calls and added a stacktrace on
exceptions from calls to processConnection.
Revision ChangesPath
1.2 +12 -5
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java
Index: JNIEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNIEndpoint.java 2000/09/17 06:37:53 1.1
+++ JNIEndpoint.java 2001/08/15 02:32:02 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
1.1 2000/09/17 06:37:53 costin Exp $
- * $Revision: 1.1 $
- * $Date: 2000/09/17 06:37:53 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIEndpoint.java,v
1.2 2001/08/15 02:32:02 mmanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/08/15 02:32:02 $
*
*
*
@@ -95,13 +95,17 @@
// the handler is no longer useable
if( handler==null ) {
running=false;
- notify();
+synchronized(this) {
+notify();
+}
return;
}
System.out.println("Running ...");
running=true;
-notify();
+synchronized(this) {
+notify();
+}
}
// JNI Entry points
@@ -156,6 +160,9 @@
return 1;
} catch(Throwable t) {
// Throwables are not allowed into the native code !!!
+// print it out so that we can debug it later.
+System.out.println("Caught throwable " + t);
+t.printStackTrace();
}
}
return 0;
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server JNIConnectionHandler.java
mmanders01/08/14 19:30:29
Modified:src/share/org/apache/tomcat/modules/server
JNIConnectionHandler.java
Log:
Added check for NetWare to load appropriate library.
Revision ChangesPath
1.10 +5 -3
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java
Index: JNIConnectionHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JNIConnectionHandler.java 2001/02/27 02:55:41 1.9
+++ JNIConnectionHandler.java 2001/08/15 02:30:29 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java,v
1.9 2001/02/27 02:55:41 costin Exp $
- * $Revision: 1.9 $
- * $Date: 2001/02/27 02:55:41 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/JNIConnectionHandler.java,v
1.10 2001/08/15 02:30:29 mmanders Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/08/15 02:30:29 $
*
*
*
@@ -127,6 +127,8 @@
String os=System.getProperty( "os.name" ).toLowerCase();
if( os.indexOf("windows")>= 0) {
f = new File(f, "jni_connect.dll");
+} else if ( os.indexOf("netware")>= 0) {
+f = new File(f, "jni_conn.nlm");
} else {
f = new File(f, "jni_connect.so");
}
cvs commit: jakarta-tomcat/src/native/mod_jk/jni jk_jnicb.c jk_jnicb.exp jk_jnicb.h
mmanders01/08/14 19:28:56
Modified:src/native/mod_jk/jni jk_jnicb.c jk_jnicb.exp jk_jnicb.h
Log:
Fixed function names to match new classes.
Revision ChangesPath
1.2 +13 -13jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.c
Index: jk_jnicb.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_jnicb.c2000/08/26 02:03:52 1.1
+++ jk_jnicb.c2001/08/15 02:28:56 1.2
@@ -56,7 +56,7 @@
/***
* Description: JNI callbacks implementation for the JNI in process adapter*
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***/
#include "jk_jnicb.h"
@@ -65,12 +65,12 @@
#include "jk_pool.h"
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method:getNumberOfHeaders
* Signature: (JJ)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_getNumberOfHeaders
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_getNumberOfHeaders
(JNIEnv *env, jobject o, jlong s, jlong l)
{
/* [V] Convert indirectly from jlong -> int -> pointer to shut up gcc */
@@ -94,12 +94,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method:read
* Signature: (JJ[BII)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_read
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_read
(JNIEnv *env, jobject o, jlong s, jlong l, jbyteArray buf, jint from, jint cnt)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
@@ -141,12 +141,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method:readEnvironment
* Signature: (JJ[Ljava/lang/String;)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readEnvironment
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readEnvironment
(JNIEnv *env, jobject o, jlong s, jlong l, jobjectArray envbuf)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
@@ -288,12 +288,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method:readHeaders
* Signature: (JJ[Ljava/lang/String;[Ljava/lang/String;)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_readHeaders
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readHeaders
(JNIEnv *env, jobject o, jlong s, jlong l, jobjectArray hnames, jobjectArray
hvalues)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
@@ -330,12 +330,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method:startReasponse
* Signature: (JJILjava/lang/String;[Ljava/lang/String;[Ljava/lang/String;I)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_startReasponse
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_startReasponse
(JNIEnv *env, jobject o, jlong s, jlong l,
jint sc, jstring msg, jobjectArray hnames, jobjectArray hvalues, jint hcnt)
{
@@ -455,12 +455,12 @@
}
/*
- * Class: org_apache_tomcat_service_connector_JNIConnectionHandler
+ * Class: org_apache_tomcat_modules_server_JNIConnectionHandler
* Method:write
* Signature: (JJ[BII)I
*/
JNIEXPORT jint JNICALL
-Java_org_apache_tomcat_service_connector_JNIConnectionHandler_write
+Java_org_apache_tomcat_modules_server_JNIConnectionHandler_write
(JNIEnv *env, jobject o, jlong s, jlong l, jbyteArray buf, jint from, jint cnt)
{
jk_ws_service_t *ps = (jk_ws_service_t *)(int)s;
1.2 +6 -6 jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.exp
Index: jk_jnicb.exp
===
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/jni/jk_jnicb.exp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
cvs commit: jakarta-tomcat/src/native/mod_jk/jni jni_connect.dsp
mmanders01/08/14 19:28:22 Modified:src/native/mod_jk/jni jni_connect.dsp Log: Fixed include path for debug build. Revision ChangesPath 1.3 +1 -1 jakarta-tomcat/src/native/mod_jk/jni/jni_connect.dsp Index: jni_connect.dsp === RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/jni/jni_connect.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jni_connect.dsp 2001/02/15 12:23:58 1.2 +++ jni_connect.dsp 2001/08/15 02:28:22 1.3 @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JNI_CONNECT_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\jk" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JNI_CONNECT_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JNI_CONNECT_EXPORTS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG"
cvs commit: jakarta-tomcat/src/native/mod_jk/common jk_jni_worker.c
mmanders01/08/14 19:27:31
Modified:src/native/mod_jk/common jk_jni_worker.c
Log:
Fixed bridge class name and rolled 3.2.3 fixes into 3.3.
Revision ChangesPath
1.3 +32 -8 jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_jni_worker.c 2000/11/10 18:48:50 1.2
+++ jk_jni_worker.c 2001/08/15 02:27:31 1.3
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***/
#if !defined(WIN32) && !defined(NETWARE)
@@ -89,8 +89,9 @@
jint (JNICALL *jni_get_default_java_vm_init_args)(void *) = NULL;
jint (JNICALL *jni_create_java_vm)(JavaVM **, JNIEnv **, void *) = NULL;
+jint (JNICALL *jni_get_created_java_vms)(JavaVM **, int, int *) = NULL;
-#define JAVA_BRIDGE_CLASS_NAME ("org/apache/tomcat/service/JNIEndpoint")
+#define JAVA_BRIDGE_CLASS_NAME ("org/apache/tomcat/modules/server/JNIEndpoint")
static jk_worker_t *the_singleton_jni_worker = NULL;
@@ -688,10 +689,16 @@
(FARPROC)jni_create_java_vm =
GetProcAddress(hInst, "JNI_CreateJavaVM");
+(FARPROC)jni_get_created_java_vms =
+GetProcAddress(hInst, "JNI_GetCreatedJavaVMs");
+
(FARPROC)jni_get_default_java_vm_init_args =
GetProcAddress(hInst, "JNI_GetDefaultJavaVMInitArgs");
+
+jk_log(l, JK_LOG_DEBUG,
+ "Loaded all JNI procs\n");
-if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+if(jni_create_java_vm && jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
return JK_TRUE;
}
@@ -711,9 +718,10 @@
}
if (0 != javaNlmHandle) {
jni_create_java_vm = ImportSymbol(GetNLMHandle(), "JNI_CreateJavaVM");
+jni_get_created_java_vms = ImportSymbol(GetNLMHandle(),
"JNI_GetCreatedJavaVMs");
jni_get_default_java_vm_init_args = ImportSymbol(GetNLMHandle(),
"JNI_GetDefaultJavaVMInitArgs");
}
-if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+if(jni_create_java_vm && jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
return JK_TRUE;
}
#else
@@ -729,9 +737,10 @@
dlerror());
} else {
jni_create_java_vm = dlsym(handle, "JNI_CreateJavaVM");
+jni_get_created_java_vms = dlsym(handle, "JNI_GetCreatedJavaVMs");
jni_get_default_java_vm_init_args = dlsym(handle,
"JNI_GetDefaultJavaVMInitArgs");
-if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+if(jni_create_java_vm && jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
jk_log(l, JK_LOG_DEBUG,
"In load_jvm_dll, symbols resolved, done\n");
return JK_TRUE;
@@ -909,7 +918,7 @@
int optn = 0, err;
char* tmp;
-*env = NULL;
+*env = penv = NULL;
jk_log(l, JK_LOG_DEBUG,
"Into open_jvm2\n");
@@ -970,10 +979,25 @@
}
jk_log(l, JK_LOG_DEBUG, "In open_jvm2, about to create JVM...\n");
+
+err=jni_create_java_vm(&(p->jvm), &penv, &vm_args);
+
+if (JNI_EEXIST == err)
+{
+int vmCount;
+ jk_log(l, JK_LOG_DEBUG, "JVM alread instantiated. Trying to attach
instead.\n");
-if((err=jni_create_java_vm(&(p->jvm), &penv, &vm_args)) != 0) {
+jni_get_created_java_vms(&(p->jvm), 1, &vmCount);
+if (NULL != p->jvm)
+penv = attach_to_jvm(p, l);
+
+if (NULL != penv)
+err = 0;
+}
+
+if(err != 0) {
jk_log(l, JK_LOG_EMERG, "Fail-> could not create JVM, code: %d \n", err);
-return JK_FALSE;
+return JK_FALSE;
}
jk_log(l, JK_LOG_DEBUG, "In open_jvm2, JVM created, done\n");
cvs commit: jakarta-tomcat KEYS
mmanders01/07/23 16:24:46 Modified:.KEYS Log: Added my key so I can sign NetWare binaries. Revision ChangesPath 1.5 +22 -0 jakarta-tomcat/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat/KEYS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- KEYS 2001/07/10 23:13:20 1.4 +++ KEYS 2001/07/23 23:24:46 1.5 @@ -102,3 +102,25 @@ exuadIvVuO6wHxaKqnBjAJ0Zmsli7ai95+k7BwOpWx3Hv8YWVw== =GIGG -END PGP PUBLIC KEY BLOCK- + +Type bits keyID Date User ID +DSS 1024 0xCB6BEA8E 2001/06/22 Mike Anderson <[EMAIL PROTECTED]> + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: PGP 6.5.1i + +mQGiBDszrqcRBAD1DHL83sM2Bi728OLtSFTFiaik0FbKDXO4+LXwJyGbDWEU6RH2 +FPkJdNjmnBkjEWMxMmffXijXhOVtO4zwR/alHD8E+PLuxxAlUeJNK742i2wB5jVH +CsTaYUrtqvcI/1DIy8TwYp/9W9/skQUeoCth0fNPOGG323L+pQn7pBBB0QCg/+KM +AS3GRytDQUDVNICHuvf5HPMEAOSdzS5mp6mdz2zrhpLku3V48BUdNMaTwEfV9Msa +2T+kc++q1evNkM+hN3CNM8Wx2UMnAM0a97QSUsP4UuNo/b0PbYqZWY7beIYgUB9E +e29A57T9QyhKRwhkrOZKzij3zGfpwfvQk0qvAl0CtFJ+UJ350aKt0tV9IGXVPoDG +FfR2BADCN5npX8r8UGcIrYvQL+dHxElAi4OFC6vMg5eisVa5PiroS1fP1nlbtItS +1/VydCXkpUFQyMZVANaOBIsI4V2KdxEpGA9n/BtKUGf9NZice3SynaYMpF0keQ8P +noCaUSNGb1qx1up0uixdFweQQp20hQiLK3yQ41sSmnRz4uPxHLQjTWlrZSBBbmRl +cnNvbiA8bW1hbmRlcnNAYXBhY2hlLm9yZz6JAE4EEBECAA4FAjszrqgECwMBAgIZ +AQAKCRBWYGoty2vqjl4/AKDOYJvxECTfzDqA78d1VjTUJ0LZwgCbB/3/ZjF5oWwK +X2nG0HLzYyS5Ies= +=waB/ +-END PGP PUBLIC KEY BLOCK- +
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13.h jk_ajp_common.c jk_ajp_common.h
mmanders01/07/23 14:02:43
Modified:jk/native/common jk_ajp13.h jk_ajp_common.c jk_ajp_common.h
Log:
Ported fixes for AJP13 wrong response from Tomcat 3.3 branch.
Revision ChangesPath
1.5 +2 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp13.h
Index: jk_ajp13.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_ajp13.h2001/06/18 14:15:18 1.4
+++ jk_ajp13.h2001/07/23 21:02:43 1.5
@@ -58,7 +58,7 @@
/***
* Description: Experimental bi-directionl protocol handler. *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***/
#ifndef JK_AJP13_H
#define JK_AJP13_H
@@ -78,6 +78,7 @@
#define AJP13_READ_BUF_SIZE (8*1024)
#define AJP13_DEF_CACHE_SZ (1)
#define JK_INTERNAL_ERROR(-2)
+#define JK_FATAL_ERROR (-3)
#define AJP13_MAX_SEND_BODY_SZ (DEF_BUFFER_SZ - 6)
/*
1.6 +22 -9 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_ajp_common.c 2001/06/22 08:33:56 1.5
+++ jk_ajp_common.c 2001/07/23 21:02:43 1.6
@@ -59,7 +59,7 @@
* Description: common stuff for bi-directional protocols ajp13/ajp14. *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***/
@@ -68,8 +68,9 @@
#include "jk_ajp13.h"
#include "jk_ajp14.h"
#include "jk_ajp_common.h"
-#include "jk_connect.h"
+#include "jk_connect.h"
+
const char *response_trans_headers[] = {
"Content-Type",
"Content-Language",
@@ -801,8 +802,8 @@
* We send here the first part of data which was sent previously to the
* remote Tomcat
*/
- if (jk_b_get_len(op->reply) > AJP_HEADER_LEN) {
- if(!ajp_connection_tcp_send_message(ae, op->reply, l)) {
+ if (jk_b_get_len(op->post) > AJP_HEADER_LEN) {
+ if(!ajp_connection_tcp_send_message(ae, op->post, l)) {
jk_log(l, JK_LOG_ERROR, "Error resending request body\n");
return JK_FALSE;
}
@@ -818,7 +819,7 @@
unsigned len = ae->left_bytes_to_send;
if (len > AJP13_MAX_SEND_BODY_SZ)
len = AJP13_MAX_SEND_BODY_SZ;
- if (! ajp_read_into_msg_buff(ae, s, op->reply, len, l)) {
+ if (! ajp_read_into_msg_buff(ae, s, op->post, len, l)) {
/* the browser stop sending data, no need to recover */
op->recoverable = JK_FALSE;
return JK_FALSE;
@@ -838,6 +839,7 @@
*/
static int ajp_process_callback(jk_msg_buf_t *msg,
+jk_msg_buf_t *pmsg,
ajp_endpoint_t *ae,
jk_ws_service_t *r,
jk_logger_t *l)
@@ -859,7 +861,7 @@
(const char * const *)res.header_values,
res.num_headers)) {
jk_log(l, JK_LOG_ERROR, "Error ajp_process_callback -
start_response failed\n");
-return JK_INTERNAL_ERROR;
+return JK_FATAL_ERROR;
}
}
break;
@@ -869,7 +871,7 @@
unsigned len = (unsigned)jk_b_get_int(msg);
if(!r->write(r, jk_b_get_buff(msg) + jk_b_get_pos(msg), len)) {
jk_log(l, JK_LOG_ERROR, "Error ajp_process_callback - write
failed\n");
-return JK_INTERNAL_ERROR;
+
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/buf UDecoder.java
mmanders01/07/23 11:40:30 Modified:src/share/org/apache/tomcat/util/buf UDecoder.java Log: Fixed an ArrayOutOfBoundException in convert( CharChunk mb ). Copied the same test used in convert( ByteChunk mb ). Submitted by: Thibault FREY <[EMAIL PROTECTED]> Revision ChangesPath 1.5 +1 -0 jakarta-tomcat/src/share/org/apache/tomcat/util/buf/UDecoder.java Index: UDecoder.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/buf/UDecoder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- UDecoder.java 2001/07/19 05:49:02 1.4 +++ UDecoder.java 2001/07/23 18:40:30 1.5 @@ -143,6 +143,7 @@ } if( idx2 >= 0 && idx2 < idx ) idx=idx2; + if( idx < 0 ) idx=idx2; for( int j=idx; j
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp13.java
mmanders01/07/20 15:08:16 Modified:src/share/org/apache/tomcat/modules/server Ajp13.java Log: When calling setUserPrincipal, use the RemoteUser we just read instead of reading the next string in the message. Otherwise, we through the message/protocol off. Revision ChangesPath 1.21 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java Index: Ajp13.java === RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Ajp13.java2001/07/17 04:06:29 1.20 +++ Ajp13.java2001/07/20 22:08:16 1.21 @@ -330,7 +330,7 @@ req.setRemoteUser( msg.getString()); // XXX recycle ? // Note that roles are not integrated with apache - req.setUserPrincipal( new SimplePrincipal( msg.getString())); + req.setUserPrincipal( new SimplePrincipal( req.getRemoteUser() )); break; case SC_A_AUTH_TYPE:
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.dsp
mmanders01/07/20 08:10:26 Modified:jk/native/apache-1.3 mod_jk.dsp Log: Fixed project so that MSDev can use it. Revision ChangesPath 1.5 +10 -10jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp Index: mod_jk.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_jk.dsp2001/06/07 13:48:45 1.4 +++ mod_jk.dsp2001/07/20 15:10:26 1.5 @@ -146,23 +146,23 @@ SOURCE=.\mod_jk.c # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_ajp14.c # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_ajp14_worker.c # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_md5.c # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_context.c # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_ajp_common.c # End Source File @@ -243,23 +243,23 @@ SOURCE=..\common\jk_worker_list.h # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_ajp14.h # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_ajp14_worker.h # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_md5.h # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_context.h # End Source File -# End Group +# Begin Source File SOURCE=..\common\jk_ajp_common.h # End Source File
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14_worker.h
mmanders01/07/20 08:09:48
Modified:jk/native/common jk_ajp14_worker.h
Log:
Added a define for snprintf under Windows.
Revision ChangesPath
1.4 +6 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.h
Index: jk_ajp14_worker.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_ajp14_worker.h 2001/06/18 14:15:28 1.3
+++ jk_ajp14_worker.h 2001/07/20 15:09:48 1.4
@@ -58,7 +58,7 @@
/***
* Description: ajpv14 worker header file *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***/
#ifndef JK_AJP14_WORKER_H
@@ -79,6 +79,11 @@
#endif /* __cplusplus */
#define JK_AJP14_WORKER_NAME ("ajp14")
+
+#ifdef WIN32
+/* define snprint to match windows version */
+#define snprintf _snprintf
+#endif
int JK_METHOD ajp14_worker_factory(jk_worker_t **w,
const char *name,
cvs commit: jakarta-tomcat-connectors/jk/native/netscape Makefile.nw
mmanders01/07/18 16:38:12 Modified:jk/native/netscape Makefile.nw Log: Added -DUSE_SPRINTF to compile flags since there isn't an snprintf currently available on NetWare. Revision ChangesPath 1.6 +1 -0 jakarta-tomcat-connectors/jk/native/netscape/Makefile.nw Index: Makefile.nw === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/Makefile.nw,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.nw 2001/06/07 14:19:34 1.5 +++ Makefile.nw 2001/07/18 23:38:12 1.6 @@ -86,6 +86,7 @@ @echo -DN_PLAT_NLM >> $@ @echo -DNETWARE >> $@ @echo -DXP_NETWARE >> $@ + @echo -DUSE_SPRINTF >> $@ link.opt: Makefile.nw -@del link.opt > NUL
cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 Makefile.nw
mmanders01/07/18 16:35:37 Modified:jk/native/apache-1.3 Makefile.nw Log: Added -DUSE_SPRINTF to compile flags since there isn't an snprintf currently available on NetWare. Revision ChangesPath 1.7 +1 -0 jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.nw Index: Makefile.nw === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.nw,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.nw 2001/06/07 13:48:42 1.6 +++ Makefile.nw 2001/07/18 23:35:37 1.7 @@ -90,6 +90,7 @@ @echo -DN_PLAT_NLM >> $@ @echo -DNETWARE >> $@ @echo -DXP_NETWARE >> $@ + @echo -DUSE_SPRINTF >> $@ link.opt: Makefile.nw -@del link.opt > NUL
cvs commit: jakarta-tomcat/src/native/mod_jk/common jk_ajp13_worker.c
mmanders01/07/18 14:36:35
Modified:src/native/mod_jk/common jk_ajp13_worker.c
Log:
This fixes a problem with the new recovery handling in ajp13. The problem occurs
when the user requests a page and presses stop before it is all back, and the protocol
retries the request to the java backend. Since there is data in the reply buffer
already, the code assumes it is post data and sends it to the java side. The data in
the reply is still there and that gets passed around and eventually it shows up in the
next request made by the browser; i.e. if the previous request was to servlet foo1, a
request to foo2 returns the response from foo1. This should also fix the problem
reported with frames displaying improperly (especially because of resets from the
browser.)
Revision ChangesPath
1.9 +25 -11jakarta-tomcat/src/native/mod_jk/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/common/jk_ajp13_worker.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_ajp13_worker.c 2001/06/01 08:41:15 1.8
+++ jk_ajp13_worker.c 2001/07/18 21:36:35 1.9
@@ -58,7 +58,7 @@
* Author: Henri Gomez <[EMAIL PROTECTED]> *
* Author: Costin <[EMAIL PROTECTED]> *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***/
#include "jk_pool.h"
@@ -74,6 +74,7 @@
#define DEF_RETRY_ATTEMPTS (1)
#define DEF_CACHE_SZ(1)
#define JK_INTERNAL_ERROR (-2)
+#define JK_FATAL_ERROR (-3)
#define MAX_SEND_BODY_SZ(DEF_BUFFER_SZ - 6)
#define AJP13_HEADER_LEN (4)
#define AJP13_HEADER_SZ_LEN (2)
@@ -125,6 +126,7 @@
struct ajp13_operation {
jk_msg_buf_t*request; /* original request storage */
jk_msg_buf_t*reply; /* reply storage (chuncked by ajp13 */
+jk_msg_buf_t*post; /* small post data storage area */
int uploadfd; /* future persistant storage id */
int recoverable;/* if exchange could be conducted on another
TC */
};
@@ -309,6 +311,7 @@
}
static int ajp13_process_callback(jk_msg_buf_t *msg,
+ jk_msg_buf_t *pmsg,
ajp13_endpoint_t *ep,
jk_ws_service_t *r,
jk_logger_t *l)
@@ -335,7 +338,7 @@
res.num_headers)) {
jk_log(l, JK_LOG_ERROR,
"Error ajp13_process_callback - start_response
failed\n");
-return JK_INTERNAL_ERROR;
+return JK_FATAL_ERROR;
}
}
break;
@@ -346,7 +349,7 @@
if(!r->write(r, jk_b_get_buff(msg) + jk_b_get_pos(msg), len)) {
jk_log(l, JK_LOG_ERROR,
"Error ajp13_process_callback - write failed\n");
-return JK_INTERNAL_ERROR;
+return JK_FATAL_ERROR;
}
}
break;
@@ -366,7 +369,7 @@
}
/* the right place to add file storage for upload */
- if(read_into_msg_buff(ep, r, msg, l, len)) {
+ if(read_into_msg_buff(ep, r, pmsg, l, len)) {
r->content_read += len;
return JK_AJP13_HAS_RESPONSE;
}
@@ -609,7 +612,7 @@
*/
jk_log(l, JK_LOG_DEBUG, "send_request 2: request body to send %d - request
body to resend %d\n",
- p->left_bytes_to_send, jk_b_get_len(op->reply) - AJP13_HEADER_LEN);
+ p->left_bytes_to_send, jk_b_get_len(op->post) - AJP13_HEADER_LEN);
/*
* POST recovery job is done here.
@@ -619,8 +622,8 @@
* We send here the first part of data which was sent previously to the
* remote Tomcat
*/
- if(jk_b_get_len(op->reply) > AJP13_HEADER_LEN) {
- if(!connection_tcp_send_message(p, op->reply, l)) {
+ if(jk_b_get_len(op->post) > AJP13_HEADER_LEN) {
+ if(!connection_tcp_send_message(p, op->post, l)) {
jk_log(l, JK_LOG_ERROR, "Error resending request body\n");
return JK_FALSE;
}
@@ -636,13
cvs commit: jakarta-tomcat/src/native/jk jk_sockbuf.c jk_util.c
mmanders01/06/19 16:21:04
Modified:src/native/jk Tag: tomcat_32 jk_sockbuf.c jk_util.c
Log:
Changed c++ style comments to c style comments.
Submitted by: Scott E. Reinhart <[EMAIL PROTECTED]>
Revision ChangesPath
No revision
No revision
1.1.2.3 +2 -2 jakarta-tomcat/src/native/jk/Attic/jk_sockbuf.c
Index: jk_sockbuf.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_sockbuf.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- jk_sockbuf.c 2001/02/02 16:55:34 1.1.2.2
+++ jk_sockbuf.c 2001/06/19 23:21:01 1.1.2.3
@@ -56,7 +56,7 @@
/***
* Description: Simple buffer object to handle buffered socket IO *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1.2.2 $ *
+ * Version: $Revision: 1.1.2.3 $ *
***/
#include "jk_global.h"
@@ -224,7 +224,7 @@
sb->buf + sb->end,
SOCKBUF_SIZE - sb->end, 0);
- // 0 is EOF/SHUTDOWN, -1 is SOCK_ERROR
+ /* 0 is EOF/SHUTDOWN, -1 is SOCK_ERROR */
if (ret <= 0) {
return ret;
}
1.6.2.4 +3 -3 jakarta-tomcat/src/native/jk/Attic/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_util.c,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- jk_util.c 2001/01/11 21:33:35 1.6.2.3
+++ jk_util.c 2001/06/19 23:21:02 1.6.2.4
@@ -56,7 +56,7 @@
/***
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.6.2.3 $ *
+ * Version: $Revision: 1.6.2.4 $ *
***/
@@ -214,7 +214,7 @@
#ifdef WIN32
used = _snprintf(buf, HUGE_BUFFER_SIZE, "[%s (%d)]: ", f, line);
-#elif defined(NETWARE) // until we get a snprintf function
+#elif defined(NETWARE) /* until we get a snprintf function */
buf = (char *) malloc(HUGE_BUFFER_SIZE);
if (NULL == buf)
return -1;
@@ -230,7 +230,7 @@
va_start(args, fmt);
#ifdef WIN32
rc = _vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
-#elif defined(NETWARE) // until we get a vsnprintf function
+#elif defined(NETWARE) /* until we get a vsnprintf function */
rc = vsprintf(buf + used, fmt, args);
#else
rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ServletWrapper.java
mmanders01/06/19 16:04:39
Modified:src/share/org/apache/tomcat/core Tag: tomcat_32
ServletWrapper.java
Log:
Syncronized around call to loader.shouldReload to prevent getting the loader in an
invalid state. Fixes Bug # 1628.
Revision ChangesPath
No revision
No revision
1.60.2.6 +38 -32
jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/ServletWrapper.java
Index: ServletWrapper.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/ServletWrapper.java,v
retrieving revision 1.60.2.5
retrieving revision 1.60.2.6
diff -u -r1.60.2.5 -r1.60.2.6
--- ServletWrapper.java 2001/01/12 04:39:05 1.60.2.5
+++ ServletWrapper.java 2001/06/19 23:04:38 1.60.2.6
@@ -422,38 +422,44 @@
if( isReloadable ) {// && ! "invoker".equals( getServletName())) {
ServletLoader loader=context.getServletLoader();
if( loader!=null) {
- // XXX no need to check after we remove the old loader
- if( loader.shouldReload() ) {
- // workaround for destroy
- try {
- destroy();
- } catch(Exception ex ) {
- context.log( "Error in destroy ", ex );
- }
- initialized=false;
- loader.reload();
-
- ContextManager cm=context.getContextManager();
- cm.doReload( req, context );
-
- servlet=null;
- servletClass=null;
- /* Initial attempt to shut down the context and sessions.
-
-String path=context.getPath();
-String docBase=context.getDocBase();
-// XXX all other properties need to be saved
-// or something else
-ContextManager cm=context.getContextManager();
-cm.removeContext(path);
-Context ctx=new Context();
-ctx.setPath( path );
-ctx.setDocBase( docBase );
-cm.addContext( ctx );
-context=ctx;
-// XXX shut down context, remove sessions, etc
- */
- }
+// We need to syncronize here so that multiple threads don't
+// try and reload the class. The first thread through will
+// create the new loader which will make shouldReload return
+// false for subsequent threads.
+synchronized(this) {
+// XXX no need to check after we remove the old loader
+if( loader.shouldReload() ) {
+// workaround for destroy
+try {
+destroy();
+} catch(Exception ex ) {
+context.log( "Error in destroy ", ex );
+}
+initialized=false;
+loader.reload();
+
+ContextManager cm=context.getContextManager();
+cm.doReload( req, context );
+
+servlet=null;
+servletClass=null;
+/* Initial attempt to shut down the context and sessions.
+
+ String path=context.getPath();
+ String docBase=context.getDocBase();
+ // XXX all other properties need to be saved
+ // or something else
+ ContextManager cm=context.getContextManager();
+ cm.removeContext(path);
+ Context ctx=new Context();
+ ctx.setPath( path );
+ ctx.setDocBase( docBase );
+ cm.addContext( ctx );
+ context=ctx;
+ // XXX shut down context, remove sessions, etc
+*/
+}
+}
}
}
}
cvs commit: jakarta-tomcat/src/native/jk jk_jni_worker.c
mmanders01/06/19 15:57:25
Modified:src/native/jk Tag: tomcat_32 jk_jni_worker.c
Log:
Even though Apache is documented as only calling the module initializer function
(jk_init) once, it actually calls it multiple times, at least on Windows. A couple of
times it is called on the same process which causes open_jvm to fail on the second
pass because the jvm was alread instantiated on the first pass. In open_jvm2, we can
catch this and try to get the instatiated jvm and attach to it, preventing a hard
failure (a call to jk_error_exit()) which also shuts down the webserver.
Revision ChangesPath
No revision
No revision
1.7.2.3 +28 -7 jakarta-tomcat/src/native/jk/Attic/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_jni_worker.c,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- jk_jni_worker.c 2000/09/13 23:06:25 1.7.2.2
+++ jk_jni_worker.c 2001/06/19 22:57:23 1.7.2.3
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.7.2.2 $ *
+ * Version: $Revision: 1.7.2.3 $ *
***/
#if !defined(WIN32) && !defined(NETWARE)
@@ -89,6 +89,7 @@
jint (JNICALL *jni_get_default_java_vm_init_args)(void *) = NULL;
jint (JNICALL *jni_create_java_vm)(JavaVM **, JNIEnv **, void *) = NULL;
+jint (JNICALL *jni_get_created_java_vms)(JavaVM **, int, int *) = NULL;
#define JAVA_BRIDGE_CLASS_NAME ("org/apache/tomcat/service/JNIEndpoint")
@@ -688,10 +689,13 @@
(FARPROC)jni_create_java_vm =
GetProcAddress(hInst, "JNI_CreateJavaVM");
+(FARPROC)jni_get_created_java_vms =
+GetProcAddress(hInst, "JNI_GetCreatedJavaVMs");
+
(FARPROC)jni_get_default_java_vm_init_args =
GetProcAddress(hInst, "JNI_GetDefaultJavaVMInitArgs");
-if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+if(jni_create_java_vm && jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
return JK_TRUE;
}
@@ -711,9 +715,10 @@
}
if (0 != javaNlmHandle) {
jni_create_java_vm = ImportSymbol(GetNLMHandle(), "JNI_CreateJavaVM");
+jni_get_created_java_vms = ImportSymbol(GetNLMHandle(),
"JNI_GetCreatedJavaVMs");
jni_get_default_java_vm_init_args = ImportSymbol(GetNLMHandle(),
"JNI_GetDefaultJavaVMInitArgs");
}
-if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+if(jni_create_java_vm && jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
return JK_TRUE;
}
#else
@@ -729,9 +734,10 @@
dlerror());
} else {
jni_create_java_vm = dlsym(handle, "JNI_CreateJavaVM");
+jni_get_created_java_vms = dlsym(handle, "JNI_GetCreatedJavaVMs");
jni_get_default_java_vm_init_args = dlsym(handle,
"JNI_GetDefaultJavaVMInitArgs");
-if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+if(jni_create_java_vm && jni_get_default_java_vm_init_args &&
jni_get_created_java_vms) {
jk_log(l, JK_LOG_DEBUG,
"In load_jvm_dll, symbols resolved, done\n");
return JK_TRUE;
@@ -909,7 +915,7 @@
int optn = 0, err;
char* tmp;
-*env = NULL;
+*env = penv = NULL;
jk_log(l, JK_LOG_DEBUG,
"Into open_jvm2\n");
@@ -970,10 +976,25 @@
}
jk_log(l, JK_LOG_DEBUG, "In open_jvm2, about to create JVM...\n");
+
+err=jni_create_java_vm(&(p->jvm), &penv, &vm_args);
+
+if (JNI_EEXIST == err)
+{
+int vmCount;
+ jk_log(l, JK_LOG_DEBUG, "JVM alread instantiated. Trying to attach
instead.\n");
+
+jni_get_created_java_vms(&(p->jvm), 1, &vmCount);
+if (NULL != p->jvm)
+penv = attach_to_jvm(p, l);
-if((err=jni_create_java_vm(&(p->jvm), &penv, &vm_args)) != 0) {
+if (NULL != penv)
+err = 0;
+}
+
+if(err != 0) {
jk_log(l, JK_LOG_EMERG, "Fail-> could not create JVM, code: %d \n", err);
-return JK_FALSE;
+return JK_FALSE;
}
jk_log(l, JK_LOG_DEBUG, "In open_jvm2, JVM created, done\n");
cvs commit: jakarta-tomcat/src/native/jk jk_ajp13_worker.c
mmanders01/06/19 15:46:13
Modified:src/native/jk Tag: tomcat_32 jk_ajp13_worker.c
Log:
Fixed a memory leak.
Revision ChangesPath
No revision
No revision
1.3.2.3 +2 -1 jakarta-tomcat/src/native/jk/Attic/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_ajp13_worker.c,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- jk_ajp13_worker.c 2001/01/05 03:39:25 1.3.2.2
+++ jk_ajp13_worker.c 2001/06/19 22:46:12 1.3.2.3
@@ -57,7 +57,7 @@
* Description: Experimental bi-directionl protocol. *
* Author: Costin <[EMAIL PROTECTED]> *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3.2.2 $ *
+ * Version: $Revision: 1.3.2.3 $ *
***/
#include "jk_pool.h"
@@ -120,6 +120,7 @@
static void close_endpoint(ajp13_endpoint_t *ep)
{
reset_endpoint(ep);
+jk_close_pool(&(ep->pool));
if(ep->sd > 0) {
jk_close_socket(ep->sd);
}
cvs commit: jakarta-tomcat/src/native/apache1.3 mod_jk.c
mmanders01/06/19 15:45:01
Modified:src/native/apache1.3 Tag: tomcat_32 mod_jk.c
Log:
Added a check for the workers.properties file to allow Apache to come down clean if
the path/file doesn't exist.
Fixed memory leaks when using VirtualHost sections in Apache.
Revision ChangesPath
No revision
No revision
1.7.2.5 +22 -7 jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- mod_jk.c 2001/05/19 04:23:41 1.7.2.4
+++ mod_jk.c 2001/06/19 22:44:57 1.7.2.5
@@ -483,8 +483,11 @@
server_rec *s = cmd->server;
jk_server_conf_t *conf =
(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+struct stat statbuf;
conf->worker_file = worker_file;
+if (stat(worker_file, &statbuf) == -1)
+return "Can't find the workers file specified";
return NULL;
}
@@ -904,14 +907,26 @@
static void exit_handler (server_rec *s, ap_pool *p)
{
- jk_server_conf_t *conf =
- (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+server_rec *tmp = s;
- wc_close(conf->log);
- uri_worker_map_free(&(conf->uw_map), conf->log);
- map_free(&(conf->uri_to_context));
- if (conf->log)
- jk_close_file_logger(&(conf->log));
+/* loop through all available servers to clean up all configuration
+ * records we've created
+ */
+while (NULL != tmp)
+{
+jk_server_conf_t *conf =
+(jk_server_conf_t *)ap_get_module_config(tmp->module_config,
&jk_module);
+
+if (NULL != conf)
+{
+wc_close(conf->log);
+uri_worker_map_free(&(conf->uw_map), conf->log);
+map_free(&(conf->uri_to_context));
+if (conf->log)
+jk_close_file_logger(&(conf->log));
+}
+tmp = tmp->next;
+}
}
static const handler_rec jk_handlers[] =
cvs commit: jakarta-tomcat build.xml
mmanders01/06/18 17:34:38
Modified:.build.xml
Log:
Updated conditionals for commons-dbcp. This will now build properly even if
jakarta-commons isn't available.
Revision ChangesPath
1.135 +29 -30jakarta-tomcat/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- build.xml 2001/06/17 18:59:39 1.134
+++ build.xml 2001/06/19 00:34:37 1.135
@@ -38,10 +38,16 @@
+
+
@@ -54,18 +60,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -80,8 +74,7 @@
+ file="${jakarta-commons}/dbcp/dist/commons-dbcp.jar" />
+
@@ -380,23 +374,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+-->
+
+
+
+
+
+
+
+
+
+
+
+
@@ -410,8 +407,10 @@
+
+
+
-
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf MessageBytes.java
mmanders01/06/15 10:05:10
Modified:util/java/org/apache/tomcat/util/buf MessageBytes.java
Log:
Updated setString to just return if the string passed in is a null. This prevents
problems later on when we try and access the string member.
Revision ChangesPath
1.3 +2 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/MessageBytes.java
Index: MessageBytes.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/MessageBytes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessageBytes.java 2001/05/29 06:22:53 1.2
+++ MessageBytes.java 2001/06/15 17:05:09 1.3
@@ -163,6 +163,8 @@
public void setString( String s ) {
recycle();
+if (s == null)
+return;
strValue=s;
hasStrValue=true;
type=T_STR;
