Contactos alternativos/alternative contacts
Estaré ausente de la oficina desde el 12/08/2004 y no volveré hasta el 31/12/2004. Contactos para asuntos en curso: Técnicos: Sr. Manuel Simón, e-mail: [EMAIL PROTECTED] Comerciales/logísticos/administrativos: Sra. Nuria López, e-mail: [EMAIL PROTECTED] Financieros: Sr. Manuel Tarazona, e-mail: [EMAIL PROTECTED] Contacts for current matters: Technical: Mr. Manuel Simón, e-mail: [EMAIL PROTECTED] Sales/logistics/administration: Mrs. Nuria López, e-mail: [EMAIL PROTECTED] Finantial: Mr. Manuel Tarazona, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Protected Mail System
Encrypted message is available. +++ Attachment: No Virus found +++ Bitdefender AntiVirus - www.bitdefender.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Thanks!
Your file is attached. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Error (tomcat-dev@jakarta.apache.org)
Mail Delivery Failed - This mail couldn't be represented- failed message -QCtBogbj1kyBHä?a83S3ä-u.wößI!ü15%(:ZlU?W7Vöev,fIA2DC|G;mf(1:LnX2xß(:M$PKr+$MR)GLpqfAvpEQv~isyKWNVDyYjc|bs~jU3L24_äP--Zü!rj
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configtccom.xml configtc.xml
nacho 2003/03/15 16:56:34
Modified:jk/xdocs menu.jk2.idx
jk/xdocs/jk2 configtc.xml
Added: jk/xdocs/jk2 configtccom.xml
Log:
* Added all the remaning components and properties for jk2.properties cofngi file,
most of them not commentted..
* Converted the section abput jk2.p to the same format of wk2.p
* Separated jk2.p components to his own xml file, added to the index.
Revision ChangesPath
1.4 +2 -1 jakarta-tomcat-connectors/jk/xdocs/menu.jk2.idx
Index: menu.jk2.idx
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/menu.jk2.idx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menu.jk2.idx 8 Oct 2002 17:57:07 - 1.3
+++ menu.jk2.idx 16 Mar 2003 00:56:33 - 1.4
@@ -1,9 +1,9 @@
?xml version=1.0 encoding=ISO-8859-1?
section name=JK2
-/section
section name=Configuration in the Tomcat
document href=jk2/configtc.xml/
+document href=jk2/configtccom.xml/
document href=jk2/configtcex.xml/
/section
section name=Configuration in the Web Server
@@ -16,4 +16,5 @@
/section
section name=Howto
document href=jk2/confighowto.xml/
+/section
/section
1.5 +35 -139 jakarta-tomcat-connectors/jk/xdocs/jk2/configtc.xml
Index: configtc.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configtc.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configtc.xml 3 Oct 2002 15:34:10 - 1.4
+++ configtc.xml 16 Mar 2003 00:56:34 - 1.5
@@ -1,146 +1,42 @@
?xml version=1.0?
document
-properties
-titleConfiguration options/title
-author email=[EMAIL PROTECTED]Jean-Frederic Clere/author
-date$Date$/date
-/properties
-
-section name=Intro
-p
+ properties
+ titleConfiguration options/title
+ author email=[EMAIL PROTECTED]Jean-Frederic Clere/author
+ date$Date$/date
+ /properties
+ section name=Intro
+ p
This document describes the configuration file used by mod_jk2 on the
Tomcat site. Its default name is ${jkHome}/conf/jk2.properties,
where ${jkHome} is the well known ${catalina.base} property.
/p
-/section
-
-section name=Config options
-p
-table
-
- tr
- thProperty name/th
- thDefault/th
- thDescription/th
- /tr
-
- tr
- tdhandler.list/td
- tdrequest,container,channelSocket/td
- tdHandlers to load./td
- /tr
-
- tr
- tdclass.myhandler/td
- tdNo default value/td
- tdDefine the class of the handler myhandler./td
- /tr
-
- tr
- th colspan=2apr/th
- tdAPR descriptor/td
- /tr
-
- tr
- tdNativeSo/td
- tdjkjni/td
- td
-Location of the jkjni dynamic library.
-It is searched in java.library.path but a absolute path can be specified.
- /td
- /tr
- tr
- tdjniModeSo/td
- tdinprocess/td
- td
-If set to inprocess the jk2 will regiter native library functions by itself.
- If not then it has to be the absolute path of the jkjni dynamic library.
- /td
- /tr
-
- tr
- th colspan=2channelSocket/th
- tdA communication transport from a remote Web Server./td
- /tr
-
- tr
- tdport/td
- td8009/td
- tdFirst port where Tomcat is listening/td
- /tr
-
- tr
- tdaddress/td
- td127.0.0.1/td
- tdLocal address where Tomcat is listening./td
- /tr
-
- tr
- tdmaxPort/td
- tdport+10/td
- tdMax port used to listen./td
- /tr
-
- tr
- th colspan=2channelUnix/th
- tdA AF_UNIX socket communication transport from a local Web Server./td
- /tr
-
- tr
- tdfile/td
- tdNo default value/td
- td
-Name of the file associate with the socket.
-That must be absolut path name.
- /td
- /tr
-
- tr
- th colspan=2channelJni/th
- tdA in Web Server process communication./td
- /tr
-
- tr
- th colspan=2mx/th
- tdmx4j adapter./td
- /tr
-
- tr
- tdport/td
- td-1 (Disabled)/td
- tdPort Number./td
- /tr
-
- tr
- th colspan=2shm/th
- tdshared memory objects handler./td
- /tr
-
- tr
- tdfile/td
- td/tmp/shm.file/td
- tdShared memory file./td
- /tr
-
- tr
- tdhost/td
- tdlocalhost/td
- tdHost name./td
- /tr
-
- tr
- tdport/td
- td8009/td
- tdPort number./td
- /tr
-
- tr
- tdunixSocket/td
- tdNo default value/td
- tdUnix socket where tomcat is listening./td
- /tr
-
-/table
-/p
-/section
+ /section
+ section name=Config File Format
+ p settings are specified in the following format:
+ source
+ handler.propertie=value
+ /source
+ /p/section
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
nacho 2003/02/09 13:29:17
Modified:jk/native2 build.xml
Log:
Only build JNI, if IIS or Apache20 is detected..
Revision ChangesPath
1.39 +8 -7 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 6 Feb 2003 00:33:16 - 1.38
+++ build.xml 9 Feb 2003 21:29:17 - 1.39
@@ -27,11 +27,6 @@
!-- == Build options == --
- !-- Use the jni worker and libs whenever possible --
- property name=use.jni value=true /
- !-- Use apr whenever possible --
- property name=use.apr value=true /
-
property name=so.debug value=true /
property name=so.optimize value=false /
property name=so.profile value=false /
@@ -86,7 +81,6 @@
condition property=netware
available file=novellndk.home /
/condition
-
echo message=Linux:${linux} Win32:${win32} Netware:${netware}
Solaris:${solaris} HPUX:${hpux} /
/target
@@ -105,10 +99,17 @@
file=${mssdk.home} /
available property=iplanet.detect
file=${iplanet.home} /
+condition property=build.jni
+ or
+isset property=iis.detect /
+isset property=apache2.detect /
+ /or
+/condition
echo message=Apache2 ${apache2.home} ${apache2.detect} /
echo message=Apache13 ${apache13.home} ${apache13.detect} /
echo message=IIS ${iis.home} ${iis.detect} /
echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+echo message=JNI ${build.jni} /
echo message= /
/target
@@ -328,7 +329,7 @@
/so
/target
- target name=jni depends=init if=use.jni
+ target name=jni depends=init if=build.jni
mkdir dir=${build.dir}/jni${arch.prefix} /
!-- can be overriden --
property name=apr.home location=${apache2.home} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2003/02/06 15:34:45
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Fix for Bug#16759 ISAPI_REDIRECTOR Handles %2F improperly
Was refusing any URL with %2F or %00 embedded always,
now it only refuses request mapped to tomcat..
Revision ChangesPath
1.57 +19 -18
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- jk_isapi_plugin.c 6 Feb 2003 16:37:47 - 1.56
+++ jk_isapi_plugin.c 6 Feb 2003 23:34:45 - 1.57
@@ -315,22 +315,6 @@
}
rc = jk_requtil_unescapeUrl(uri);
-if (rc == BAD_REQUEST) {
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- HttpFilterProc [%s] contains one or more invalid escape
sequences.\n,
- uri);
-write_error_response(pfc,400 Bad Request, HTML_ERROR_400);
-workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return SF_STATUS_REQ_FINISHED;
-}
-else if(rc == BAD_PATH) {
-env-l-jkLog(env, env-l, JK_LOG_EMERG,
- HttpFilterProc [%s] contains forbidden escape
sequences.\n,
- uri);
-write_error_response(pfc,403 Forbidden, HTML_ERROR_403);
-workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return SF_STATUS_REQ_FINISHED;
-}
jk_requtil_getParents(uri);
if (pfc-GetServerVariable(pfc, SERVER_NAME, (LPVOID)Host,
(LPDWORD)szHost)){
@@ -354,6 +338,23 @@
char *forwardURI;
/* This is a servlet, should redirect ... */
+/* First check if the request was invalidated at decode */
+if (rc == BAD_REQUEST) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+HttpFilterProc [%s] contains one or more invalid
escape sequences.\n,
+uri);
+write_error_response(pfc,400 Bad Request, HTML_ERROR_400);
+workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env
);
+return SF_STATUS_REQ_FINISHED;
+}
+else if(rc == BAD_PATH) {
+env-l-jkLog(env, env-l, JK_LOG_EMERG,
+HttpFilterProc [%s] contains forbidden escape
sequences.\n,
+uri);
+write_error_response(pfc,403 Forbidden, HTML_ERROR_403);
+workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env
);
+return SF_STATUS_REQ_FINISHED;
+}
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
HttpFilterProc [%s] is a servlet url - should redirect
to %s\n,
uri, uriEnv-workerName);
@@ -408,7 +409,7 @@
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv,
env );
return SF_STATUS_REQ_ERROR;
}
-SetHeader(pfc, Translate:, NULL);
+SetHeader(pfc, Translate:, NULL);
}
} else {
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2003/02/05 14:10:51
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Revert latest Fix for Bug#16759
Revision ChangesPath
1.55 +7 -11
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- jk_isapi_plugin.c 4 Feb 2003 20:45:49 - 1.54
+++ jk_isapi_plugin.c 5 Feb 2003 22:10:51 - 1.55
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2003 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved.*
* *
* = *
@@ -316,24 +316,20 @@
rc = jk_requtil_unescapeUrl(uri);
if (rc == BAD_REQUEST) {
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
HttpFilterProc [%s] contains one or more invalid escape
sequences.\n,
uri);
-// XXX: Let any other filter process the request,
-// if they take any security measure or not doesnt matter.
-// write_error_response(pfc,400 Bad Request, HTML_ERROR_400);
+write_error_response(pfc,400 Bad Request, HTML_ERROR_400);
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return SF_STATUS_REQ_NEXT_NOTIFICATION;
+return SF_STATUS_REQ_FINISHED;
}
else if(rc == BAD_PATH) {
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+env-l-jkLog(env, env-l, JK_LOG_EMERG,
HttpFilterProc [%s] contains forbidden escape
sequences.\n,
uri);
-// XXX: Let any other filter process the request,
-// if they take any security measure or not doesnt matter.
-// write_error_response(pfc,403 Forbidden, HTML_ERROR_403);
+write_error_response(pfc,403 Forbidden, HTML_ERROR_403);
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return SF_STATUS_REQ_NEXT_NOTIFICATION;
+return SF_STATUS_REQ_FINISHED;
}
jk_requtil_getParents(uri);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
nacho 2003/02/05 16:33:16
Modified:jk/native2 build.xml
Log:
Honor use.jni, needed to fix gump builds..
Fixed resources location for apache13 win32 builds
Revision ChangesPath
1.38 +2 -2 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 11 Jun 2002 22:50:24 - 1.37
+++ build.xml 6 Feb 2003 00:33:16 - 1.38
@@ -328,7 +328,7 @@
/so
/target
- target name=jni depends=init
+ target name=jni depends=init if=use.jni
mkdir dir=${build.dir}/jni${arch.prefix} /
!-- can be overriden --
property name=apr.home location=${apache2.home} /
@@ -467,7 +467,7 @@
fileset dir=${native.dir}/common includes=*.h /
/depends
- resource fileName=jk_logger_win32_message.res if=win32/
+ resource fileName=../jk_logger_win32_message.res if=win32/
def name=EAPI info=Building with EAPI support /
def name=_REENTRANT /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2003/02/04 12:45:50
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Fix for Bug#16759 ISAPI_REDIRECTOR Handles %2F improperly
Now a uri considered not valid or bad by jk2 is passed down the filter chain,
so letting the server continue processing, also relaxed logging to info as
they are not errors anymore..
Revision ChangesPath
1.54 +10 -6
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jk_isapi_plugin.c 4 Feb 2003 07:44:23 - 1.53
+++ jk_isapi_plugin.c 4 Feb 2003 20:45:49 - 1.54
@@ -316,20 +316,24 @@
rc = jk_requtil_unescapeUrl(uri);
if (rc == BAD_REQUEST) {
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
+env-l-jkLog(env, env-l, JK_LOG_INFO,
HttpFilterProc [%s] contains one or more invalid escape
sequences.\n,
uri);
-write_error_response(pfc,400 Bad Request, HTML_ERROR_400);
+// XXX: Let any other filter process the request,
+// if they take any security measure or not doesnt matter.
+// write_error_response(pfc,400 Bad Request, HTML_ERROR_400);
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return SF_STATUS_REQ_FINISHED;
+return SF_STATUS_REQ_NEXT_NOTIFICATION;
}
else if(rc == BAD_PATH) {
-env-l-jkLog(env, env-l, JK_LOG_EMERG,
+env-l-jkLog(env, env-l, JK_LOG_INFO,
HttpFilterProc [%s] contains forbidden escape
sequences.\n,
uri);
-write_error_response(pfc,403 Forbidden, HTML_ERROR_403);
+// XXX: Let any other filter process the request,
+// if they take any security measure or not doesnt matter.
+// write_error_response(pfc,403 Forbidden, HTML_ERROR_403);
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return SF_STATUS_REQ_FINISHED;
+return SF_STATUS_REQ_NEXT_NOTIFICATION;
}
jk_requtil_getParents(uri);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
nacho 2003/02/01 14:17:16
Modified:jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
Log:
Fix for Bug#16638 Jk2 connector with Microsoft IIS slow in multiple domain
environment
Added a new registry and properties config send_groups. defaults to false.
Revision ChangesPath
1.52 +14 -1
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- jk_isapi_plugin.c 26 Oct 2002 12:42:44 - 1.51
+++ jk_isapi_plugin.c 1 Feb 2003 22:17:16 - 1.52
@@ -87,6 +87,7 @@
#define WORKERS_FILE_TAG(workersFile)
#define USE_AUTH_COMP_TAG (authComplete)
#define THREAD_POOL_TAG (threadPool)
+#define SEND_GROUPS_TAG (sendGroups)
static char file_name[_MAX_PATH];
@@ -97,6 +98,7 @@
static int was_inited = JK_FALSE;
static DWORD auth_notification_flags = 0;
static int use_auth_notification_flags = 0;
+int send_groups = 0;
static jk_workerEnv_t *workerEnv;
apr_pool_t *jk_globalPool;
@@ -668,6 +670,10 @@
if (tmp) {
use_auth_notification_flags = atoi(tmp);
}
+tmp = map-get(env,map,SEND_GROUPS_TAG);
+if (tmp) {
+send_groups = atoi(tmp);
+}
using_ini_file=JK_TRUE;
return ok;
}
@@ -727,6 +733,13 @@
tmpbuf,
8)) {
use_auth_notification_flags = atoi(tmpbuf);
+}
+
+if(get_registry_config_parameter(hkey,
+ SEND_GROUPS_TAG,
+ tmpbuf,
+ 8)) {
+send_groups = atoi(tmpbuf);
}
RegCloseKey(hkey);
1.22 +3 -1
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_service_iis.c 21 Sep 2002 07:28:48 - 1.21
+++ jk_service_iis.c 1 Feb 2003 22:17:16 - 1.22
@@ -81,6 +81,8 @@
#define ROLES_ATTRIBUTE_NAME org.apache.tomcat.jk.roles
+extern int send_groups;
+
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
static char crlf[3] = { (char)13, (char)10, '\0' };
const char *reason;
@@ -407,7 +409,7 @@
* Add SSL IIS environment
*/
-if ( strlen(s-remote_user) 0 ){
+if ( send_groups (strlen(s-remote_user) 0 )){
char *groups=jk2_service_iis_get_roles(env, s);
if( groups != NULL){
s-attributes-put( env,
s-attributes,ROLES_ATTRIBUTE_NAME,groups,NULL);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 2003/02/01 14:28:39
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
Oops, traslating to proper C ;)
Revision ChangesPath
1.23 +1 -1
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_service_iis.c 1 Feb 2003 22:17:16 - 1.22
+++ jk_service_iis.c 1 Feb 2003 22:28:39 - 1.23
@@ -409,7 +409,7 @@
* Add SSL IIS environment
*/
-if ( send_groups (strlen(s-remote_user) 0 )){
+if ( send_groups *s-remote_user ){
char *groups=jk2_service_iis_get_roles(env, s);
if( groups != NULL){
s-attributes-put( env,
s-attributes,ROLES_ATTRIBUTE_NAME,groups,NULL);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 gump.xml
nacho 2003/01/24 06:46:54 Removed: .gump.xml Log: Moved gump descriptors to jakarta-gump repository -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 gump.xml
nacho 2003/01/24 06:47:29 Removed: .gump.xml Log: Moved gump descriptors to jakarta-gump repository -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina gump.xml
nacho 2003/01/24 06:48:06 Removed: .gump.xml Log: Moved gump descriptors to jakarta-gump repository -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors gump.xml
nacho 2003/01/24 06:49:11 Removed: .gump.xml Log: Moved gump descriptors to jakarta-gump repository -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors KEYS
nacho 2003/01/24 06:49:38 Modified:.KEYS Log: Readded my key Revision ChangesPath 1.11 +66 -30jakarta-tomcat-connectors/KEYS Index: KEYS === RCS file: /home/cvs/jakarta-tomcat-connectors/KEYS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- KEYS 11 Jan 2003 07:59:11 - 1.10 +++ KEYS 24 Jan 2003 14:49:38 - 1.11 @@ -168,33 +168,69 @@ Type Bits/KeyID Date User ID pub 1024D/564C17A3 2003-01-11 Mladen Turk [EMAIL PROTECTED] --BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v1.0.6 (MingW32) - -mQGiBD4fwXIRBAC7WRS8PYxi2YH0T1mX4HCYsF8aHoqxBzMnyFR4J896m1s96vGM -BTSAwH2NKbiVqtfLokTbQkUVxtrgrF2HMB5NfYBg/JzT7pZL/Q2ThWUS7SJQQA4f -a7/DpiLiHalp6iX45om6JTdIWEyXv26csIVhmtlkGBEPRhNRX8X4//BM0wCg7wcA -yQ7c5NmoOJLVs+uHsRrnHo0D/R/dMyuWt7/o0eGIEuRlDl2q+YL8xLuVyJMXQBnd -jo7jKpQ+Q1zl93aVTzsJa7mP2zZ7jqaJ855sdz6rvwyhGF1/qYMtm6zrmgBy2XPm -J+57sfwSZr0bhIeMpCWjIw98z9sObq0v2r2oA3+J9E3Na/BZsCVTZVb3ew7ILmEp -F5D7A/4zvjY41dakCAJsD1Xo8TS6hSqJf4zq9vX3ayJVvUjeo8n4sHNOwcbEnnui -9zZaUH3F0x+3cDo7mS1Y4pD8THuqCZoSbSkiHnlved6nLXsKbqvVrVo+esEhfZCn -Iji3gp+2TVNwdHXGM+4BAzMJCLsdXjByO6SNzB9a+H8RsRlZKrQ8TWxhZGVuIFR1 -cmsgKCoqKiBERUZBVUxUIFNJR05JTkcgS0VZICoqKikgPG10dXJrQGFwYWNoZS5v -cmc+iF0EExECAB0FAj4fwXIFCRLP94AFCwcKAwQDFQMCAxYCAQIXgAAKCRAcUGQH -VkwXo0jxAKCgHzXPIB4IAgoD7GMAohPQfX7j2QCeL6pAsf4pPufmPvbrrpDp6rQH -GOS5Ag0EPh/BhhAIAKWzq7+/+nNYGpc7sXGkDNo9xncxcx/KbbJVT0rBteuaonQ4 -vYar1ITjIhOPmF9yPmpUddNrqgQTSO+Or+ZrVOndn+qC1gdY3qpKIN3KTjXloW38 -0Y84ezwdRLznQNkhgXwNcB55l/Z9kLaW2MS8CJzOuYSQT1CYbXg7XP3684ZmV1KC -cGgcUt9VkIGqwsa2RFDNGvMbySedSkJ/70Q+PJlkXN+W86f8hi3HTjw2MCkNa5NL -+Byg8FEAm95YWrO6kCY3qaJYV7NRt9oVd+2V/NNzwYp3Or/QoYofvfNerupfwBmU -GEXPyZCqqNH6nDv6chscsWvEA9KzhsWnsdKhmHsAAwUH/R6LwfWgtpaO42dQI4ZS -VRBmCeWrXCuyVk0d13Yz0xLi5Z5m4g3MON3d+cRVUiyNX+hbDGpi2mkbsnL559Ef -iqmzDmSz5GQHDutolhOPtLxLrC537ODn2q7hnYQwIQYYIUtYD5sYlzfGYC8olGCB -IcKIdlGRWcxxiFCIJm5CX/jnSBsyDRpanlSrdkxhzAGsifqj4NQ19ayoeNoZg2ZP -9SLIY7vbmOxJeHEYkx8AG25xOY1PLotb/0buSXPB8e71zb/DCV1rAhhUxAr/2JOQ -RqlZBq6PfcHKLRitXRCeVvfldRxuWBIzhuTLUfRPYR6phjP50EzZPlbJzIvGwsOI -RheITAQYEQIADAUCPh/BhgUJEs/3gAAKCRAcUGQHVkwXoy0JAJ9WTfqfYzW/F6qi -5MxmqDnU9/G+6ACfQVmhZNnGTSfcwQCttwCaW3CRhDY= -=MWUr --END PGP PUBLIC KEY BLOCK- +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.0.6 (MingW32) + +mQGiBD4fwXIRBAC7WRS8PYxi2YH0T1mX4HCYsF8aHoqxBzMnyFR4J896m1s96vGM +BTSAwH2NKbiVqtfLokTbQkUVxtrgrF2HMB5NfYBg/JzT7pZL/Q2ThWUS7SJQQA4f +a7/DpiLiHalp6iX45om6JTdIWEyXv26csIVhmtlkGBEPRhNRX8X4//BM0wCg7wcA +yQ7c5NmoOJLVs+uHsRrnHo0D/R/dMyuWt7/o0eGIEuRlDl2q+YL8xLuVyJMXQBnd +jo7jKpQ+Q1zl93aVTzsJa7mP2zZ7jqaJ855sdz6rvwyhGF1/qYMtm6zrmgBy2XPm +J+57sfwSZr0bhIeMpCWjIw98z9sObq0v2r2oA3+J9E3Na/BZsCVTZVb3ew7ILmEp +F5D7A/4zvjY41dakCAJsD1Xo8TS6hSqJf4zq9vX3ayJVvUjeo8n4sHNOwcbEnnui +9zZaUH3F0x+3cDo7mS1Y4pD8THuqCZoSbSkiHnlved6nLXsKbqvVrVo+esEhfZCn +Iji3gp+2TVNwdHXGM+4BAzMJCLsdXjByO6SNzB9a+H8RsRlZKrQ8TWxhZGVuIFR1 +cmsgKCoqKiBERUZBVUxUIFNJR05JTkcgS0VZICoqKikgPG10dXJrQGFwYWNoZS5v +cmc+iF0EExECAB0FAj4fwXIFCRLP94AFCwcKAwQDFQMCAxYCAQIXgAAKCRAcUGQH +VkwXo0jxAKCgHzXPIB4IAgoD7GMAohPQfX7j2QCeL6pAsf4pPufmPvbrrpDp6rQH +GOS5Ag0EPh/BhhAIAKWzq7+/+nNYGpc7sXGkDNo9xncxcx/KbbJVT0rBteuaonQ4 +vYar1ITjIhOPmF9yPmpUddNrqgQTSO+Or+ZrVOndn+qC1gdY3qpKIN3KTjXloW38 +0Y84ezwdRLznQNkhgXwNcB55l/Z9kLaW2MS8CJzOuYSQT1CYbXg7XP3684ZmV1KC +cGgcUt9VkIGqwsa2RFDNGvMbySedSkJ/70Q+PJlkXN+W86f8hi3HTjw2MCkNa5NL ++Byg8FEAm95YWrO6kCY3qaJYV7NRt9oVd+2V/NNzwYp3Or/QoYofvfNerupfwBmU +GEXPyZCqqNH6nDv6chscsWvEA9KzhsWnsdKhmHsAAwUH/R6LwfWgtpaO42dQI4ZS +VRBmCeWrXCuyVk0d13Yz0xLi5Z5m4g3MON3d+cRVUiyNX+hbDGpi2mkbsnL559Ef +iqmzDmSz5GQHDutolhOPtLxLrC537ODn2q7hnYQwIQYYIUtYD5sYlzfGYC8olGCB +IcKIdlGRWcxxiFCIJm5CX/jnSBsyDRpanlSrdkxhzAGsifqj4NQ19ayoeNoZg2ZP +9SLIY7vbmOxJeHEYkx8AG25xOY1PLotb/0buSXPB8e71zb/DCV1rAhhUxAr/2JOQ +RqlZBq6PfcHKLRitXRCeVvfldRxuWBIzhuTLUfRPYR6phjP50EzZPlbJzIvGwsOI +RheITAQYEQIADAUCPh/BhgUJEs/3gAAKCRAcUGQHVkwXoy0JAJ9WTfqfYzW/F6qi +5MxmqDnU9/G+6ACfQVmhZNnGTSfcwQCttwCaW3CRhDY= +=MWUr +-END PGP PUBLIC KEY BLOCK- + +Type bits keyID Date User ID +DSS 1024 0xFEA4C043 2001-06-24 Ignacio J. Ortega [EMAIL PROTECTED] + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: PGPfreeware 7.0.3 for non-commercial use http://www.pgp.com + +mQGiBDs1PSgRBAD8g1RLIdDEk1+XW0DeaOrtzDPRUblHwty9S7a2UfiOEJA8GMZv +GAT7HcEynxt6P4a58k3DceWvRw4kcu5PRF++qufzroWkSHK3V/gaDxva9XavfbS0 +vgQC5In4ZG+iKw1CbGeXzMnA28YIVbQztpKWFhyrD5q86DjrcBTefM2e0wCg/+iA +J0DSHbKfiu9mqe8HzVcuXlsEALSSTdUJPRa80bmr6prsuc2heJLa22ddGHkJ5OXD +pvY9mmY+fDe9wL5bnsbnDvmhwoDAsog/+jjWjJhleF+TR+wzEkmO5fYLv8qZPXet +r6loSaY84XwrcN1ZMvGKfhfZMeAGg/McUeivT2q+3NH2dD5IK5tM960lPvq2kk6f +41miA/4kxh/en3CG/qyfb0E33L6XY5xY+IMTnGX7tKFZuGcXtni04mqnmJAdGcoM
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
nacho 2002/10/04 12:27:09
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Porting Fixes done for Tomcat 4
Revision ChangesPath
1.3 +9 -14
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteAdapter.java2 Oct 2002 05:30:50 - 1.2
+++ CoyoteAdapter.java4 Oct 2002 19:27:09 - 1.3
@@ -246,19 +246,14 @@
protected void postParseRequest(Request req, CoyoteRequest request,
Response res, CoyoteResponse response)
throws IOException {
-
-request.setSecure(connector.getSecure());
-req.scheme().setString(connector.getScheme());
+// XXX the processor needs to set a correct scheme and port prior to this
point,
+// in ajp13 protocols dont make sense to get the port from the connector..
+request.setSecure(req.scheme().equals(https));
request.setAuthorization
(req.getHeader(Constants.AUTHORIZATION_HEADER));
-
-// Replace the default port if we are in secure mode
-if (req.getServerPort() == 80
- connector.getScheme().equals(https)) {
-req.setServerPort(443);
-}
-
+// FIXME: the code below doesnt belongs to here, this is only have sense
+// in Http11, not in ajp13..
// At this point the Host header has been processed.
// Override if the proxyPort/proxyHost are set
String proxyName = connector.getProxyName();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse - New directory
nacho 2002/10/04 12:59:41 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls - New directory
nacho 2002/10/04 12:59:59 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls PureTLSImplementation.java PureTLSSocket.java PureTLSSocketFactory.java PureTLSSupport.java
nacho 2002/10/04 13:03:11
Modified:util/java/org/apache/tomcat/util/net SSLImplementation.java
SSLSupport.java
Added: util/java/org/apache/tomcat/util/net/jsse
JSSEImplementation.java JSSESocketFactory.java
JSSESupport.java
util/java/org/apache/tomcat/util/net/puretls
PureTLSImplementation.java PureTLSSocket.java
PureTLSSocketFactory.java PureTLSSupport.java
Removed: util/java/org/apache/tomcat/util/net JSSEImplementation.java
JSSESocketFactory.java JSSESupport.java
PureTLSImplementation.java PureTLSSocket.java
PureTLSSocketFactory.java PureTLSSupport.java
Log:
Refactoring the SSL classes to his own packages, this should not harm anything and
makes easy for tools to manage the depencies..
Revision ChangesPath
1.1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Index: JSSEImplementation.java
===
/*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Tomcat, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.tomcat.util.net.jsse;
import org.apache.tomcat.util.net.SSLImplementation;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.ServerSocketFactory;
import java.io.*;
import java.net.*;
import javax.net.ssl.SSLSocket;
/* JSSEImplementation:
Concrete implementation class for JSSE
@author EKR
*/
public class JSSEImplementation extends SSLImplementation
{
public JSSEImplementation() throws ClassNotFoundException {
// Check to see if JSSE is floating around somewhere
Class.forName(javax.net.ssl.SSLServerSocketFactory);
}
public String getImplementationName(){
return JSSE;
}
public ServerSocketFactory getServerSocketFactory()
{
return new JSSESocketFactory();
}
public SSLSupport getSSLSupport(Socket s)
{
return new JSSESupport((SSLSocket)s
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_apr_socket.c jk_uriEnv.c jk_uriMap.c jk_worker_jni.c jk_worker_lb.c
nacho 2002/10/02 18:33:15
Modified:jk/native2/common jk_channel_apr_socket.c jk_uriEnv.c
jk_uriMap.c jk_worker_jni.c jk_worker_lb.c
Log:
Problems with EOL
I was unable to catch any of the multiple times this issue was discussed on the
list, but again..
Committing files with diferent EOL than the plataform we are working on,
damages them in CVS.. there are many ways to do this, but one of the
most commons is to have the sources in a linux i.e., edit them in win32
with an editor the completes the lf with a cr and commit then form linux..
I suppouse that are many combinations for that circunstance, take care..
Maybe old cygwin versions are problematic too , i dont know..
Revision ChangesPath
1.27 +32 -32
jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
Index: jk_channel_apr_socket.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_channel_apr_socket.c 2 Oct 2002 12:50:05 - 1.26
+++ jk_channel_apr_socket.c 3 Oct 2002 01:33:14 - 1.27
@@ -219,20 +219,20 @@
apr_socket_t *sock=endpoint-channelData;
apr_status_t ret;
apr_int32_t timeout = (apr_int32_t)(socketInfo-timeout * APR_USEC_PER_SEC);
-char msg[128];
+char msg[128];
int connected = 0;
-
+
while (remote_sa !connected) {
if ((ret = apr_socket_create(sock, remote_sa-family, SOCK_STREAM,
(apr_pool_t *)env-globalPool-_private))
!= APR_SUCCESS) {
env-l-jkLog(env, env-l, remote_sa-next ? JK_LOG_DEBUG :
JK_LOG_ERROR,
channelApr.open(): error %d creating socket %d %s\n,
- ret, socketInfo-host);
-remote_sa = remote_sa-next;
-continue;
-}
-
+ ret, socketInfo-host);
+remote_sa = remote_sa-next;
+continue;
+}
+
env-l-jkLog(env, env-l, JK_LOG_INFO,
channelApr.open(): create tcp socket %d\n, sock );
@@ -240,33 +240,33 @@
/* the default timeout (0) will set the socket to blocking with
infinite timeouts.
*/
-if (timeout = 0)
-apr_socket_timeout_set(sock, 0);
-else
+if (timeout = 0)
+apr_socket_timeout_set(sock, 0);
+else
apr_socket_timeout_set(sock, timeout);
-
-/* make the connection out of the socket */
-do {
-ret = apr_connect(sock, remote_sa);
-} while (APR_STATUS_IS_EINTR(ret));
-
-/* if an error occurred, loop round and try again */
-if (ret != APR_SUCCESS) {
-apr_socket_close(sock);
-env-l-jkLog(env, env-l, remote_sa-next ? JK_LOG_DEBUG :
JK_LOG_ERROR,
- channelApr.open() attempt to connect to %pI (%s) failed
%d\n,
- remote_sa,
- socketInfo-host,
- ret);
-remote_sa = remote_sa-next;
-continue;
-}
-connected = 1;
-}
-if (!connected) {
-apr_socket_close(sock);
-return JK_ERR;
+/* make the connection out of the socket */
+do {
+ret = apr_connect(sock, remote_sa);
+} while (APR_STATUS_IS_EINTR(ret));
+
+/* if an error occurred, loop round and try again */
+if (ret != APR_SUCCESS) {
+apr_socket_close(sock);
+env-l-jkLog(env, env-l, remote_sa-next ? JK_LOG_DEBUG :
JK_LOG_ERROR,
+ channelApr.open() attempt to connect to %pI (%s) failed
%d\n,
+ remote_sa,
+ socketInfo-host,
+ ret);
+remote_sa = remote_sa-next;
+continue;
+}
+connected = 1;
+}
+
+if (!connected) {
+apr_socket_close(sock);
+return JK_ERR;
}
/* enable the use of keep-alive packets on TCP connection */
if(keepalive) {
1.36 +11 -11jakarta-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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_uriEnv.c 2 Oct 2002 10:27:17 - 1.35
+++ jk_uriEnv.c 3 Oct 2002 01:33:14 - 1.36
@@ -104,7
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common HandlerRequest.java
nacho 2002/10/01 16:14:13 Modified:jk/java/org/apache/jk/common HandlerRequest.java Log: tomcatAuthentication must default to true ( tomcat ignores auth done in the HTTP server ) to match the tc4.0 and tc3.3 behaviour and Revision ChangesPath 1.16 +1 -1 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java Index: HandlerRequest.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- HandlerRequest.java 26 Aug 2002 09:54:34 - 1.15 +++ HandlerRequest.java 1 Oct 2002 23:14:13 - 1.16 @@ -323,7 +323,7 @@ int secretNote; boolean decoded=true; -boolean tomcatAuthentication; +boolean tomcatAuthentication=true; public int invoke(Msg msg, MsgContext ep ) throws IOException -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
nacho 2002/09/29 10:07:44
Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
Log:
Bug#12998 HTTPS gets changed to HTTP://servername:443
Reported by marcus.kellermann at bentley.com
The processor (HTTP11 or ajp13) should set the scheme and port prior
to this point, in an ajp13 connection doesnt make sense to get the secure
flag from the connector secure flag.
Revision ChangesPath
1.10 +9 -14
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CoyoteAdapter.java9 Sep 2002 07:56:22 - 1.9
+++ CoyoteAdapter.java29 Sep 2002 17:07:44 - 1.10
@@ -246,19 +246,14 @@
protected void postParseRequest(Request req, CoyoteRequest request,
Response res, CoyoteResponse response)
throws IOException {
-
-request.setSecure(connector.getSecure());
-req.scheme().setString(connector.getScheme());
+// XXX the processor needs to set a correct scheme and port prior to this
point,
+// in ajp13 protocols dont make sense to get the port from the connector..
+request.setSecure(req.scheme().equals(https));
request.setAuthorization
(req.getHeader(Constants.AUTHORIZATION_HEADER));
-
-// Replace the default port if we are in secure mode
-if (req.getServerPort() == 80
- connector.getScheme().equals(https)) {
-req.setServerPort(443);
-}
-
+// FIXME: the code below doesnt belongs to here, this is only have sense
+// in Http11, not in ajp13..
// At this point the Host header has been processed.
// Override if the proxyPort/proxyHost are set
String proxyName = connector.getProxyName();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c
nacho 2002/09/28 13:06:19
Modified:jk/native2/common jk_channel_socket.c
Log:
Reverted a prior fix, it seems that hangs w2k IIS, it's starts to stuck threads in
this loop until exhausted or max connections reached..
Revision ChangesPath
1.41 +3 -4 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- jk_channel_socket.c 24 Sep 2002 22:36:28 - 1.40
+++ jk_channel_socket.c 28 Sep 2002 20:06:19 - 1.41
@@ -328,12 +328,11 @@
#ifdef WIN32
if(SOCKET_ERROR == ret) {
-errno = WSAGetLastError();
+errno = WSAGetLastError() - WSABASEERR;
}
-} while (ret == -1 errno == WSAECONNREFUSED);
-#else
-} while (-1 == ret EINTR == errno);
#endif /* WIN32 */
+
+} while (-1 == ret EINTR == errno);
/* Check if we connected */
if(ret != 0 ) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2002/09/24 13:15:07 Modified:jk/native2/server/isapi jk_isapi_plugin.c Log: Add a test for 443 as default port Revision ChangesPath 1.48 +3 -3 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c Index: jk_isapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- jk_isapi_plugin.c 23 Sep 2002 18:36:38 - 1.47 +++ jk_isapi_plugin.c 24 Sep 2002 20:15:07 - 1.48 @@ -95,7 +95,7 @@ static int is_inited = JK_FALSE; static int is_mapread = JK_FALSE; static int was_inited = JK_FALSE; -static int auth_notification_flags = 0; +static DWORD auth_notification_flags = 0; static int use_auth_notification_flags = 0; static jk_workerEnv_t *workerEnv; @@ -342,7 +342,7 @@ } } szPort = atoi(Port); -if (szPort == 80) +if (szPort == 80 || szPort == 443) szPort = 0; env-l-jkLog(env, env-l, JK_LOG_DEBUG, In HttpFilterProc Virtual Host redirection of %s : %d\n, -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c
nacho 2002/09/24 17:49:40
Modified:jk/native/iis jk_isapi_plugin.c
Log:
Better testing for vhosts, use the supplied server name and port instead of directly
the Host header ones..
Revision ChangesPath
1.18 +21 -4 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_isapi_plugin.c 7 May 2002 01:37:51 - 1.17
+++ jk_isapi_plugin.c 25 Sep 2002 00:49:40 - 1.18
@@ -667,7 +667,8 @@
{
char uri[INTERNET_MAX_URL_LENGTH];
char snuri[INTERNET_MAX_URL_LENGTH]=/;
-char Host[INTERNET_MAX_URL_LENGTH];
+char Host[INTERNET_MAX_URL_LENGTH]=;
+char Port[INTERNET_MAX_URL_LENGTH]=;
char Translate[INTERNET_MAX_URL_LENGTH];
BOOL (WINAPI * GetHeader)
(struct _HTTP_FILTER_CONTEXT * pfc, LPSTR lpszName, LPVOID
lpvBuffer, LPDWORD lpdwSize );
@@ -678,6 +679,7 @@
char *query;
DWORD sz = sizeof(uri);
DWORD szHost = sizeof(Host);
+DWORD szPort = sizeof(Port);
DWORD szTranslate = sizeof(Translate);
if (iis5) {
@@ -735,8 +737,23 @@
return SF_STATUS_REQ_FINISHED;
}
getparents(uri);
-
-if(GetHeader(pfc, Host:, (LPVOID)Host, (LPDWORD)szHost)) {
+if (pfc-GetServerVariable(pfc, SERVER_NAME, (LPVOID)Host,
(LPDWORD)szHost)){
+if (szHost 0) {
+Host[szHost-1] = '\0';
+}
+}
+Port[0] = '\0';
+if (pfc-GetServerVariable(pfc, SERVER_PORT, (LPVOID)Port,
(LPDWORD)szPort)){
+if (szPort 0) {
+Port[szPort-1] = '\0';
+}
+}
+szPort = atoi(Port);
+if (szPort != 80 szPort != 443 szHost 0){
+strcat(Host,:);
+strcat(Host,Port);
+}
+if (szHost 0) {
strcat(snuri,Host);
strcat(snuri,uri);
jk_log(logger, JK_LOG_DEBUG,
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
nacho 2002/09/21 19:50:42
Modified:jk/native2/common jk_uriEnv.c jk_uriMap.c
jk/native2/server/apache2 mod_jk2.c
Log:
Bug#11364 - jk2 appears to forward all virtual host requests to Tomcat
Reported by Simon Stewart
Revision ChangesPath
1.26 +0 -1 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_uriEnv.c 15 Aug 2002 09:24:03 - 1.25
+++ jk_uriEnv.c 22 Sep 2002 02:50:42 - 1.26
@@ -100,7 +100,6 @@
/* If it doesn't start with /, it must have a vhost */
if( *name != '/' ) {
-/* char *portIdx=strchr( n, ':' ); */
uriEnv-virtual=uriEnv-pool-calloc( env, uriEnv-pool, slash - name + 2 );
strncpy( uriEnv-virtual, name, slash-name );
}
1.39 +14 -4 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jk_uriMap.c 1 Sep 2002 20:32:07 - 1.38
+++ jk_uriMap.c 22 Sep 2002 02:50:42 - 1.39
@@ -355,7 +355,8 @@
if( uriMap-mbean-debug 5 )
env-l-jkLog(env, env-l, JK_LOG_DEBUG, uriMap.init() set default
host\n);
-
+/* XXX Initializes vhosts from uris */
+jk2_uriMap_correctHosts(env,uriMap);
/* Initialize the vhosts table */
for(i = 0 ; i uriMap-maps-size( env, uriMap-maps ) ; i++) {
uriEnv=uriMap-maps-valueAt( env, uriMap-maps, i );
@@ -622,7 +623,10 @@
/* As per Servlet spec, do exact match first */
match=jk2_uriMap_exactMap( env, uriMap, ctxEnv-exactMatch, uri, uriLen,
reverse );
-if( match != NULL ) {
+if( match != NULL
+(( match-virtual==NULL hostEnv-virtual==NULL ) ||
+ ( hostEnv-virtual!=NULL
strcasecmp(match-virtual,hostEnv-virtual)==0 ))
+ ) {
/* restore */
if( url_rewrite ) *url_rewrite=origChar;
if( uriMap-mbean-debug 0 )
@@ -634,7 +638,10 @@
/* Then prefix match */
match=jk2_uriMap_prefixMap( env, uriMap, ctxEnv-prefixMatch, uri, uriLen,
reverse );
-if( match != NULL ) {
+if( match != NULL
+(( match-virtual==NULL hostEnv-virtual==NULL ) ||
+ ( hostEnv-virtual!=NULL
strcasecmp(match-virtual,hostEnv-virtual)==0 ))
+ ) {
char c=uri[match-prefix_len];
/* XXX Filter prefix matches to allow only exact
matches with an optional path_info or query string at end.
@@ -658,7 +665,10 @@
if( suffix!=NULL ) {
match=jk2_uriMap_suffixMap( env, uriMap, ctxEnv-suffixMatch,
suffix, strlen( suffix ), reverse);
-if( match != NULL ) {
+if( match != NULL
+(( match-virtual==NULL hostEnv-virtual==NULL ) ||
+ ( hostEnv-virtual!=NULL
strcasecmp(match-virtual,hostEnv-virtual)==0 ))
+ ) {
/* restore */
if( url_rewrite ) *url_rewrite=origChar;
if( uriMap-mbean-debug 0 )
1.51 +4 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mod_jk2.c 21 Sep 2002 09:45:27 - 1.50
+++ mod_jk2.c 22 Sep 2002 02:50:42 - 1.51
@@ -629,7 +629,7 @@
{
jk_uriEnv_t *uriEnv;
jk_env_t *env;
-
+
if(r-proxyreq || workerEnv==NULL) {
return DECLINED;
}
@@ -677,8 +677,9 @@
If positive, we'll fill a ws_service_t and do the rewrite and
the real mapping.
*/
+
uriEnv = workerEnv-uriMap-mapUri(env, workerEnv-uriMap,
-r-server-is_virtual ? r-server-server_hostname : NULL,
+apr_psprintf(r-pool,%s:%d,r-hostname,r-server-port),
r-uri );
if( uriEnv== NULL || uriEnv-workerName == NULL) {
--
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
nacho 2002/09/20 16:17:47
Modified:jk/native/common jk_jni_worker.c
Log:
Bug, if stdout log file is used, but not stderr, it gives an AV in some systems
Revision ChangesPath
1.20 +2 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_jni_worker.c 20 Sep 2002 11:28:16 - 1.19
+++ jk_jni_worker.c 20 Sep 2002 23:17:47 - 1.20
@@ -546,7 +546,7 @@
if(p-stdout_name) {
stdout_name = (*env)-NewStringUTF(env, strdup_ascii(p-p,
p-stdout_name));
}
-if(p-stdout_name) {
+if(p-stderr_name) {
stderr_name = (*env)-NewStringUTF(env, strdup_ascii(p-p,
p-stderr_name));
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriMap.c
nacho 2002/09/01 13:32:07
Modified:jk/native2/common jk_uriMap.c
Log:
Filter prefix matches to allow only exact
matches with an optional path_info or query string at end.
Fixes Bug#12141
Revision ChangesPath
1.38 +15 -7 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_uriMap.c 15 Aug 2002 11:24:54 - 1.37
+++ jk_uriMap.c 1 Sep 2002 20:32:07 - 1.38
@@ -635,13 +635,21 @@
/* Then prefix match */
match=jk2_uriMap_prefixMap( env, uriMap, ctxEnv-prefixMatch, uri, uriLen,
reverse );
if( match != NULL ) {
-/* restore */
-if( url_rewrite ) *url_rewrite=origChar;
-if( uriMap-mbean-debug 0 )
-env-l-jkLog(env, env-l, JK_LOG_DEBUG,
- uriMap.mapUri() prefix match %s %s\n,
- uri, match-workerName );
-return match;
+char c=uri[match-prefix_len];
+/* XXX Filter prefix matches to allow only exact
+ matches with an optional path_info or query string at end.
+ Fixes Bugzilla#12141, needs review..
+*/
+if (( uriLen match-prefix_len ( c=='/' || c=='?' ) ) ||
+ uriLen == match-prefix_len ) {
+/* restore */
+if( url_rewrite ) *url_rewrite=origChar;
+if( uriMap-mbean-debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ uriMap.mapUri() prefix match %s %s\n,
+ uri, match-workerName );
+return match;
+}
}
/* And extension match at the end */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors gump.xml
nacho 2002/07/16 08:37:12 Modified:.gump.xml Log: Added nags for all project we have, and a dependency on xerces.. Thanks to Stefan Bodewig Revision ChangesPath 1.6 +5 -0 jakarta-tomcat-connectors/gump.xml Index: gump.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/gump.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gump.xml 8 Jun 2002 00:15:13 - 1.5 +++ gump.xml 16 Jul 2002 15:37:11 - 1.6 @@ -25,6 +25,8 @@ home nested=util/build/ jar name=lib/tomcat-util.jar/ +nag to=[EMAIL PROTECTED] + from=Craig McClanahan lt;[EMAIL PROTECTED]gt;/ /project project name=jakarta-tomcat-coyote @@ -58,6 +60,7 @@ depend project=jakarta-ant/ depend project=commons-logging/ depend project=jakarta-tomcat-util/ +depend project=xml-xerces/ depend project=jakarta-tomcat-coyote/ home nested=jk/build/ @@ -65,6 +68,8 @@ jar name=lib/jkconfig.jar/ jar name=lib/tomcat-jk2.jar/ jar name=lib/tomcat-jni.jar/ +nag to=[EMAIL PROTECTED] + from=Craig McClanahan lt;[EMAIL PROTECTED]gt;/ /project -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c
nacho 2002/07/09 17:35:27
Modified:jk/native2/jni jk_jni_aprImpl.c
Log:
Fixed some (Java?) leaks
Revision ChangesPath
1.40 +11 -15jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jk_jni_aprImpl.c 30 Jun 2002 09:57:38 - 1.39
+++ jk_jni_aprImpl.c 10 Jul 2002 00:35:27 - 1.40
@@ -313,15 +313,11 @@
else if (strcmp(value, done) == 0)
jk_jni_status_code = JNI_TOMCAT_STARTED;
}
-return JK_OK;
-}
-
-if( component-setAttribute ==NULL )
-return JK_OK;
-
-if( component-setAttribute!=NULL ) {
-rc=component-setAttribute( env, component, name,
-component-pool-pstrdup( env, component-pool,
value ) );
+} else {
+if( component-setAttribute!=NULL ) {
+rc=component-setAttribute( env, component, name,
+component-pool-pstrdup( env,
component-pool, value ) );
+}
}
(*jniEnv)-ReleaseStringUTFChars(jniEnv, nameJ, name);
@@ -379,12 +375,12 @@
char *value;
jstring valueJ=NULL;
-if( component-setAttribute ==NULL )
-return JK_OK;
-
-value=component-getAttribute( env, component, name );
-if( value!=NULL )
-valueJ=(*jniEnv)-NewStringUTF(jniEnv, value);
+if( component-getAttribute !=NULL ){
+value=component-getAttribute( env, component, name );
+if( value!=NULL ) {
+valueJ=(*jniEnv)-NewStringUTF(jniEnv, value);
+}
+}
(*jniEnv)-ReleaseStringUTFChars(jniEnv, nameJ, name);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
nacho 2002/07/07 17:26:07
Modified:jk/java/org/apache/jk/common ChannelSocket.java
JkInputStream.java
jk/native2/common jk_worker_ajp13.c
jk/native2/include jk_service.h
jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
Log:
* Fix for PUT problmes in tc417+IIS+slide
Revision ChangesPath
1.19 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChannelSocket.java2 Jul 2002 20:00:15 - 1.18
+++ ChannelSocket.java8 Jul 2002 00:26:07 - 1.19
@@ -383,7 +383,7 @@
total_read = this.read(ep, buf, hlen, blen);
-if (total_read = 0) {
+if ((total_read = 0) (blen 0)) {
log.warn(can't read body, waited # + blen);
return -1;
}
1.12 +4 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java
Index: JkInputStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JkInputStream.java29 Jun 2002 22:39:13 - 1.11
+++ JkInputStream.java8 Jul 2002 00:26:07 - 1.12
@@ -276,12 +276,13 @@
if( log.isDebugEnabled())
log.debug( doRead + pos + + blen + + available + +
end_of_stream+
+ responseChunk.getOffset()+ +
responseChunk.getLength());
-if( contentLength == pos ) {
-end_of_stream=true;
+if( end_of_stream ) {
return -1;
}
if( blen == pos ) {
-refillReadBuffer();
+if ( !refillReadBuffer() ){
+return -1;
+}
}
responseChunk.setBytes( bodyBuff, pos, blen );
pos=blen;
1.37 +4 -0 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_worker_ajp13.c 29 Jun 2002 18:29:51 - 1.36
+++ jk_worker_ajp13.c 8 Jul 2002 00:26:07 - 1.37
@@ -496,6 +496,10 @@
} else {
err=jk2_worker_ajp13_forwardSingleThread( env, w, s, e );
}
+if (err != JK_OK){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ ajp13.service() Error forwarding %s\n, e-worker-mbean-name);
+}
if( w-mbean-debug 0 )
env-l-jkLog(env, env-l, JK_LOG_INFO,
1.16 +2 -1 jakarta-tomcat-connectors/jk/native2/include/jk_service.h
Index: jk_service.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_service.h 5 Jun 2002 21:56:39 - 1.15
+++ jk_service.h 8 Jul 2002 00:26:07 - 1.16
@@ -204,6 +204,7 @@
unsigned is_chunked;/* 1 if content length is unknown (chunked rq) */
unsigned no_more_chunks;/* 1 if last chunk has been read */
long content_read; /* number of bytes read */
+int end_of_stream; /* For IIS avoids blocking calls to
lpEcb-ReadClient */
/*
* SSL information
1.36 +3 -3
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_isapi_plugin.c 6 Jul 2002 08:05:49 - 1.35
+++ jk_isapi_plugin.c 8 Jul 2002 00:26:07 - 1.36
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_signal.c jk_user.c
nacho 2002/07/07 17:26:33
Modified:jk/native2/common jk_signal.c jk_user.c
Log:
Less warnings
Revision ChangesPath
1.2 +1 -0 jakarta-tomcat-connectors/jk/native2/common/jk_signal.c
Index: jk_signal.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_signal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_signal.c 11 Jun 2002 22:09:10 - 1.1
+++ jk_signal.c 8 Jul 2002 00:26:33 - 1.2
@@ -161,6 +161,7 @@
const char *type, const char *name)
{
result-disabled=JK_TRUE;
+return JK_FALSE;
}
#endif
1.2 +1 -0 jakarta-tomcat-connectors/jk/native2/common/jk_user.c
Index: jk_user.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_user.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_user.c 11 Jun 2002 22:09:10 - 1.1
+++ jk_user.c 8 Jul 2002 00:26:33 - 1.2
@@ -145,6 +145,7 @@
const char *type, const char *name)
{
result-disabled=JK_TRUE;
+return JK_FALSE;
}
#endif
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/iis README
nacho 2002/07/01 12:33:59 Modified:jk/native/iis README Log: * More on build i_r.dll from command line. Revision ChangesPath 1.2 +21 -3 jakarta-tomcat-connectors/jk/native/iis/README Index: README === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README1 Jul 2002 11:08:35 - 1.1 +++ README1 Jul 2002 19:33:59 - 1.2 @@ -8,8 +8,26 @@ REQUIREMENT --- -MS VC 6.0 (+ update, latest service pack is sp5) -MS PLATFORM SDK +* MS VC 6.0 (+ update, latest service pack is sp5) + isapi_redirector.dll can be built using the command line tools, or + from within the Visual Studio IDE Workbench. The command line build + requires the environment to reflect the PATH, INCLUDE, LIB and other + variables that can be configured with the vcvars32 batch file: + + c:\Program Files\DevStudio\VC\Bin\vcvars32.bat + +* MS PLATFORM SDK + Visual C++ 6.0 builds require an updated Microsoft Windows Platform SDK + (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/) to enable + some isapi_redirector.dll features. For command line builds, + the Platform SDK environment is prepared by the setenv batch file: + + c:\Program Files\Microsoft Platform SDK\setenv.bat + + Note that the Windows Platform SDK is only needed if you want authenticate + using IIS to compile a isapi_redirector.dll.. + + BUILDING @@ -17,7 +35,7 @@ The steps that you need to take are: 1. Change directory to the isapi redirector plugins source directory. - + 2. Execute the following command: MSDEV isapi.dsp /MAKE ALL If msdev is not in your path, enter the full path to msdev.exe -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_jni.c
nacho 2002/07/01 16:11:42
Modified:jk/native2/common jk_worker_jni.c
Log:
* set the stdout and stderr files using statics methods from AprImpl
Revision ChangesPath
1.22 +46 -12jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c
Index: jk_worker_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_jni.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_worker_jni.c 1 Jul 2002 15:44:16 - 1.21
+++ jk_worker_jni.c 1 Jul 2002 23:11:42 - 1.22
@@ -81,7 +81,10 @@
struct jni_worker_data {
jclass jk_java_bridge_class;
+jclass jk_java_bridge_apri_class;
jmethodID jk_main_method;
+jmethodID jk_setout_method;
+jmethodID jk_seterr_method;
char *className;
char *stdout_name;
char *stderr_name;
@@ -102,14 +105,32 @@
p-jk_main_method =
(*jniEnv)-GetStaticMethodID(jniEnv, p-jk_java_bridge_class,
main,
-
([Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V);
+ ([Ljava/lang/String;)V);
+if(!p-jk_main_method) {
+ env-l-jkLog(env, env-l, JK_LOG_EMERG, Can't find main(String [])\n);
+ return JK_ERR;
+}
-
+p-jk_setout_method =
+(*jniEnv)-GetStaticMethodID(jniEnv, p-jk_java_bridge_apri_class,
+ setOut,
+ (Ljava/lang/String;)V);
if(!p-jk_main_method) {
- env-l-jkLog(env, env-l, JK_LOG_EMERG, Can't find main()\n);
- return JK_ERR;
+ env-l-jkLog(env, env-l, JK_LOG_EMERG, Can't find
AprImpl.setOut(String));
+ return JK_ERR;
}
+p-jk_seterr_method =
+(*jniEnv)-GetStaticMethodID(jniEnv, p-jk_java_bridge_apri_class,
+ setErr,
+ (Ljava/lang/String;)V);
+if(!p-jk_main_method) {
+ env-l-jkLog(env, env-l, JK_LOG_EMERG, Can't find
AprImpl.setErr(String)\n);
+ return JK_ERR;
+}
+
+
+
return JK_OK;
}
@@ -178,7 +199,6 @@
char *str_config = NULL;
jk_map_t *props=_this-workerEnv-initData;
jk_vm_t *vm=_this-workerEnv-vm;
-jclass aprImplClass;
jclass jstringClass;
jarray jargs;
int i=0;
@@ -251,19 +271,18 @@
XXX Need the way to customize JAVA_BRIDGE_CLASS_APRI, but since
it's hardcoded in JniHandler.java doesn't matter for now.
*/
-aprImplClass =
+jniWorker-jk_java_bridge_apri_class =
(*jniEnv)-FindClass(jniEnv, JAVA_BRIDGE_CLASS_APRI );
-if( aprImplClass == NULL ) {
+if( jniWorker-jk_java_bridge_apri_class == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
Can't find class %s\n, JAVA_BRIDGE_CLASS_APRI );
/* [V] the detach here may segfault on 1.1 JVM... */
vm-detach(env, vm);
return JK_ERR;
}
-rc = jk_jni_aprImpl_registerNatives( jniEnv, aprImplClass);
-
- if( rc != 0) {
+rc = jk_jni_aprImpl_registerNatives( jniEnv,
jniWorker-jk_java_bridge_apri_class);
+if( rc != 0) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
Can't register native functions for %s \n,
JAVA_BRIDGE_CLASS_APRI );
vm-detach(env, vm);
@@ -293,13 +312,28 @@
(*jniEnv)-SetObjectArrayElement(jniEnv, jargs, i, arg );
}
+/* Set out and err stadard files */
+
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jni.init() setting stdout=%s...\n,jniWorker-stdout_name);
+(*jniEnv)-CallStaticVoidMethod(jniEnv,
+jniWorker-jk_java_bridge_apri_class,
+jniWorker-jk_setout_method,
+stdout_name);
+
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jni.init() setting stderr=%s...\n,jniWorker-stderr_name);
+(*jniEnv)-CallStaticVoidMethod(jniEnv,
+jniWorker-jk_java_bridge_apri_class,
+jniWorker-jk_seterr_method,
+stderr_name);
+
env-l-jkLog(env, env-l, JK_LOG_INFO,
jni.init() calling main()...\n);
-
(*jniEnv)-CallStaticVoidMethod(jniEnv,
jniWorker-jk_java_bridge_class,
jniWorker-jk_main_method,
-jargs,stdout_name,stderr_name);
+jargs);
vm-detach(env, vm
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/apr TomcatStarter.java AprImpl.java
nacho 2002/07/01 16:12:33
Modified:jk/java/org/apache/jk/apr TomcatStarter.java AprImpl.java
Log:
* set the stdout and stderr files using statics methods from AprImpl
Revision ChangesPath
1.11 +2 -12
jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java
Index: TomcatStarter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/TomcatStarter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TomcatStarter.java30 Jun 2002 09:59:11 - 1.10
+++ TomcatStarter.java1 Jul 2002 23:12:33 - 1.11
@@ -24,21 +24,11 @@
// If someone has time - we can also guess the classpath and do other
// fancy guessings.
-public static void main( String args[], String stdout, String stderr ) {
+public static void main( String args[] ) {
System.err.println(TomcatStarter: main());
try {
-try{
-if( stdout!=null ){
-System.setOut( new PrintStream(new FileOutputStream(stdout)));
-}
-if( stderr!=null ){
-System.setErr( new PrintStream(new FileOutputStream(stderr)));
-}
-}catch (Throwable th){
-}
-AprImpl.jniMode();
-
+AprImpl.jniMode();
// Find the class
Class c=null;
for( int i=0; imainClasses.length; i++ ) {
1.24 +21 -0 jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java
Index: AprImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/apr/AprImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AprImpl.java 30 Jun 2002 09:59:02 - 1.23
+++ AprImpl.java 1 Jul 2002 23:12:33 - 1.24
@@ -68,6 +68,27 @@
this.nativeSo=nativeSo;
}
+/** Sets the System.out stream */
+
+public static void setOut( String filename ) {
+try{
+if( filename !=null ){
+System.setOut( new PrintStream(new FileOutputStream(filename )));
+}
+}catch (Throwable th){
+}
+}
+/** Sets the System.err stream */
+
+public static void setErr( String filename ) {
+try{
+if( filename !=null ){
+System.setErr( new PrintStream(new FileOutputStream(filename )));
+}
+}catch (Throwable th){
+}
+}
+
// Apr generic utils
/** Initialize APR
*/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs configweb.xml
nacho 2002/07/01 16:42:24
Modified:jk/xdocs configweb.xml
Log:
* Borrow :) some text from original costin's texts in html..
Revision ChangesPath
1.4 +79 -219 jakarta-tomcat-connectors/jk/xdocs/configweb.xml
Index: configweb.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/configweb.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configweb.xml 30 Jun 2002 03:32:01 - 1.3
+++ configweb.xml 1 Jul 2002 23:42:24 - 1.4
@@ -6,9 +6,12 @@
author email=[EMAIL PROTECTED]Jean-Frederic
Clere/author
/properties
section name=Intro
+pJk2 uses a config file ( workers2.properties ) in the style of a
.properties or ini
+ file. It can be configured to use any other backend that provides similar
+ capabilities.
+ /p
p
- This document describes the configuration file used by mod_jk2 on the
- Web Server site. Its default name is ${serverRoot}/conf/workers2.properties,
+ This document describes the format of this configuration file. Its default name
is ${serverRoot}/conf/workers2.properties,
where ${serverRoot} is something like /opt/apache.
/p
/section
@@ -17,30 +20,60 @@
subsection name=Apache 2/
subsection name=IIS/
/section
-section name=Config file/
-section name=Components
-pCommon properties for all components/p
-p
-table
-tr
-thProperty name/th
-thDefault/th
-thDescription/th
-/tr
-tr
-tddisabled/td
-td0 (false)/td
-tddisabled state for the component, 1=true 0=false/td
-/tr
-tr
-tddebug/td
-td0 (false)/td
-tddebug state for the component, 1=true 0=false/td
-/tr
-/table
+section name=Config file
+p The default config file is user editable, but mod_jk will persist the
+changes requested by protocol( not implemented). If you manually change the file
while jk2 is
+working, your changes will be lost.
+ /p
+pThe default configuration format . . Each setting consists of an object
+name and a property, with the associated value. The property name is a simple
+ string, with no '.' in it. The name can be anything, but it must have a
+known 'type' as prefix.
+ /p
+p2 formats are supported:
+source
+TYPE:NAME.PROPERTY=VALUE
+/source
+/p
+pand
+source
+[TYPE:NAME]
+PROPERTY=VALUE
+/source
/p
+/section
+section name=ComponentspEach component instance has a name, that is used
for configuration and at runtime. Each component has a number of configurable
properties. The following rules are used:
+ulliThe name is composed from the type and a local part, separated with a ':' (
example: channel.unixsocket:/tmp/jk.socket ) /li
+liThe 'type' consist of '.' and ascii characters. It is mapped to a JMX
'domain'. /li
+liThe local part consists of ascii characters and .:/;
+pNote that '=,' are not currently allowed - a future version may support the jmx
syntax by using quotes to separate the local part from the property and value ( in
.properties mode we must use '=' to separate the value from type, local name and
property name ). /p/li
+liThe property is a simple name, with no dots. /li
+liA simple form of substitution is used in values, where $(property) will be
replaced with a previously defined setting. If the property has ':' in it, it'll take
the value from the object, if not it'll take the value from a global map./li/ul/p
+subsection name=Common properties
+pCommon properties for all components/p
+p
+table
+tr
+thProperty name/th
+thDefault/th
+thDescription/th
+/tr
+tr
+tddisabled/td
+td0 (false)/td
+tddisabled state for the component, 1=true 0=false/td
+/tr
+tr
+tddebug/td
+td0 (false)/td
+tddebug state for the component, 1=true 0=false/td
+/tr
+/table
+/p
+/subsection
subsection name=workerEnv
-pThis component represent the core jk2, this has the default logger
cvs commit: jakarta-tomcat-connectors/jk/conf workers2.properties
nacho 2002/07/01 16:53:08
Modified:jk/conf workers2.properties
Log:
* add some more examples of config..
Revision ChangesPath
1.14 +14 -1 jakarta-tomcat-connectors/jk/conf/workers2.properties
Index: workers2.properties
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/workers2.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- workers2.properties 19 May 2002 20:56:13 - 1.13
+++ workers2.properties 1 Jul 2002 23:53:07 - 1.14
@@ -10,6 +10,11 @@
info=Maps the requests. Options: debug
debug=0
+# Alternate file logger
+#[logger.file:0]
+#level=DEBUG
+#file=${serverRoot}/logs/jk2.log
+
[shm:]
info=Scoreboard. Required for reconfiguration and status with multiprocess servers
file=${serverRoot}/logs/jk2.shm
@@ -21,6 +26,10 @@
info=Global server options
timing=1
debug=0
+# Default Native Logger (apache2 or win32 )
+# can be overriden to a file logger, useful
+# when tracing win32 related issues
+#logger=logger.file:0
[lb:lb]
info=Default load balancer.
@@ -58,10 +67,12 @@
[vm:]
info=Parameters used to load a JVM in the server process
-OPT=-Djava.class.path=${TOMCAT_HOME}/bin/tomcat-jni.jar
+#JVM=C:\jdk\jre\bin\hotspot\jvm.dll
+OPT=-Djava.class.path=${TOMCAT_HOME}/lib/tomcat-jni.jar;${TOMCAT_HOME}/lib/tomcat.jar
OPT=-Dtomcat.home=${TOMCAT_HOME}
OPT=-Dcatalina.home=${TOMCAT_HOME}
OPT=-Xmx128M
+#OPT=-Djava.compiler=NONE
disabled=1
[worker.jni:jniCmd1]
@@ -69,6 +80,8 @@
class=org/apache/jk/apr/TomcatStarter
ARG=start
disabled=1
+stdout=${serverRoot}/logs/stdout.log
+stderr=${serverRoot}/logs/stderr.log
[uri:/jkstatus/*]
info=Display status information and checks the config file for changes.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common JkInputStream.java
nacho 2002/06/29 15:39:13
Modified:jk/java/org/apache/jk/common JkInputStream.java
Log:
Problems when detecting that post body was exhausted, added a check in doRead..
Revision ChangesPath
1.11 +4 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java
Index: JkInputStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JkInputStream.java20 Jun 2002 18:46:59 - 1.10
+++ JkInputStream.java29 Jun 2002 22:39:13 - 1.11
@@ -276,6 +276,10 @@
if( log.isDebugEnabled())
log.debug( doRead + pos + + blen + + available + +
end_of_stream+
+ responseChunk.getOffset()+ +
responseChunk.getLength());
+if( contentLength == pos ) {
+end_of_stream=true;
+return -1;
+}
if( blen == pos ) {
refillReadBuffer();
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs configweb.xml index.xml style.css.in style.xsl.in
nacho 2002/06/29 20:32:02
Modified:jk/xdocs configweb.xml index.xml style.css.in style.xsl.in
Log:
Adding some more docs, i dont know already wich is the good layout for the
components and his properties.. :), i hope we found it sound
Revision ChangesPath
1.3 +539 -206 jakarta-tomcat-connectors/jk/xdocs/configweb.xml
Index: configweb.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/configweb.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configweb.xml 20 Jun 2002 20:38:41 - 1.2
+++ configweb.xml 30 Jun 2002 03:32:01 - 1.3
@@ -1,79 +1,438 @@
?xml version=1.0?
document
- properties
-titleConfiguration in the Web Server/title
-author email=[EMAIL PROTECTED]Costin Manolache/author
-author email=[EMAIL PROTECTED]Jean-Frederic Clere/author
- /properties
-
-section name=Intro
-p
+properties
+titleConfiguration in the Web Server/title
+author email=[EMAIL PROTECTED]Costin Manolache/author
+author email=[EMAIL PROTECTED]Jean-Frederic
Clere/author
+/properties
+section name=Intro
+p
This document describes the configuration file used by mod_jk2 on the
Web Server site. Its default name is ${serverRoot}/conf/workers2.properties,
where ${serverRoot} is something like /opt/apache.
/p
-/section
-
-section name=Config options
-p
+/section
+section name=Installation
+subsection name=Apache 1/
+subsection name=Apache 2/
+subsection name=IIS/
+/section
+section name=Config file/
+section name=Components
+pCommon properties for all components/p
+p
+table
+tr
+thProperty name/th
+thDefault/th
+thDescription/th
+/tr
+tr
+tddisabled/td
+td0 (false)/td
+tddisabled state for the component, 1=true 0=false/td
+/tr
+tr
+tddebug/td
+td0 (false)/td
+tddebug state for the component, 1=true 0=false/td
+/tr
+/table
+/p
+subsection name=workerEnv
+pThis component represent the core jk2, this has the default logger
for all other components/p
+p
+table
+tr
+thProperty name/th
+thDefault/th
+thDescription/th
+/tr
+tr
+tdlogger/td
+tdlogger/td
+tdDefault loger used by jk2 components, can be changed in
the config file, normally it defaults to logger the Alias for the default logger for
the Server/platform./td
+/tr
+tr
+tdtiming/td
+td0/td
+tdWill jk2 get request timing (needs APR?)/td
+/tr
+/table
+/p
+/subsection
+subsection name=config
+pThe config component, hold the detail of the conifg system, such
config file name, create global defines/p
+p
+table
+tr
+thProperty name/th
+thDefault/th
+thDescription/th
+/tr
+tr
+tddebugEnv/td
+td0/td
+tdSet the debug level of the hidden env component /td
+/tr
+/table
+/p
+/subsection
+subsection name=uriMap/
+subsection name=shm
+pShared memory descriptor/p
+p
+table
+tr
+thProperty name/th
+thDefault/th
+thDescription/th
+/tr
+tr
+tdfile/td
+tdNo default value/td
+tdName of the file that will be mmapped to use as shared
memory./td
+/tr
+tr
+tdsize/td
+tdNo default value/td
+tdSize of the file./td
+/tr
+/table
+/p
+/subsection
+subsection name=uri
+pMaps a resource to a worker/p
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
nacho 2002/06/29 20:33:06 Modified:jk/native2/jni jkjni.dsp Log: * build jkjni not JKJni Revision ChangesPath 1.4 +363 -388 jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jkjni.dsp 12 Jun 2002 23:26:36 - 1.3 +++ jkjni.dsp 30 Jun 2002 03:33:06 - 1.4 @@ -1,388 +1,363 @@ -# Microsoft Developer Studio Project File - Name=Jni - Package Owner=4 -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 - -CFG=Jni - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f JKJni.mak. -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f JKJni.mak CFG=Jni - Win32 Debug -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE Jni - Win32 Release (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE Jni - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName -# PROP Scc_LocalPath -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF $(CFG) == Jni - Win32 Release - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir Release -# PROP BASE Intermediate_Dir Release -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir Release -# PROP Intermediate_Dir Release -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /D HAVE_JNI /D HAS_APR /YX /FD /c -# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 -# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d NDEBUG -# ADD RSC /l 0xc0a /d NDEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /libpath:$(APACHE2_HOME)\lib - -!ELSEIF $(CFG) == Jni - Win32 Debug - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir Jni___Win32_Debug -# PROP BASE Intermediate_Dir Jni___Win32_Debug -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir Debug -# PROP Intermediate_Dir Debug -# 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_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d _DEBUG -# ADD RSC /l 0x409 /d _DEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:$(APACHE2_HOME)\lib - -!ENDIF - -# Begin Target - -# Name Jni - Win32 Release -# Name Jni - Win32 Debug -# Begin Group Source Files - -# PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat -# Begin Source File - -SOURCE=..\common\jk_channel.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_channel_apr_socket.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_channel_jni.c -# End Source File -# Begin Source File - -SOURCE=..\common
cvs commit: jakarta-tomcat-connectors/jk build.xml
nacho 2002/06/23 12:04:48
Modified:jk build.xml
Log:
Exclude more filetypes from copiying when building jk2 docs
Revision ChangesPath
1.44 +3 -0 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 5 Jun 2002 23:03:09 - 1.43
+++ build.xml 23 Jun 2002 19:04:48 - 1.44
@@ -401,6 +401,9 @@
todir=${build.docs}
fileset dir=${source.docs}
exclude name=**.xml/
+exclude name=**.css.in/
+exclude name=**.xsl.in/
+exclude name=**.samples/
exclude name=**.xsl/
exclude name=**.idx/
exclude name=**/images/originals/**/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 2002/06/14 16:39:52
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* Better name for the roles attribute
Revision ChangesPath
1.19 +3 -1
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_service_iis.c 14 Jun 2002 23:12:05 - 1.18
+++ jk_service_iis.c 14 Jun 2002 23:39:52 - 1.19
@@ -79,6 +79,8 @@
#include jk_iis.h
+#define ROLES_ATTRIBUTE_NAME org.apache.tomcat.jk.roles
+
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
static char crlf[3] = { (char)13, (char)10, '\0' };
const char *reason;
@@ -399,7 +401,7 @@
if ( strlen(s-remote_user) 0 ){
char *groups=jk2_service_iis_get_roles(env, s);
if( groups != NULL){
-s-attributes-put( env, s-attributes,ROLES,groups,NULL);
+s-attributes-put( env,
s-attributes,ROLES_ATTRIBUTE_NAME,groups,NULL);
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
nacho 2002/06/12 16:26:36 Modified:jk/native2/server/isapi isapi.dsp jk/native2/server/apache2 mod_jk2.dsp jk/native2/jni jkjni.dsp Log: * Added jk_user and jk_signal to the win32 build Revision ChangesPath 1.16 +20 -12jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- isapi.dsp 9 Jun 2002 01:52:34 - 1.15 +++ isapi.dsp 12 Jun 2002 23:26:35 - 1.16 @@ -157,10 +157,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_logger_win32_message.h -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_map.c # End Source File # Begin Source File @@ -205,10 +201,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_registry.h -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_requtil.c # End Source File # Begin Source File @@ -221,6 +213,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_signal.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_uriEnv.c # End Source File # Begin Source File @@ -229,6 +225,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_user.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_vm_default.c # End Source File # Begin Source File @@ -255,10 +255,6 @@ SOURCE=..\..\common\jk_workerEnv.c # End Source File -# Begin Source File - -SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h -# End Source File # End Group # Begin Group Header Files @@ -297,6 +293,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_logger_win32_message.h +# End Source File +# Begin Source File + SOURCE=..\..\include\jk_map.h # End Source File # Begin Source File @@ -321,6 +321,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_registry.h +# End Source File +# Begin Source File + SOURCE=..\..\include\jk_requtil.h # End Source File # Begin Source File @@ -350,6 +354,10 @@ # Begin Source File SOURCE=..\..\include\jk_workerEnv.h +# End Source File +# Begin Source File + +SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h # End Source File # End Group # Begin Group Resource Files 1.3 +12 -0 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_jk2.dsp 9 Jun 2002 01:53:50 - 1.2 +++ mod_jk2.dsp 12 Jun 2002 23:26:35 - 1.3 @@ -141,6 +141,10 @@ # End Source File # Begin Source File +SOURCE=..\..\jni\jk_jni_aprImpl.c +# End Source File +# Begin Source File + SOURCE=.\jk_logger_apache2.c # End Source File # Begin Source File @@ -213,11 +217,19 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_signal.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_uriEnv.c # End Source File # Begin Source File SOURCE=..\..\common\jk_uriMap.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_user.c # End Source File # Begin Source File 1.3 +8 -0 jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jkjni.dsp 9 Jun 2002 01:54:07 - 1.2 +++ jkjni.dsp 12 Jun 2002 23:26:36 - 1.3 @@ -200,11 +200,19 @@ # End Source File # Begin Source File +SOURCE=..\common\jk_signal.c +# End Source File +# Begin Source File + SOURCE=..\common\jk_uriEnv.c # End Source File # Begin Source File SOURCE=..\common\jk_uriMap.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_user.c # End Source File # Begin Source File -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_vm_default.c
nacho 2002/06/11 14:19:31
Modified:jk/native2/common jk_vm_default.c
Log:
The patch deals with unnecesary calls to the AttachCurrentThread if the
GetEnv returns valid environment.
The second part of patch uses WIN32 registry to guess the correct
jvm.dll like Java does itself.
Submitted by Mladen Turk.
Revision ChangesPath
1.18 +66 -4 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_vm_default.c 10 Jun 2002 21:55:06 - 1.17
+++ jk_vm_default.c 11 Jun 2002 21:19:31 - 1.18
@@ -351,10 +351,22 @@
#endif
err= (*jvm)-GetEnv( jvm, (void **)rc, JNI_VERSION_1_2 );
-if( ( err != 0 )
-( err != JNI_EDETACHED) ) {
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+/* If the current thread is allready attached to the VM return the
+ appropriate interface. There is no need to call the AttachCurrentThread.
+*/
+if( err == 0) {
+if( jkvm-mbean-debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_INFO, vm.attach() allready
attached\n);
+return rc;
+}
+/* The error code is either JNI_OK (allready attached) or JNI_EDETACHED.
+ Othere possibility is that specified version is not supported,
+ and the returned err in that case is JNI_EVERSION.
+*/
+if( err != JNI_EDETACHED) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
vm.attach() GetEnv failed %d\n, err);
+return NULL;
}
err = (*jvm)-AttachCurrentThread(jvm,
@@ -406,6 +418,56 @@
/* Some guessing - to spare the user ( who might know less
than we do ).
*/
+#ifdef WIN32
+/* On WIN32 use the Registry couse Java itself relies on that.
+*/
+#define JAVASOFT_REGKEY SOFTWARE\\JavaSoft\\Java Runtime Environment\\
+
+static char* jk2_vm_guessJvmDll(jk_env_t *env, jk_map_t *props,
+ jk_vm_t *jkvm)
+{
+HKEY hkjs;
+static char jvm[MAX_PATH+1];
+char reg[MAX_PATH+1];
+char *cver;
+jk_pool_t *p=props-pool;
+unsigned int err, klen = MAX_PATH;
+
+ strcpy(reg, JAVASOFT_REGKEY);
+ cver = reg[sizeof(JAVASOFT_REGKEY)-1];
+if( (err=RegOpenKeyEx(HKEY_LOCAL_MACHINE, reg,
+ 0, KEY_READ, hkjs) ) != ERROR_SUCCESS) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jni.guessJvmDll() failed to open Registry key\n);
+ return NULL;
+ }
+if( (err=RegQueryValueEx(hkjs, CurrentVersion, NULL, NULL,
+ (unsigned char *)cver, klen) ) != ERROR_SUCCESS) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jni.guessJvmDll() failed obtaining Current Version\n);
+ RegCloseKey(hkjs);
+ return NULL;
+ }
+RegCloseKey(hkjs);
+if( (err=RegOpenKeyEx(HKEY_LOCAL_MACHINE, reg,
+ 0, KEY_READ, hkjs) ) != ERROR_SUCCESS) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jni.guessJvmDll() failed to open Registry key\n);
+ return NULL;
+ }
+ klen = MAX_PATH;
+if( (err=RegQueryValueEx(hkjs, RuntimeLib, NULL, NULL,
+ (unsigned char *)jvm, klen) ) != ERROR_SUCCESS) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ jni.guessJvmDll() failed obtaining Runtime Library\n);
+ RegCloseKey(hkjs);
+ return NULL;
+ }
+RegCloseKey(hkjs);
+
+return jvm;
+}
+#else
static char* jk2_vm_guessJvmDll(jk_env_t *env, jk_map_t *props,
jk_vm_t *jkvm)
{
@@ -435,7 +497,7 @@
return NULL;
}
-
+#endif
static int jk2_vm_initVM(jk_env_t *env, jk_vm_t *jkvm)
{
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_msg.h
nacho 2002/06/11 14:46:38 Modified:jk/native2/include jk_msg.h Log: * Fix the license copyright dates Revision ChangesPath 1.12 +1 -1 jakarta-tomcat-connectors/jk/native2/include/jk_msg.h Index: jk_msg.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_msg.h 10 Jun 2002 21:41:14 - 1.11 +++ jk_msg.h 11 Jun 2002 21:46:38 - 1.12 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2001 The Apache Software Foundation. * + * Copyright (c) 1999-2002 The Apache Software Foundation. * * All rights reserved.* * * * = * -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_msg.h
nacho 2002/06/10 14:41:14 Modified:jk/native2/include jk_msg.h Log: Changed the default ajp buffer size to match the Java part Revision ChangesPath 1.11 +1 -1 jakarta-tomcat-connectors/jk/native2/include/jk_msg.h Index: jk_msg.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_msg.h 28 May 2002 22:37:11 - 1.10 +++ jk_msg.h 10 Jun 2002 21:41:14 - 1.11 @@ -77,7 +77,7 @@ struct jk_ws_service; struct jk_logger; -#define DEF_BUFFER_SZ (8 * 1024) +#define DEF_BUFFER_SZ (8300) #define AJP13_MAX_SEND_BODY_SZ (DEF_BUFFER_SZ - 6) /** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_jni_aprImpl.c
nacho 2002/06/10 14:49:53
Modified:jk/native2/jni jk_jni_aprImpl.c
Log:
* Changed %p format specifiers to %#lx - Thanks to JFC
* Only relase array if arrayAccessMethod == JK_GET_BYTE_ARRAY_ELEMENTS
Revision ChangesPath
1.34 +19 -16jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c
Index: jk_jni_aprImpl.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_jni_aprImpl.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_jni_aprImpl.c 10 Jun 2002 21:36:15 - 1.33
+++ jk_jni_aprImpl.c 10 Jun 2002 21:49:53 - 1.34
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved.*
* *
* = *
@@ -215,7 +215,7 @@
if( jniChannel==NULL ) {
jniChannel=env-getByName( env, channel.jni:jni );
-fprintf(stderr, Got jniChannel %p\n, jniChannel );
+fprintf(stderr, Got jniChannel %#lx\n, jniChannel );
}
if( jniChannel==NULL ) {
return;
@@ -227,7 +227,7 @@
return;
}
component-init( env, component );
-fprintf(stderr, Create endpoint %p\n, component-object );
+fprintf(stderr, Create endpoint %#lx\n, component-object );
signalEndpoint=component-object;
}
@@ -341,11 +341,11 @@
if( jk_env_globalEnv == NULL )
return 0;
-/* fprintf(stderr, Get env %p\n, jk_env_globalEnv); */
+/* fprintf(stderr, Get env %#lx\n, jk_env_globalEnv); */
env=jk_env_globalEnv-getEnv( jk_env_globalEnv );
/* if( env!=NULL) */
/* env-l-jkLog(env, env-l, JK_LOG_INFO, */
-/* aprImpl.getJkEnv() %p\n, env); */
+/* aprImpl.getJkEnv() %#lx\n, env); */
return (jlong)(long)(void *)env;
}
@@ -364,7 +364,7 @@
if( jniDebug 0 )
env-l-jkLog(env, env-l, JK_LOG_INFO,
- aprImpl.releaseJkEnv() %p\n, env);
+ aprImpl.releaseJkEnv() %#lx\n, env);
}
/*
@@ -388,7 +388,7 @@
env-recycleEnv( env );
/* env-l-jkLog(env, env-l, JK_LOG_INFO, */
-/* aprImpl.releaseJkEnv() %p\n, env); */
+/* aprImpl.releaseJkEnv() %#lx\n, env); */
}
@@ -407,7 +407,7 @@
component=env-getBean( env, cname );
/* env-l-jkLog(env, env-l, JK_LOG_INFO, */
-/* aprImpl.getJkHandler() %p %s\n, component, cname ); */
+/* aprImpl.getJkHandler() %#lx %s\n, component, cname ); */
(*jniEnv)-ReleaseStringUTFChars(jniEnv, compNameJ, cname);
@@ -534,7 +534,7 @@
jk_bean_t *bean=(jk_bean_t *)target;
jk_endpoint_t *ep;
-jbyte *nbuf;
+jbyte *nbuf=NULL;
jboolean iscopy;
int cnt=0;
@@ -553,7 +553,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,jni.jkInvoke() NPE ep==null\n);
return JK_ERR;
}
-
+
if( arrayAccessMethod == JK_GET_BYTE_ARRAY_ELEMENTS ) {
nbuf = (*jniEnv)-GetByteArrayElements(jniEnv, data, iscopy);
if( iscopy )
@@ -568,7 +568,6 @@
if( raw==0 ) {
ep-reply-reset(env, ep-reply);
}
-
oldBuf=ep-reply-buf;
ep-reply-buf = (unsigned char *)nbuf;
} else if ( arrayAccessMethod == JK_GET_REGION ) {
@@ -588,16 +587,20 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
jkInvoke() invalid data\n);
/* we just can't recover, unset recover flag */
-(*jniEnv)-ReleaseByteArrayElements(jniEnv, data, nbuf, 0);
-ep-reply-buf=oldBuf;
+if( arrayAccessMethod == JK_GET_BYTE_ARRAY_ELEMENTS ) {
+(*jniEnv)-ReleaseByteArrayElements(jniEnv, data, ep-reply-buf, 0);
+ep-reply-buf=oldBuf;
+}
return JK_ERR;
}
if( bean-debug 0 )
env-l-jkLog(env, env-l, JK_LOG_INFO,
- jkInvoke() component dispatch %d %d %p\n, rc, code,
bean-invoke);
+ jkInvoke() component dispatch %d %d \n, rc, code );
if( bean-invoke != NULL
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
nacho 2002/06/10 14:53:07
Modified:jk/native2/common jk_logger_file.c
Log:
* Changed %p format specifiers to %#lx - Thanks to JFC
* Added level string to log lines.
Revision ChangesPath
1.28 +19 -4 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_logger_file.c 9 Jun 2002 03:00:42 - 1.27
+++ jk_logger_file.c 10 Jun 2002 21:53:07 - 1.28
@@ -2,7 +2,7 @@
* *
* The Apache Software License, Version 1.1 *
* *
- * Copyright (c) 1999-2001 The Apache Software Foundation. *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. *
* All rights reserved.*
* *
* = *
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.27 $ *
+ * Version: $Revision: 1.28 $ *
***/
@@ -149,7 +149,6 @@
return JK_LOG_DEBUG_LEVEL;
}
-
static int JK_METHOD jk2_logger_file_init(jk_env_t *env,jk_logger_t *_this )
{
FILE *oldF=(FILE *)_this-logger_private;
@@ -240,7 +239,23 @@
if(l-logger_private==NULL ||
l-level = level) {
char *f = (char *)(file + strlen(file) - 1);
+char *slevel;
+switch (level){
+case JK_LOG_INFO_LEVEL :
+slevel=JK_LOG_INFO_VERB;
+break;
+case JK_LOG_ERROR_LEVEL :
+slevel=JK_LOG_ERROR_VERB;
+break;
+case JK_LOG_EMERG_LEVEL :
+slevel=JK_LOG_EMERG_VERB;
+break;
+case JK_LOG_DEBUG_LEVEL :
+default:
+slevel=JK_LOG_DEBUG_VERB;
+break;
+}
while(f != file '\\' != *f '/' != *f) {
f--;
}
@@ -250,7 +265,7 @@
/* XXX or apr_ctime ? */
apr_rfc822_date( rfctime, time );
-fmt1=apr_psprintf( aprPool, [%s] [%s:%d] %s, rfctime, f, line, fmt );
+fmt1=apr_psprintf( aprPool, [%s] (%5s) [%s:%d] %s, rfctime, slevel, f,
line, fmt );
buf=apr_pvsprintf( aprPool, fmt1, args );
l-log(env, l, level, buf);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache13 mod_jk2.c
nacho 2002/06/10 14:55:08 Modified:jk/native2/common jk_channel.c jk_channel_apr_socket.c jk_channel_jni.c jk_channel_socket.c jk_channel_un.c jk_config.c jk_config_file.c jk_endpoint.c jk_env.c jk_handler_logon.c jk_handler_response.c jk_logger_win32.c jk_map.c jk_msg_ajp.c jk_mutex.c jk_mutex_proc.c jk_mutex_thread.c jk_nwmain.c jk_objCache.c jk_pool.c jk_pool_apr.c jk_registry.c jk_requtil.c jk_shm.c jk_uriEnv.c jk_uriMap.c jk_vm_default.c jk_worker_ajp13.c jk_worker_jni.c jk_worker_lb.c jk_worker_run.c jk_worker_status.c jk_workerEnv.c jk/native2/server/apache2 jk_service_apache2.c mod_jk2.c jk/native2/server/apache13 mod_jk2.c Log: * Changed %p format specifiers to %#lx - Thanks to JFC ( where applicable ) * Changed copyright to be 1999-2002 :) in all files.. Revision ChangesPath 1.4 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel.c Index: jk_channel.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_channel.c 30 May 2002 18:05:08 - 1.3 +++ jk_channel.c 10 Jun 2002 21:55:06 - 1.4 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2001 The Apache Software Foundation. * + * Copyright (c) 1999-2002 The Apache Software Foundation. * * All rights reserved.* * * * = * 1.22 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c Index: jk_channel_apr_socket.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jk_channel_apr_socket.c 30 May 2002 18:05:08 - 1.21 +++ jk_channel_apr_socket.c 10 Jun 2002 21:55:06 - 1.22 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2001 The Apache Software Foundation. * + * Copyright (c) 1999-2002 The Apache Software Foundation. * * All rights reserved.* * * * = * 1.26 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c Index: jk_channel_jni.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- jk_channel_jni.c 5 Jun 2002 19:26:45 - 1.25 +++ jk_channel_jni.c 10 Jun 2002 21:55:06 - 1.26 @@ -2,7 +2,7 @@ * * * The Apache Software License, Version 1.1 * * * - * Copyright (c) 1999-2001 The Apache Software Foundation. * + * Copyright (c) 1999-2002 The Apache Software Foundation. * * All rights reserved.* * * * = * @@ -227,7 +227,7 @@ epData-jniJavaContext=(*jniEnv)-NewGlobalRef( jniEnv, jobj ); env-l-jkLog(env, env-l, JK_LOG_INFO, - channel_jni.open() Got ep %p %p\n, jobj, epData-jniJavaContext ); + channel_jni.open() Got ep %#lx %#lx\n, jobj, epData-jniJavaContext ); /* XXX Destroy them in close */ @@ -336,7 +336,7 @@ (jk_ch_jni_ep_private_t
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
nacho 2002/06/10 15:13:15
Modified:jk/native2/common jk_logger_file.c
Log:
* Added level string to log lines when HAS_APR is not set.
Revision ChangesPath
1.29 +23 -5 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_logger_file.c 10 Jun 2002 21:53:07 - 1.28
+++ jk_logger_file.c 10 Jun 2002 22:13:15 - 1.29
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.28 $ *
+ * Version: $Revision: 1.29 $ *
***/
@@ -265,7 +265,7 @@
/* XXX or apr_ctime ? */
apr_rfc822_date( rfctime, time );
-fmt1=apr_psprintf( aprPool, [%s] (%5s) [%s:%d] %s, rfctime, slevel, f,
line, fmt );
+fmt1=apr_psprintf( aprPool, [%s] (%5s) [%s (%d)] %s, rfctime, slevel, f,
line, fmt );
buf=apr_pvsprintf( aprPool, fmt1, args );
l-log(env, l, level, buf);
@@ -300,9 +300,27 @@
#else
char buf[HUGE_BUFFER_SIZE];
#endif
+char *slevel;
char *f = (char *)(file + strlen(file) - 1);
int used = 0;
+switch (level){
+case JK_LOG_INFO_LEVEL :
+slevel=JK_LOG_INFO_VERB;
+break;
+case JK_LOG_ERROR_LEVEL :
+slevel=JK_LOG_ERROR_VERB;
+break;
+case JK_LOG_EMERG_LEVEL :
+slevel=JK_LOG_EMERG_VERB;
+break;
+case JK_LOG_DEBUG_LEVEL :
+default:
+slevel=JK_LOG_DEBUG_VERB;
+break;
+
+}
+
while(f != file '\\' != *f '/' != *f) {
f--;
}
@@ -314,7 +332,7 @@
jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level = JK_LOG_DEBUG_LEVEL )
-used += _snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
+used += _snprintf(buf[used], HUGE_BUFFER_SIZE, (%5s) [%s (%d)]: ,
slevel, f, line);
#elif defined(NETWARE) /* until we get a snprintf function */
buf = (char *) malloc(HUGE_BUFFER_SIZE);
if (NULL == buf)
@@ -323,12 +341,12 @@
jk2_logger_file_setTimeStr(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level = JK_LOG_DEBUG_LEVEL )
-used += sprintf(buf[used], [%s (%d)]: , f, line);
+used += sprintf(buf[used], (%5s) [%s (%d)]: , slevel, f, line);
#else
jk2_logger_file_setTimeStr(env, buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level = JK_LOG_DEBUG_LEVEL )
-used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
+used += snprintf(buf[used], HUGE_BUFFER_SIZE, (%5s) [%s (%d)]: ,
slevel, f, line);
#endif
if(used 0) {
return -1; /* [V] not sure what to return... */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_env.c
nacho 2002/06/09 11:52:07
Modified:jk/native2/common jk_env.c
Log:
* Deleting a apr_initialize call left at a wrong place when debugging for IIS..
Revision ChangesPath
1.34 +0 -2 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_env.c 31 May 2002 18:09:13 - 1.33
+++ jk_env.c 9 Jun 2002 18:52:06 - 1.34
@@ -83,8 +83,6 @@
if( jkGlobalAprPool==NULL ) {
int rc;
-/* Make sure apr is initialized */
-apr_initialize();
rc = apr_pool_create(( apr_pool_t **)jkGlobalAprPool, NULL);
if (rc != APR_SUCCESS || jkGlobalAprPool==NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
--
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
nacho 2002/06/08 17:10:02
Modified:jk/jkant/java/org/apache/jk/ant/compilers MsvcCompiler.java
MsvcLinker.java
jk/jkant/java/org/apache/jk/ant SoTask.java
Log:
* Support for resource linking on win32
XXX:Sorry for the tabs-spaces conversion in between :(
Revision ChangesPath
1.6 +3 -0
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MsvcCompiler.java 3 May 2002 05:24:17 - 1.5
+++ MsvcCompiler.java 9 Jun 2002 00:10:02 - 1.6
@@ -66,7 +66,10 @@
/**
* Compile using Microsoft Visual C++ v6.0
*
+ * @author Costin Manolache
* @author Ignacio J. Ortega
+ * @author Mike Anderson
+ * @author Larry Isaacs
*/
public class MsvcCompiler extends CompilerAdapter {
GlobPatternMapper co_mapperS=new GlobPatternMapper();
1.6 +14 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MsvcLinker.java 7 May 2002 19:45:08 - 1.5
+++ MsvcLinker.java 9 Jun 2002 00:10:02 - 1.6
@@ -67,7 +67,10 @@
/**
* Link using MSVC Linker
*
+ * @author Costin Manolache
* @author Ignacio J. Ortega
+ * @author Mike Anderson
+ * @author Larry Isaacs
*/
public class MsvcLinker extends LinkerAdapter {
SoTask so;
@@ -75,8 +78,8 @@
public MsvcLinker() {
so=this;
- co_mapper.setFrom(*.c);
- co_mapper.setTo(*.obj);
+co_mapper.setFrom(*.c);
+co_mapper.setTo(*.obj);
}
public void setSoTask(SoTask so ) {
@@ -159,6 +162,15 @@
if( targetNA!=null )
linkOptPw.println( targetNA[0] );
}
+// Write the resources to link to .opt file
+Enumeration ress = resources.elements();
+while( ress.hasMoreElements() ) {
+JkData res = (JkData) ress.nextElement();
+String name = res.getValue();
+if( name==null ) continue;
+linkOptPw.println(name);
+}
+
// Write the library name to the def file
linkDefPw.println(LIBRARY\t\+soFile+\);
1.23 +194 -181
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SoTask.java 12 Dec 2001 22:09:16 - 1.22
+++ SoTask.java 9 Jun 2002 00:10:02 - 1.23
@@ -99,6 +99,7 @@
*
* @author Costin Manolache
* @author Mike Anderson
+ * @author Ignacio J. Ortega
*/
public class SoTask extends Task {
protected String apxs;
@@ -124,6 +125,7 @@
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
+protected Vector resources = new Vector(); // used by the win32 linker
// Computed fields
//protected Vector compileList; // [Source]
@@ -136,82 +138,83 @@
// Hack to allow individual compilers/linkers to work
// as regular Tasks, independnetly.
public void duplicateTo(SoTask so) {
- // This will act as a proxy for the child task
- so.project=project;
- so.target=target;
- so.location=location;
- so.taskName=taskName;
- so.taskType=taskType;
-
- so.apxs=apxs;
- so.src=src;
- so.includes=includes;
- so.depends=depends;
- so.libs=libs;
- so.module=module;
- so.soFile=soFile;
- so.soExt=soExt;
- so.cflags=cflags;
- so.buildDir=buildDir;
- so.debug=debug;
- so.optG=optG;
+// This will act as a proxy for the child task
+so.project=project;
+so.target=target;
+so.location=location;
+so.taskName=taskName;
+so.taskType=taskType;
+
+so.apxs=apxs;
+so.src=src;
+so.includes
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
nacho 2002/06/08 17:13:35
Modified:jk/native2 build.xml
Log:
* Added resource elements
* Ant 1.4 compatible uptodate
* More file tyopes to clean
* Changed uptodate check of mc files from *.h to *.res
Revision ChangesPath
1.36 +21 -5 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 31 May 2002 19:19:44 - 1.35
+++ build.xml 9 Jun 2002 00:13:35 - 1.36
@@ -126,14 +126,21 @@
property name=build.compiler.ld location=${mssdk.home}/bin/link /
echo message=MSDEV compiler: ${mssdk.home} /
uptodate property=mc.uptodate
- targetfile=common/jk_logger_win32_message.h
- srcfile=common/jk_logger_win32_message.mc/
+ targetfile=${build.dir}/jk_logger_win32_message.res
+ srcfiles dir=common includes=*.mc/
+/uptodate
/target
target name=init.win32.mc unless=mc.uptodate if=win32
exec executable=${mssdk.home}/bin/mc dir=common
arg value=jk_logger_win32_message.mc /
/exec
+exec executable=${mssdk.home}/bin/rc dir=common
+ arg value=-r /
+ arg value=-fo/
+ arg value=${build.dir}/jk_logger_win32_message.res/
+ arg value=jk_logger_win32_message.rc /
+/exec
/target
target name=init.win32 depends=init.win32.properties,init.win32.mc
if=win32 /
@@ -304,6 +311,7 @@
fileset dir=${native.dir}/common includes=*.h /
fileset dir=${native.dir}/include includes=*.h /
/depends
+ resource fileName=../jk_logger_win32_message.res if=win32 /
import fileName=libhttpd.lib if=win32 /
import fileName=libapr.lib if=win32 /
import fileName=libaprutil.lib if=win32 /
@@ -358,7 +366,8 @@
fileset dir=${native.dir}/common includes=*.h /
fileset dir=${native.dir}/include includes=*.h /
/depends
-
+ resource fileName=../jk_logger_win32_message.res if=win32/
+
!-- Platform-specific tags --
linkOpt value=-lcrypt if=linux /
linkOpt value=-L${apr.lib} if=linux /
@@ -458,6 +467,8 @@
fileset dir=${native.dir}/common includes=*.h /
/depends
+ resource fileName=jk_logger_win32_message.res if=win32/
+
def name=EAPI info=Building with EAPI support /
def name=_REENTRANT /
def name=CHUNK_SIZE value=4096 /
@@ -536,7 +547,8 @@
depends
fileset dir=${native.dir}/common includes=*.h /
/depends
-
+ resource fileName=../jk_logger_win32_message.res/
+
!-- Platform-specific tags --
def name=WIN32 /
def name=_WINDOWS /
@@ -548,7 +560,6 @@
def name=HAS_APR /
def name=HAVE_JNI
info=Jni worker /
- def name=MOD_JK2_EXPORTS if=win32 /
import fileName=advapi32.lib /
import fileName=wsock32.lib /
@@ -580,8 +591,13 @@
include name=**/*.map/
include name=**/*.sym/
include name=**/*.NCV/
+ include name=**/*.exp/
+ include name=**/*.pdb/
+ include name=**/*.opt/
+ include name=**/*.def/
include name=**/*.obj/
include name=**/*.dll/
+ include name=**/*.res/
/fileset
/delete
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
nacho 2002/06/08 17:47:24
Modified:jk/native2/common jk_logger_file.c
Log:
* Fixing the build in win32
* Cosmetic changes
Revision ChangesPath
1.25 +19 -14jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_logger_file.c 7 Jun 2002 23:45:30 - 1.24
+++ jk_logger_file.c 9 Jun 2002 00:47:24 - 1.25
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.24 $ *
+ * Version: $Revision: 1.25 $ *
***/
#include jk_env.h
@@ -68,6 +68,7 @@
#include stdio.h
#include jk_registry.h
+#include apr_strings.h
#define LOG_FORMAT (log_format)
@@ -90,11 +91,15 @@
static void jk2_logger_file_setTimeStr(jk_env_t *env,char * str, int len)
{
time_t t = time(NULL);
- struct tm *tms;
+struct tm*tms;
- tms = gmtime(t);
-if( tms==NULL ) return;
- strftime(str, len, jk2_logger_file_logFmt, tms);
+tms = gmtime(t);
+
+if( tms==NULL ) {
+return;
+}
+
+strftime(str, len, jk2_logger_file_logFmt, tms);
}
static int JK_METHOD jk2_logger_file_log(jk_env_t *env,jk_logger_t *l,
@@ -243,7 +248,7 @@
/* XXX or apr_ctime ? */
apr_rfc822_date( rfctime, time );
-fmt1=apr_pvsprintf( aprPool, [%s] [%s:%d] %s, rfctime, file, line, fmt );
+fmt1=apr_psprintf( aprPool, [%s] [%s:%d] %s, rfctime, file, line, fmt );
buf=apr_pvsprintf( aprPool, fmt, args );
l-log(env, l, level, buf);
@@ -289,8 +294,8 @@
}
#ifdef WIN32
- jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+ jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
+ used = strlen(buf);
if( level = JK_LOG_DEBUG_LEVEL )
used += _snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
#elif defined(NETWARE) /* until we get a snprintf function */
@@ -298,18 +303,18 @@
if (NULL == buf)
return -1;
- jk2_logger_file_setTimeStr(buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+ jk2_logger_file_setTimeStr(buf, HUGE_BUFFER_SIZE);
+ used = strlen(buf);
if( level = JK_LOG_DEBUG_LEVEL )
used += sprintf(buf[used], [%s (%d)]: , f, line);
#else
- jk2_logger_file_setTimeStr(env, buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+ jk2_logger_file_setTimeStr(env, buf, HUGE_BUFFER_SIZE);
+ used = strlen(buf);
if( level = JK_LOG_DEBUG_LEVEL )
used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
#endif
if(used 0) {
-return 0; /* [V] not sure what to return... */
+return -1; /* [V] not sure what to return... */
}
#ifdef WIN32
@@ -320,7 +325,7 @@
rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
#endif
-l-log(env, l, level, buf);
+l-log(env, l , level, buf);
#ifdef NETWARE
free(buf);
#endif
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c jk_worker_ajp13.c jk_workerEnv.c
nacho 2002/06/08 17:50:49
Modified:jk/native2/include jk_requtil.h
jk/native2/common jk_shm.c jk_worker_ajp13.c jk_workerEnv.c
Log:
* No warnings
Revision ChangesPath
1.7 +10 -0 jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h
Index: jk_requtil.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_requtil.h 19 Apr 2002 02:36:23 - 1.6
+++ jk_requtil.h 9 Jun 2002 00:50:48 - 1.7
@@ -189,6 +189,16 @@
int jk_requtil_base64EncodeCert(char *encoded,
const unsigned char *string, int len);
+int jk2_serialize_postHead(jk_env_t *env, jk_msg_t *msg,
+ jk_ws_service_t *r,
+ jk_endpoint_t *ae);
+
+int jk2_serialize_request13(jk_env_t *env, jk_msg_t *msg,
+jk_ws_service_t *s,
+jk_endpoint_t *ae);
+
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
1.24 +0 -1 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_shm.c 31 May 2002 19:19:45 - 1.23
+++ jk_shm.c 9 Jun 2002 00:50:49 - 1.24
@@ -536,7 +536,6 @@
jk_msg_t *msg, int raw)
{
jk_shm_t *shm=(jk_shm_t *)bean-object;
-int rc;
if( shm-mbean-debug 0 )
env-l-jkLog(env, env-l, JK_LOG_INFO,
1.29 +1 -2 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_worker_ajp13.c 31 May 2002 22:51:28 - 1.28
+++ jk_worker_ajp13.c 9 Jun 2002 00:50:49 - 1.29
@@ -72,6 +72,7 @@
#include jk_service.h
#include jk_env.h
#include jk_objCache.h
+#include jk_reqUtil.h
#include jk_registry.h
#define AJP_DEF_RETRY_ATTEMPTS(2)
@@ -560,7 +561,6 @@
{
jk_endpoint_t *e = NULL;
jk_bean_t *jkb;
-int csOk;
if( ajp13-secret ==NULL ) {
}
@@ -789,7 +789,6 @@
{
jk_worker_t *w=(jk_worker_t *)pool-calloc(env, pool, sizeof(jk_worker_t));
jk_bean_t *jkb;
-int i;
if (name == NULL || w == NULL) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
1.52 +1 -3 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- jk_workerEnv.c31 May 2002 19:19:45 - 1.51
+++ jk_workerEnv.c9 Jun 2002 00:50:49 - 1.52
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.51 $ *
+ * Version: $Revision: 1.52 $ *
***/
#include jk_env.h
@@ -591,7 +591,6 @@
{
int err=JK_OK;
jk_worker_t *oldW = NULL;
-int csOk;
w-workerEnv=wEnv;
@@ -653,7 +652,6 @@
{
jk_workerEnv_t *wEnv;
jk_bean_t *jkb;
-int csOk;
wEnv=(jk_workerEnv_t *)pool-calloc( env, pool, sizeof( jk_workerEnv_t ));
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.dsp mod_jk.dsp
nacho 2002/06/08 17:58:46 Added: jk/native2/server/apache2 mod_jk2.dsp Removed: jk/native2/server/apache2 mod_jk.dsp Log: * Fixed the build to use mc files * Changed dsp file name to match the output Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp Index: mod_jk2.dsp === # Microsoft Developer Studio Project File - Name=mod_jk2 - Package Owner=4 # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 CFG=mod_jk2 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f mod_jk2.mak. !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f mod_jk2.mak CFG=mod_jk2 - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE mod_jk2 - Win32 Release (based on Win32 (x86) Dynamic-Link Library) !MESSAGE mod_jk2 - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName # PROP Scc_LocalPath CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF $(CFG) == mod_jk2 - Win32 Release # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir Release # PROP BASE Intermediate_Dir Release # PROP BASE Target_Dir # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir Release # PROP Intermediate_Dir Release # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d NDEBUG # ADD RSC /l 0x409 /d NDEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /libpath:$(APACHE2_HOME)\lib !ELSEIF $(CFG) == mod_jk2 - Win32 Debug # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir Debug # PROP BASE Intermediate_Dir Debug # PROP BASE Target_Dir # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir Debug # PROP Intermediate_Dir Debug # 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 MOD_JK2_EXPORTS /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c # SUBTRACT CPP /X # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d _DEBUG # ADD RSC /l 0xc0a /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept # ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:$(APACHE2_HOME)\lib !ENDIF # Begin Target # Name mod_jk2 - Win32 Release # Name mod_jk2 - Win32 Debug # Begin Group Source Files # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat # Begin Source File SOURCE=.\jk_apache2.h # End Source File # Begin Source File SOURCE=..\..\common\jk_channel.c # End Source File # Begin Source File SOURCE=..\..\common\jk_channel_apr_socket.c # End Source File # Begin Source File SOURCE=..\..\common\jk_channel_jni.c # 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 SOURCE=..\..\common\jk_config.c
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp
nacho 2002/06/08 18:52:34 Modified:jk/native2/server/isapi isapi.dsp Log: * Fixed the release build Revision ChangesPath 1.15 +10 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- isapi.dsp 5 Jun 2002 21:41:59 - 1.14 +++ isapi.dsp 9 Jun 2002 01:52:34 - 1.15 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d NDEBUG @@ -360,6 +360,15 @@ SOURCE=..\..\common\jk_logger_win32_message.mc !IF $(CFG) == isapi - Win32 Release + +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\tomcat\jakarta-tomcat-connectors\jk\native2\common +InputPath=..\..\common\jk_logger_win32_message.mc + +..\..\common\jk_logger_win32_message.rc : $(SOURCE) $(INTDIR) $(OUTDIR) + mc -h $(InputDir) -r $(InputDir) $(InputPath) + +# End Custom Build !ELSEIF $(CFG) == isapi - Win32 Debug -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.dsp
nacho 2002/06/08 18:53:50 Modified:jk/native2/server/apache2 mod_jk2.dsp Log: * Fixed the release build * Added Message reources Revision ChangesPath 1.2 +46 -9 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_jk2.dsp 9 Jun 2002 00:58:46 - 1.1 +++ mod_jk2.dsp 9 Jun 2002 01:53:50 - 1.2 @@ -74,7 +74,7 @@ # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d _DEBUG -# ADD RSC /l 0xc0a /d _DEBUG +# ADD RSC /l 0x409 /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -121,6 +121,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_config_file.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_endpoint.c # End Source File # Begin Source File @@ -169,6 +173,14 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_mutex_proc.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_mutex_thread.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_nwmain.c # End Source File # Begin Source File @@ -189,10 +201,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_registry.h -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_requtil.c # End Source File # Begin Source File @@ -243,10 +251,6 @@ SOURCE=.\mod_jk2.c # End Source File -# Begin Source File - -SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h -# End Source File # End Group # Begin Group Header Files @@ -305,6 +309,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_registry.h +# End Source File +# Begin Source File + SOURCE=..\..\include\jk_requtil.h # End Source File # Begin Source File @@ -335,6 +343,10 @@ SOURCE=..\..\include\jk_workerEnv.h # End Source File +# Begin Source File + +SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h +# End Source File # End Group # Begin Group Resource Files @@ -342,6 +354,31 @@ # Begin Source File SOURCE=..\..\common\jk_logger_win32_message.mc + +!IF $(CFG) == mod_jk2 - Win32 Release + +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\tomcat\jakarta-tomcat-connectors\jk\native2\common +InputPath=..\..\common\jk_logger_win32_message.mc + +..\..\common\jk_logger_win32_message.rc : $(SOURCE) $(INTDIR) $(OUTDIR) + mc -h $(InputDir) -r $(InputDir) $(InputPath) + +# End Custom Build + +!ELSEIF $(CFG) == mod_jk2 - Win32 Debug + +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\tomcat\jakarta-tomcat-connectors\jk\native2\common +InputPath=..\..\common\jk_logger_win32_message.mc + +..\..\common\jk_logger_win32_message.rc : $(SOURCE) $(INTDIR) $(OUTDIR) + mc -h $(InputDir) -r $(InputDir) $(InputPath) + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
nacho 2002/06/08 18:54:08 Modified:jk/native2/jni jkjni.dsp Log: * Fixed the release build * Added Message reources Revision ChangesPath 1.2 +94 -34jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jkjni.dsp 5 Jun 2002 22:27:34 - 1.1 +++ jkjni.dsp 9 Jun 2002 01:54:07 - 1.2 @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name=isapi - Package Owner=4 +# Microsoft Developer Studio Project File - Name=Jni - Package Owner=4 # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 -CFG=isapi - Win32 Debug +CFG=Jni - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f jkjni.mak. +!MESSAGE NMAKE /f JKJni.mak. !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f jkjni.mak CFG=isapi - Win32 Debug +!MESSAGE NMAKE /f JKJni.mak CFG=Jni - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE isapi - Win32 Release (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE isapi - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) +!MESSAGE Jni - Win32 Release (based on Win32 (x86) Dynamic-Link Library) +!MESSAGE Jni - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) !MESSAGE # Begin Project @@ -29,7 +29,7 @@ MTL=midl.exe RSC=rc.exe -!IF $(CFG) == isapi - Win32 Release +!IF $(CFG) == Jni - Win32 Release # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -42,25 +42,25 @@ # PROP Intermediate_Dir Release # PROP Ignore_Export_Lib 0 # PROP Target_Dir -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APR_HOME)\apr\include /I $(APR_HOME)\apr-util\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /D HAVE_JNI /D HAS_APR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d NDEBUG -# ADD RSC /l 0x409 /d NDEBUG +# ADD RSC /l 0xc0a /d NDEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll +# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /libpath:$(APACHE2_HOME)\lib -!ELSEIF $(CFG) == isapi - Win32 Debug +!ELSEIF $(CFG) == Jni - Win32 Debug # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir Debug -# PROP BASE Intermediate_Dir Debug +# PROP BASE Output_Dir Jni___Win32_Debug +# PROP BASE Intermediate_Dir Jni___Win32_Debug # PROP BASE Target_Dir # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 @@ -68,8 +68,8 @@ # PROP Intermediate_Dir Debug # 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 ISAPI_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APR_HOME)\apr\include /I $(APR_HOME)\apr-util\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
nacho 2002/06/08 18:55:28
Modified:jk/native2/common jk_shm.c
Log:
* No warnings
Revision ChangesPath
1.25 +0 -2 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_shm.c 9 Jun 2002 00:50:49 - 1.24
+++ jk_shm.c 9 Jun 2002 01:55:28 - 1.25
@@ -315,8 +315,6 @@
static int jk2_shm_create(jk_env_t *env, jk_shm_t *shm)
{
-int rc;
-
return JK_ERR;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2002/06/08 18:55:54
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* Fixing the build in win32
* Cosmetic changes
Revision ChangesPath
1.27 +7 -7
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_isapi_plugin.c 7 Jun 2002 23:45:30 - 1.26
+++ jk_isapi_plugin.c 9 Jun 2002 01:55:54 - 1.27
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.26 $ *
+ * Version: $Revision: 1.27 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -100,7 +100,7 @@
static int iis5 = -1;
static jk_workerEnv_t *workerEnv;
-
+static apr_pool_t *jk_globalPool;
static char extension_uri[INTERNET_MAX_URL_LENGTH] =
/jakarta/isapi_redirector2.dll;
static char worker_file[MAX_PATH * 2] = ;
@@ -570,7 +570,10 @@
static int init_jk(char *serverName)
{
int rc = JK_TRUE;
-
+/* XXX this need review, works well because the initializations are done at the
first request
+ but in case inits should be splited another time using directly globalEnv
here could lead
+ to subtle problems..
+*/
jk_env_t *env = workerEnv-globalEnv;
workerEnv-initData-add( env, workerEnv-initData, serverRoot,
workerEnv-pool-pstrdup( env, workerEnv-pool,
server_root));
@@ -698,8 +701,6 @@
return JK_TRUE;
}
-apr_pool_t *jk_globalPool;
-
/** Basic initialization for jk2.
*/
@@ -728,13 +729,12 @@
l = jkb-object;
env-l=l;
-env-soName=env-globalPool-calloc(env, env-globalPool, strlen(file_name)+1);
+env-soName=env-globalPool-pstrdup(env, env-globalPool, file_name );
if( env-soName == NULL ){
env-l-jkLog(env, env-l, JK_LOG_ERROR, Error creating env-soName\n);
return env;
}
-strcpy(env-soName,file_name);
env-l-init(env,env-l);
/* We should make it relative to JK_HOME or absolute path.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
nacho 2002/06/08 18:56:14
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
* Fixing the build in win32
* Cosmetic changes
Revision ChangesPath
1.35 +2 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_jk2.c 7 Jun 2002 23:45:30 - 1.34
+++ mod_jk2.c 9 Jun 2002 01:56:14 - 1.35
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.34 $ *
+ * Version: $Revision: 1.35 $ *
***/
/*
@@ -286,13 +286,12 @@
env-l=l;
#ifdef WIN32
-env-soName=env-globalPool-calloc(env, env-globalPool, strlen(file_name)+1);
+env-soName=env-globalPool-pstrdup(env, env-globalPool, file_name);
if( env-soName == NULL ){
env-l-jkLog(env, env-l, JK_LOG_ERROR, Error creating env-soName\n);
return;
}
-strcpy(env-soName,file_name);
#else
env-soName=NULL;
#endif
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
nacho 2002/06/08 18:56:41 Modified:jk/native2/common jk_logger_file.c Log: * No warnings Revision ChangesPath 1.26 +4 -2 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c Index: jk_logger_file.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- jk_logger_file.c 9 Jun 2002 00:47:24 - 1.25 +++ jk_logger_file.c 9 Jun 2002 01:56:41 - 1.26 @@ -59,16 +59,18 @@ * Description: Utility functions (mainly configuration) * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.25 $ * + * Version: $Revision: 1.26 $ * ***/ + +#include apr_strings.h + #include jk_env.h #include jk_map.h #include jk_logger.h #include stdio.h #include jk_registry.h -#include apr_strings.h #define LOG_FORMAT (log_format) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2002/06/08 19:42:53 Modified:jk/native2/server/isapi jk_isapi_plugin.c Log: * BUG: Nee to initialize apr before first use Revision ChangesPath 1.28 +4 -3 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c Index: jk_isapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- jk_isapi_plugin.c 9 Jun 2002 01:55:54 - 1.27 +++ jk_isapi_plugin.c 9 Jun 2002 02:42:53 - 1.28 @@ -60,7 +60,7 @@ * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Larry Isaacs [EMAIL PROTECTED] * * Author: Ignacio J. Ortega [EMAIL PROTECTED] * - * Version: $Revision: 1.27 $ * + * Version: $Revision: 1.28 $ * ***/ // This define is needed to include wincrypt,h, needed to get client certificates @@ -78,7 +78,7 @@ #include jk_env.h #include jk_service.h #include jk_worker.h - +#include apr_general.h #include jk_iis.h //#include jk_uri_worker_map.h @@ -710,7 +710,8 @@ jk_pool_t *globalPool; jk_bean_t *jkb; jk_env_t *env; - + +apr_initialize(); apr_pool_create( jk_globalPool, NULL ); jk2_pool_apr_create( NULL, globalPool, NULL, jk_globalPool ); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_file.c
nacho 2002/06/08 20:00:42 Modified:jk/native2/common jk_logger_file.c Log: * Not outputting dates in the file logger, 2 nasty typos in 2 lines.. good average!!! :) Revision ChangesPath 1.27 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c Index: jk_logger_file.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- jk_logger_file.c 9 Jun 2002 01:56:41 - 1.26 +++ jk_logger_file.c 9 Jun 2002 03:00:42 - 1.27 @@ -59,7 +59,7 @@ * Description: Utility functions (mainly configuration) * * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Henri Gomez [EMAIL PROTECTED] * - * Version: $Revision: 1.26 $ * + * Version: $Revision: 1.27 $ * ***/ @@ -250,8 +250,8 @@ /* XXX or apr_ctime ? */ apr_rfc822_date( rfctime, time ); -fmt1=apr_psprintf( aprPool, [%s] [%s:%d] %s, rfctime, file, line, fmt ); -buf=apr_pvsprintf( aprPool, fmt, args ); +fmt1=apr_psprintf( aprPool, [%s] [%s:%d] %s, rfctime, f, line, fmt ); +buf=apr_pvsprintf( aprPool, fmt1, args ); l-log(env, l, level, buf); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2002/06/08 20:10:43 Modified:jk/native2/server/isapi jk_isapi_plugin.c Log: * Deleted unused defines Revision ChangesPath 1.29 +1 -6 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c Index: jk_isapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- jk_isapi_plugin.c 9 Jun 2002 02:42:53 - 1.28 +++ jk_isapi_plugin.c 9 Jun 2002 03:10:43 - 1.29 @@ -60,7 +60,7 @@ * Author: Gal Shachor [EMAIL PROTECTED] * * Author: Larry Isaacs [EMAIL PROTECTED] * * Author: Ignacio J. Ortega [EMAIL PROTECTED] * - * Version: $Revision: 1.28 $ * + * Version: $Revision: 1.29 $ * ***/ // This define is needed to include wincrypt,h, needed to get client certificates @@ -83,13 +83,8 @@ //#include jk_uri_worker_map.h #define SERVER_ROOT_TAG (serverRoot) -#define URI_SELECT_TAG (uriSelect) #define EXTENSION_URI_TAG (extensionUri) #define WORKERS_FILE_TAG(workersFile) - -#define URI_SELECT_PARSED_VERB (parsed) -#define URI_SELECT_UNPARSED_VERB(unparsed) -#define URI_SELECT_ESCAPED_VERB (escaped) static char file_name[_MAX_PATH]; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 2002/06/05 14:40:09
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* Changed levels for some log messages
Revision ChangesPath
1.25 +6 -6
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_isapi_plugin.c 31 May 2002 22:51:28 - 1.24
+++ jk_isapi_plugin.c 5 Jun 2002 21:40:09 - 1.25
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.24 $ *
+ * Version: $Revision: 1.25 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -475,7 +475,7 @@
worker_name);
if( worker==NULL ){
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
HttpExtensionProc worker is NULL\n);
return rc;
}
@@ -484,7 +484,7 @@
rPool= worker-rPoolCache-get( env, worker-rPoolCache );
if( rPool == NULL ) {
rPool=worker-mbean-pool-create( env, worker-mbean-pool,
HUGE_POOL_SIZE );
-env-l-jkLog(env, env-l, JK_LOG_INFO,
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
HttpExtensionProc: new rpool\n);
}
@@ -580,7 +580,7 @@
rc=(JK_OK != workerEnv-config-setPropertyString( env, workerEnv-config,
config.file, worker_file ));
}
workerEnv-init(env,workerEnv);
-env-l-jkLog(env, env-l, JK_LOG_ERROR, Set serverRoot %s\n, server_root);
+env-l-jkLog(env, env-l, JK_LOG_INFO, Set serverRoot %s\n, server_root);
if (using_ini_file) {
env-l-jkLog(env, env-l, JK_LOG_DEBUG, Using ini file %s.\n,
ini_file_name);
} else {
@@ -763,10 +763,10 @@
jk_env_t *env;
if( workerEnv==NULL ) {
env = jk2_create_workerEnv();
-env-l-jkLog(env, env-l, JK_LOG_ERROR, JK2 Config Created);
+env-l-jkLog(env, env-l, JK_LOG_INFO, JK2 Config Created);
} else {
env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
-env-l-jkLog(env, env-l, JK_LOG_ERROR, JK2 Config Reused);
+env-l-jkLog(env, env-l, JK_LOG_INFO, JK2 Config Reused);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 2002/06/05 14:41:28
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* No warnings
Revision ChangesPath
1.17 +3 -3
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_service_iis.c 18 May 2002 22:40:47 - 1.16
+++ jk_service_iis.c 5 Jun 2002 21:41:28 - 1.17
@@ -82,7 +82,7 @@
static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
static char crlf[3] = { (char)13, (char)10, '\0' };
-char *reason;
+const char *reason;
LPEXTENSION_CONTROL_BLOCK lpEcb=(LPEXTENSION_CONTROL_BLOCK)s-ws_private;
DWORD len_of_status;
char *status_str;
@@ -519,8 +519,8 @@
char *buff = s-pool-calloc(env,s-pool, 2048);
if (buff != NULL) {
-int rd;
-/* Is there a IIS equivalent ? */
+/* int rd; */
+/* FIXME Is there a IIS equivalent ? */
/* while ((rd = ap_get_client_block(r, buff, 2048)) 0) {
*/
/* s-content_read += rd; */
/* } */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp
nacho 2002/06/05 14:41:59 Modified:jk/native2/server/isapi isapi.dsp Log: * Fixed the build Revision ChangesPath 1.14 +28 -0 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- isapi.dsp 30 May 2002 19:24:04 - 1.13 +++ isapi.dsp 5 Jun 2002 21:41:59 - 1.14 @@ -97,6 +97,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_channel.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_channel_apr_socket.c # End Source File # Begin Source File @@ -117,6 +121,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_config_file.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_endpoint.c # End Source File # Begin Source File @@ -149,6 +157,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_logger_win32_message.h +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_map.c # End Source File # Begin Source File @@ -158,6 +170,22 @@ # Begin Source File SOURCE=..\..\common\jk_msg_ajp.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_mutex.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_mutex_proc.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_mutex_thread.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_nwmain.c # End Source File # Begin Source File -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_logger.h jk_service.h
nacho 2002/06/05 14:56:39
Modified:jk/native2/common jk_config_file.c jk_mutex_proc.c
jk_mutex_thread.c jk_objCache.c
jk/native2/include jk_logger.h jk_service.h
Log:
* Fixed some warnings
Revision ChangesPath
1.2 +0 -3 jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Index: jk_config_file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_config_file.c 31 May 2002 18:05:29 - 1.1
+++ jk_config_file.c 5 Jun 2002 21:56:39 - 1.2
@@ -245,7 +245,6 @@
int *didReload, int firstTime)
{
int rc;
-int csOk;
struct stat statbuf;
if( didReload!=NULL )
@@ -370,8 +369,6 @@
const char *type, const char *name)
{
jk_config_t *_this;
-jk_bean_t *jkb;
-int i;
_this=(jk_config_t *)pool-alloc(env, pool, sizeof(jk_config_t));
if( _this == NULL )
1.2 +0 -1 jakarta-tomcat-connectors/jk/native2/common/jk_mutex_proc.c
Index: jk_mutex_proc.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_mutex_proc.c 31 May 2002 17:52:05 - 1.1
+++ jk_mutex_proc.c 5 Jun 2002 21:56:39 - 1.2
@@ -157,7 +157,6 @@
const char *type, const char *name)
{
jk_mutex_t *mutex;
-jk_workerEnv_t *wEnv;
mutex=(jk_mutex_t *)pool-calloc(env, pool, sizeof(jk_mutex_t));
1.3 +0 -1 jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c
Index: jk_mutex_thread.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_mutex_thread.c 31 May 2002 22:51:28 - 1.2
+++ jk_mutex_thread.c 5 Jun 2002 21:56:39 - 1.3
@@ -235,7 +235,6 @@
const char *type, const char *name)
{
jk_mutex_t *mutex;
-jk_workerEnv_t *wEnv;
mutex=(jk_mutex_t *)pool-calloc(env, pool, sizeof(jk_mutex_t));
1.8 +0 -3 jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c
Index: jk_objCache.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_objCache.c 31 May 2002 18:09:13 - 1.7
+++ jk_objCache.c 5 Jun 2002 21:56:39 - 1.8
@@ -102,7 +102,6 @@
static int
jk2_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
-int i;
jk_bean_t *jkb;
if( cacheSize = 0 ) {
@@ -131,7 +130,6 @@
static int
jk2_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
-int i;
if( _this-cs != NULL )
_this-cs-mbean-destroy( env, _this-cs-mbean );
@@ -146,7 +144,6 @@
static void *
jk2_objCache_get(jk_env_t *env, jk_objCache_t *_this )
{
-int rc;
void *ae=NULL;
if( _this-cs != NULL )
1.8 +3 -1 jakarta-tomcat-connectors/jk/native2/include/jk_logger.h
Index: jk_logger.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_logger.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_logger.h 12 Apr 2002 21:49:03 - 1.7
+++ jk_logger.h 5 Jun 2002 21:56:39 - 1.8
@@ -58,7 +58,7 @@
/***
* Description: Logger object definitions *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***/
#ifndef JK_LOGGER_H
@@ -128,6 +128,8 @@
#define JK_LOG_INFO __FILE__,__LINE__,JK_LOG_INFO_LEVEL
#define JK_LOG_ERROR __FILE__,__LINE__,JK_LOG_ERROR_LEVEL
#define JK_LOG_EMERG __FILE__,__LINE__,JK_LOG_EMERG_LEVEL
+
+int jk2_logger_file_parseLogLevel(struct jk_env *env, const char *level);
#ifdef __cplusplus
}
1.15 +2 -2 jakarta-tomcat-connectors/jk
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_win32.c
nacho 2002/05/31 10:06:02
Modified:jk/native2/common jk_logger_win32.c
Log:
* Oops typo!
Revision ChangesPath
1.4 +3 -7 jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Index: jk_logger_win32.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_logger_win32.c 29 May 2002 18:25:10 - 1.3
+++ jk_logger_win32.c 31 May 2002 17:06:02 - 1.4
@@ -137,7 +137,6 @@
const char *fmt,
va_list args)
{
-/* XXX map jk level to apache level */
int rc;
if(l-level = level) {
char buf[HUGE_BUFFER_SIZE];
@@ -159,12 +158,9 @@
}
-rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args);
-rc = strlen( buf );
-/* Remove trailing \n. XXX need to change the log() to not include \n */
-if( buf[rc-1] == '\n' )
-buf[rc-1]='\0';
-jk2_logger_win32_log(env, l, level, buf);
+rc = _vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
+
+l-log(env, l, level, buf);
}
return rc ;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
nacho 02/05/29 07:30:07
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
* fixing the build for win32..
Thanks to Mladen Turk
Revision ChangesPath
1.27 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_jk2.c 29 May 2002 00:13:00 - 1.26
+++ mod_jk2.c 29 May 2002 14:30:07 - 1.27
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.26 $ *
+ * Version: $Revision: 1.27 $ *
***/
/*
@@ -293,7 +293,7 @@
if( env-soName == NULL ){
env-l-jkLog(env, env-l, JK_LOG_ERROR, Error creating env-soName\n);
-return env;
+return;
}
strcpy(env-soName,file_name);
#else
@@ -729,7 +729,7 @@
ULONG ulReason, // Reason why NT called this DLL
LPVOID lpReserved) // Reserved parameter for future use
{
-GetModuleFileName( hInst, file_name, sizeof(file_name)));
+GetModuleFileName( hInst, file_name, sizeof(file_name));
return TRUE;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_logger_win32.c jk_logger_win32_message.mc
nacho 02/05/29 10:13:39 Removed: jk/native2/server/isapi jk_logger_win32.c jk_logger_win32_message.mc Log: * Moved to jk2/common -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_win32.c jk_logger_win32_message.mc
nacho 02/05/29 10:18:47 Added: jk/native2/common jk_logger_win32.c jk_logger_win32_message.mc Log: * Moved from native2/server/isapi Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c Index: jk_logger_win32.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ /** * Description: Logger implementation using win32's native logger
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_win32.c jk_logger_win32_message.mc
nacho 02/05/29 10:46:37
Modified:jk/native2/common jk_logger_win32.c
jk_logger_win32_message.mc
Log:
* Better mapping from jk2 levels to win32 ones..
XXX Actually the logger maps 4 levels as follows (win32 - jk2):
SUCESS - DEBUG
INFORMATIONAL - INFO
WARNING - ERROR
ERROR - EMERG
Comments?
Revision ChangesPath
1.2 +11 -7 jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Index: jk_logger_win32.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_logger_win32.c 29 May 2002 17:18:47 - 1.1
+++ jk_logger_win32.c 29 May 2002 17:46:37 - 1.2
@@ -68,14 +68,14 @@
#include jk_logger.h
#include stdio.h
-#include jk_logger_win32_message.h
-
#define HUGE_BUFFER_SIZE (8*1024)
#define JAKARTA_EVENT_SOURCE Apache Jakarta Connector2
#ifdef WIN32
+#include jk_logger_win32_message.h
+
static int JK_METHOD jk2_logger_win32_log(jk_env_t *env, jk_logger_t *l,
int level,
const char *what)
@@ -140,11 +140,13 @@
buf2=buf;
Buffer=buf2;
if( level == JK_LOG_DEBUG_LEVEL ) {
-ReportEvent(h,EVENTLOG_INFORMATION_TYPE,0,MSG_DEBUG,NULL,1,0,Buffer,NULL);
+ReportEvent(h,EVENTLOG_SUCCESS,0,MSG_DEBUG,NULL,1,0,Buffer,NULL);
} else if( level == JK_LOG_INFO_LEVEL ) {
-ReportEvent(h,EVENTLOG_WARNING_TYPE,0,MSG_INFO,NULL,1,0,Buffer,NULL);
-} else {
-ReportEvent(h,EVENTLOG_INFORMATION_TYPE,0,MSG_ERROR,NULL,1,0,Buffer,NULL);
+ReportEvent(h,EVENTLOG_INFORMATION_TYPE,0,MSG_INFO,NULL,1,0,Buffer,NULL);
+} else if( level == JK_LOG_ERROR_LEVEL ){
+ReportEvent(h,EVENTLOG_WARNING_TYPE,0,MSG_ERROR,NULL,1,0,Buffer,NULL);
+} else if( level == JK_LOG_EMERG_LEVEL ){
+ReportEvent(h,EVENTLOG_ERROR_TYPE,0,MSG_EMERG,NULL,1,0,Buffer,NULL);
}
DeregisterEventSource(h);
return rc ;
@@ -218,7 +220,9 @@
const char *type, const char *name)
{
env-l-jkLog( env, env-l, JK_LOG_ERROR,
- win32logger.factory(): Support for win32 logger is disabled, );
+ win32logger.factory(): Support for win32 logger is disabled.);
+env-l-jkLog( env, env-l, JK_LOG_ERROR,
+ win32logger.factory(): Needs WINNT 4.0 );
result-disabled=1;
return JK_FALSE;
}
1.2 +13 -6
jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32_message.mc
Index: jk_logger_win32_message.mc
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32_message.mc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_logger_win32_message.mc29 May 2002 17:18:47 - 1.1
+++ jk_logger_win32_message.mc29 May 2002 17:46:37 - 1.2
@@ -1,20 +1,27 @@
MessageId=0x1
Severity=Error
-SymbolicName=MSG_ERROR
+SymbolicName=MSG_EMERG
Language=English
-%1
+Emerg: %1
.
MessageId=0x2
-Severity=Informational
-SymbolicName=MSG_INFO
+Severity=Warning
+SymbolicName=MSG_ERROR
Language=English
-%1
+Error:%1
.
MessageId=0x3
Severity=Informational
+SymbolicName=MSG_INFO
+Language=English
+Info: %1
+.
+
+MessageId=0x4
+Severity=Success
SymbolicName=MSG_DEBUG
Language=English
-%1
+Debug: %1
.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_logger_win32.c
nacho 02/05/29 11:25:11
Modified:jk/native2/common jk_logger_win32.c
Log:
* Oops forget about files, lines and the log method :)
Revision ChangesPath
1.3 +44 -27jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c
Index: jk_logger_win32.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_win32.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_logger_win32.c 29 May 2002 17:46:37 - 1.2
+++ jk_logger_win32.c 29 May 2002 18:25:10 - 1.3
@@ -80,6 +80,25 @@
int level,
const char *what)
{
+HANDLE h=RegisterEventSource(NULL,JAKARTA_EVENT_SOURCE);
+LPCTSTR *Buffer;
+Buffer=what;
+if( h==NULL ) {
+return JK_ERR;
+}
+if(l l-level = level what) {
+if( level == JK_LOG_DEBUG_LEVEL ) {
+ReportEvent(h,EVENTLOG_SUCCESS,0,MSG_DEBUG,NULL,1,0,Buffer,NULL);
+} else if( level == JK_LOG_INFO_LEVEL ) {
+
ReportEvent(h,EVENTLOG_INFORMATION_TYPE,0,MSG_INFO,NULL,1,0,Buffer,NULL);
+} else if( level == JK_LOG_ERROR_LEVEL ){
+ReportEvent(h,EVENTLOG_WARNING_TYPE,0,MSG_ERROR,NULL,1,0,Buffer,NULL);
+} else if( level == JK_LOG_EMERG_LEVEL ){
+ReportEvent(h,EVENTLOG_ERROR_TYPE,0,MSG_EMERG,NULL,1,0,Buffer,NULL);
+}
+}
+DeregisterEventSource(h);
+
return JK_OK;
}
@@ -119,36 +138,34 @@
va_list args)
{
/* XXX map jk level to apache level */
-HANDLE h=RegisterEventSource(NULL,JAKARTA_EVENT_SOURCE);
-LPCTSTR *Buffer;
-LPCTSTR buf2;
int rc;
-char buf[HUGE_BUFFER_SIZE];
-
-if( level l-level )
-return JK_OK;
-
-if( h==NULL ) {
-return JK_ERR;
-}
+if(l-level = level) {
+char buf[HUGE_BUFFER_SIZE];
+char *f = (char *)(file + strlen(file) - 1);
+int used = 0;
+
+while(f != file '\\' != *f '/' != *f) {
+f--;
+}
+if(f != file) {
+f++;
+}
+
+if( level = JK_LOG_DEBUG_LEVEL ) {
+used += _snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
line);
+}
+if(used 0) {
+return 0; /* [V] not sure what to return... */
+}
-rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args);
-rc = strlen( buf );
-/* Remove trailing \n. XXX need to change the log() to not include \n */
-if( buf[rc-1] == '\n' )
-buf[rc-1]='\0';
-buf2=buf;
-Buffer=buf2;
-if( level == JK_LOG_DEBUG_LEVEL ) {
-ReportEvent(h,EVENTLOG_SUCCESS,0,MSG_DEBUG,NULL,1,0,Buffer,NULL);
-} else if( level == JK_LOG_INFO_LEVEL ) {
-ReportEvent(h,EVENTLOG_INFORMATION_TYPE,0,MSG_INFO,NULL,1,0,Buffer,NULL);
-} else if( level == JK_LOG_ERROR_LEVEL ){
-ReportEvent(h,EVENTLOG_WARNING_TYPE,0,MSG_ERROR,NULL,1,0,Buffer,NULL);
-} else if( level == JK_LOG_EMERG_LEVEL ){
-ReportEvent(h,EVENTLOG_ERROR_TYPE,0,MSG_EMERG,NULL,1,0,Buffer,NULL);
+
+rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args);
+rc = strlen( buf );
+/* Remove trailing \n. XXX need to change the log() to not include \n */
+if( buf[rc-1] == '\n' )
+buf[rc-1]='\0';
+jk2_logger_win32_log(env, l, level, buf);
}
-DeregisterEventSource(h);
return rc ;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_logger_win32.c jk_logger_win32_message.mc
nacho 02/05/28 16:59:14 Added: jk/native2/server/isapi jk_logger_win32.c jk_logger_win32_message.mc Log: *Win32 native logger implementation Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_logger_win32.c Index: jk_logger_win32.c === /* = * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved.* * * * = * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * *notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * *notice, this list of conditions and the following disclaimer in the * *documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * *must include the following acknowlegement: * * * * This product includes software developed by the Apache Software * *Foundation http://www.apache.org/. * * * *Alternately, this acknowlegement may appear in the software itself, if * *and wherever such third-party acknowlegements normally appear. * * * * 4. The names The Jakarta Project, Jk, and Apache Software * *Foundation must not be used to endorse or promote products derived * *from this software without prior written permission. For written * *permission, please contact [EMAIL PROTECTED].* * * * 5. Products derived from this software may not be called Apache nor may * *Apache appear in their names without prior written permission of the * *Apache Software Foundation.* * * * THIS SOFTWARE IS PROVIDED AS IS AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * = * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see http://www.apache.org/. * * * * = */ /** * Description: Logger implementation using apache's native
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 02/05/28 17:10:18
Modified:jk/native2/common jk_config.c jk_endpoint.c jk_env.c
jk_registry.c jk_registry.h jk_workerEnv.c
jk/native2/include jk_config.h jk_env.h jk_workerEnv.h
jk/native2/jni jk_jni_aprImpl.c
jk/native2/server/isapi jk_isapi_plugin.c
Log:
* Native win32 logger is the default for IIS
* Uri parse option now it's part of the standard wk2.p, deleted registry key and
asociated defines, and changed code to use workerEnv-options
* Added env-SoName for the win32 logger registry settings
* Added workerEnv-logger_name and used it at init to use some logger different form
default one ( currently logger.file only )
* Reordered initializations, to read first the config file, and later try to
initialize the logger.
Revision ChangesPath
1.22 +59 -52jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_config.c 23 May 2002 14:54:07 - 1.21
+++ jk_config.c 29 May 2002 00:10:17 - 1.22
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.21 $ *
+ * Version: $Revision: 1.22 $ *
***/
#include jk_global.h
@@ -439,61 +439,69 @@
* and any removal may have disastrous consequences. Using critical
* sections would drastically affect the performance.
*/
-static int jk2_config_processConfigData(jk_env_t *env, jk_config_t *cfg,
-jk_map_t *cfgData, int firstTime )
+static int jk2_config_processConfigData(jk_env_t *env, jk_config_t *cfg,int
firstTime )
{
int i;
-int j;
+int rc;
-for( i=0; icfgData-size( env, cfgData ); i++ ) {
-char *name=cfgData-nameAt(env, cfgData, i);
-jk_map_t *prefNode=cfgData-valueAt(env, cfgData, i);
-jk_bean_t *bean;
-int ver;
-char *verString;
-
-bean=env-getBean( env, name );
-if( bean==NULL ) {
-if( cfg-mbean-debug 0 ) {
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- config.setConfig(): Creating %s\n, name );
-}
-bean=env-createBean( env, cfg-pool, name );
-}
+for( i=0; icfg-cfgData-size( env, cfg-cfgData ); i++ ) {
+char *name=cfg-cfgData-nameAt(env, cfg-cfgData, i);
+rc=cfg-processNode(env, cfg , name, firstTime);
+}
+return rc;
+}
-if( bean == NULL ) {
-/* Can't create it, save the value in our map */
-env-l-jkLog(env, env-l, JK_LOG_ERROR,
- config.update(): Can't create %s\n, name );
-continue;
+static int jk2_config_processNode(jk_env_t *env, jk_config_t *cfg, char *name, int
firstTime )
+{
+int j;
+
+jk_map_t *prefNode=cfg-cfgData-get(env, cfg-cfgData, name);
+jk_bean_t *bean;
+int ver;
+char *verString;
+
+bean=env-getBean( env, name );
+if( bean==NULL ) {
+if( cfg-mbean-debug 0 ) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ config.setConfig(): Creating %s\n, name );
}
+bean=env-createBean( env, cfg-pool, name );
+}
-verString= prefNode-get( env, prefNode, ver );
-if( !firstTime ) {
-if( verString == NULL ) continue;
-
-ver=atoi( verString );
-
-if( ver = bean-ver) {
-/* Object didn't change
- */
-continue;
-}
+if( bean == NULL ) {
+/* Can't create it, save the value in our map */
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ config.update(): Can't create %s\n, name );
+return JK_ERR;
+}
+
+verString= prefNode-get( env, prefNode, ver );
+if( !firstTime ) {
+if( verString == NULL ) {
+return JK_OK;
}
+ver=atoi( verString );
-if( !firstTime )
-env-l-jkLog(env, env-l, JK_LOG_INFO,
- config.update(): Updating %s\n, name );
-
-/* XXX Maybe we shoud destroy/init ? */
-
-for( j=0
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
nacho 02/05/28 17:13:00
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
* Getting soName for mod_jk2, now it's possible to log to native win32 logger from
apache
Revision ChangesPath
1.26 +28 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_jk2.c 22 May 2002 23:44:23 - 1.25
+++ mod_jk2.c 29 May 2002 00:13:00 - 1.26
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.25 $ *
+ * Version: $Revision: 1.26 $ *
***/
/*
@@ -82,6 +82,10 @@
#include util_script.h
+#ifdef WIN32
+static char file_name[_MAX_PATH];
+#endif
+
/*
* Jakarta (jk_) include files
*/
@@ -284,6 +288,17 @@
env-l=l;
+#ifdef WIN32
+env-soName=env-globalPool-calloc(env, env-globalPool, strlen(file_name)+1);
+
+if( env-soName == NULL ){
+env-l-jkLog(env, env-l, JK_LOG_ERROR, Error creating env-soName\n);
+return env;
+}
+strcpy(env-soName,file_name);
+#else
+env-soName=NULL;
+#endif
/* We should make it relative to JK_HOME or absolute path.
ap_server_root_relative(cmd-pool,opt); */
@@ -708,3 +723,15 @@
jk2_register_hooks /* register hooks */
};
+#ifdef WIN32
+
+BOOL WINAPI DllMain(HINSTANCE hInst,// Instance Handle of the DLL
+ULONG ulReason, // Reason why NT called this DLL
+LPVOID lpReserved) // Reserved parameter for future use
+{
+GetModuleFileName( hInst, file_name, sizeof(file_name)));
+return TRUE;
+}
+
+
+#endif
\ No newline at end of file
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_logger_win32.c
nacho 02/05/28 17:18:24 Modified:jk/native2/server/isapi jk_logger_win32.c Log: * CutPaste issues, better no comments than other file ones. Revision ChangesPath 1.2 +4 -17 jakarta-tomcat-connectors/jk/native2/server/isapi/jk_logger_win32.c Index: jk_logger_win32.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_logger_win32.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jk_logger_win32.c 28 May 2002 23:59:14 - 1.1 +++ jk_logger_win32.c 29 May 2002 00:18:24 - 1.2 @@ -56,22 +56,9 @@ * = */ /** - * Description: Logger implementation using apache's native logging. - * - * This is the result of lazyness - a single log file to watch ( error.log ) - * instead of 2, no need to explain/document/decide where to place mod_jk - * logging, etc. - * - * Normal apache logging rules apply. - * - * XXX Jk will use per/compoment logging level. All logs will be WARN level - * in apache, and the filtering will happen on each component level. - * - * XXX Add file/line - * - * XXX Use env, use the current request structure ( so we can split the log - * based on vhost configs ). - * + * Description: Logger implementation using win32's native logger, + * + * * @author Costin Manolache * @author Ignacio J. Ortega */ @@ -85,7 +72,7 @@ #define HUGE_BUFFER_SIZE (8*1024) -#define JAKARTA_EVENT_SOURCE Apache isapi_redirector2 +#define JAKARTA_EVENT_SOURCE Apache Jakarta Connector2 #ifdef WIN32 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_workerEnv.c
nacho 02/05/28 17:40:45
Modified:jk/native2/common jk_workerEnv.c
Log:
* loggers for dynamic config need to be expressed as type:localname form i.e
logger.file:0
Revision ChangesPath
1.48 +3 -4 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- jk_workerEnv.c29 May 2002 00:10:17 - 1.47
+++ jk_workerEnv.c29 May 2002 00:40:44 - 1.48
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.47 $ *
+ * Version: $Revision: 1.48 $ *
***/
#include jk_env.h
@@ -354,12 +354,11 @@
}
if( wEnv-logger_name!=NULL){
-char alias_name[100]=;
jkb=env-getBean(env,wEnv-logger_name);
if (jkb == NULL){
-jkb=env-createBean2( env, env-globalPool, wEnv-logger_name, );
+jkb=env-createBean( env, env-globalPool, wEnv-logger_name);
}
-env-alias( env, strcat(strcat(alias_name,wEnv-logger_name),:),
logger);
+env-alias( env, wEnv-logger_name, logger);
env-l = jkb-object;
}
env-l-init( env, env-l );
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 02/05/28 17:50:50
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* default win32 native logger needs to be inited before first use, to make the
needed registry changes.
XXX Need a way to undone this registry mods?
Revision ChangesPath
1.21 +5 -3
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_isapi_plugin.c 29 May 2002 00:10:18 - 1.20
+++ jk_isapi_plugin.c 29 May 2002 00:50:49 - 1.21
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -728,8 +728,8 @@
l = jkb-object;
env-l=l;
-
env-soName=env-globalPool-calloc(env, env-globalPool, strlen(file_name)+1);
+env-l-init(env,env-l);
if( env-soName == NULL ){
env-l-jkLog(env, env-l, JK_LOG_ERROR, Error creating env-soName\n);
@@ -762,11 +762,13 @@
jk_env_t *env;
if( workerEnv==NULL ) {
env = jk2_create_workerEnv();
+env-l-jkLog(env, env-l, JK_LOG_ERROR, JK2 Config Created);
} else {
env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
+env-l-jkLog(env, env-l, JK_LOG_ERROR, JK2 Config Reused);
}
-env-l-jkLog(env, env-l, JK_LOG_ERROR, JK2 Config Created);
+
return env;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 02/05/28 17:59:33
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* Oops, init needs to be after setting soName
Revision ChangesPath
1.22 +3 -2
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_isapi_plugin.c 29 May 2002 00:50:49 - 1.21
+++ jk_isapi_plugin.c 29 May 2002 00:59:33 - 1.22
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.21 $ *
+ * Version: $Revision: 1.22 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -729,13 +729,14 @@
env-l=l;
env-soName=env-globalPool-calloc(env, env-globalPool, strlen(file_name)+1);
-env-l-init(env,env-l);
if( env-soName == NULL ){
env-l-jkLog(env, env-l, JK_LOG_ERROR, Error creating env-soName\n);
return env;
}
strcpy(env-soName,file_name);
+env-l-init(env,env-l);
+
/* We should make it relative to JK_HOME or absolute path.
ap_server_root_relative(cmd-pool,opt); */
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 02/05/28 18:16:40
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* logger reconfigurations need to be done at globalEnv.
XXX Thread issues, isapi needs a complete revamp of initialization, now is a mess,
works, but needs a complete rewrite
Revision ChangesPath
1.23 +2 -2
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_isapi_plugin.c 29 May 2002 00:59:33 - 1.22
+++ jk_isapi_plugin.c 29 May 2002 01:16:40 - 1.23
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.22 $ *
+ * Version: $Revision: 1.23 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -571,7 +571,7 @@
{
int rc = JK_TRUE;
-jk_env_t *env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
+jk_env_t *env = workerEnv-globalEnv;
workerEnv-initData-add( env, workerEnv-initData, serverRoot,
workerEnv-pool-pstrdup( env, workerEnv-pool,
server_root));
/* Logging the initialization type: registry or properties file in virtual dir
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_env.c
nacho 02/05/27 14:56:19
Modified:jk/native2/common jk_env.c
Log:
* Fixed build in win32
Thanks to Mladen Turk
Revision ChangesPath
1.29 +2 -1 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_env.c 24 May 2002 04:26:00 - 1.28
+++ jk_env.c 27 May 2002 21:56:19 - 1.29
@@ -58,6 +58,7 @@
#include jk_global.h
#include jk_env.h
#include jk_objCache.h
+#include apr_general.h
jk_env_t *jk_env_globalEnv;
void *jkGlobalAprPool;
@@ -72,7 +73,7 @@
/* Env management */
-static void JK_METHOD *jk2_env_getAprPool( jk_env_t *env ) {
+static void * JK_METHOD jk2_env_getAprPool( jk_env_t *env ) {
#ifdef HAS_APR
/* We don't want to have to recreate the scoreboard after
* restarts, so we'll create a global pool and never clean it.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_endpoint.c
nacho 02/05/27 14:57:45 Modified:jk/native2/common jk_endpoint.c Log: * Typos * initing stats object to NULL Revision ChangesPath 1.15 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c Index: jk_endpoint.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_endpoint.c 16 May 2002 20:57:26 - 1.14 +++ jk_endpoint.c 27 May 2002 21:57:45 - 1.15 @@ -112,7 +112,7 @@ ep-stats-reqCnt=0; ep-stats-errCnt=0; -#ifdef HAVE_APR +#ifdef HAS_APR ep-stats-maxTime=0; ep-stats-totalTime=0; #endif @@ -149,7 +149,7 @@ e-sd=-1; e-recoverable=JK_TRUE; e-cPool=pool-create(env, pool, HUGE_POOL_SIZE ); - +e-stats = NULL; e-channelData = NULL; e-currentRequest = NULL; epId=atoi( result-localName ); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp
nacho 02/05/23 05:05:53 Modified:jk/native2/server/isapi isapi.dsp Log: * Changed apache20_home to apache2_home to mimic mod_jk2 and jk1 builds Revision ChangesPath 1.11 +328 -328 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- isapi.dsp 22 May 2002 23:47:14 - 1.10 +++ isapi.dsp 23 May 2002 12:05:52 - 1.11 @@ -1,328 +1,328 @@ -# Microsoft Developer Studio Project File - Name=isapi - Package Owner=4 -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 - -CFG=isapi - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f isapi.mak. -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f isapi.mak CFG=isapi - Win32 Debug -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE isapi - Win32 Release (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE isapi - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName -# PROP Scc_LocalPath -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF $(CFG) == isapi - Win32 Release - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir Release -# PROP BASE Intermediate_Dir Release -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir Release -# PROP Intermediate_Dir Release -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c -# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 -# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d NDEBUG -# ADD RSC /l 0x409 /d NDEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 libapr.lib libaprutil.lib kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll /libpath:$(APACHE20_HOME)\lib - -!ELSEIF $(CFG) == isapi - Win32 Debug - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir Debug -# PROP BASE Intermediate_Dir Debug -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir Debug -# PROP Intermediate_Dir Debug -# 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 ISAPI_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d _DEBUG -# ADD RSC /l 0x409 /d _DEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept /libpath:$(APACHE20_HOME)\lib -# SUBTRACT LINK32 /nodefaultlib - -!ENDIF - -# Begin Target - -# Name isapi - Win32 Release -# Name isapi - Win32 Debug -# Begin Group Source Files - -# PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat -# Begin Source File - -SOURCE=.\isapi.def -# End Source File -# Begin Source File - -SOURCE
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
nacho 02/05/19 10:37:08
Modified:jk/native2/common jk_shm.c
Log:
* Fixed problems when creating the shm file, due to unsigned arithmetics..
1000-1024=4.356.357.838.652 :)
Revision ChangesPath
1.18 +6 -2 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_shm.c 16 May 2002 23:48:27 - 1.17
+++ jk_shm.c 19 May 2002 17:37:08 - 1.18
@@ -171,7 +171,11 @@
shm-fname, errno, strerror( errno ));
return JK_ERR;
}
-toWrite-=written;
+if( toWrite written ){
+toWrite=0;
+}else{
+toWrite-=written;
+}
}
rc=apr_file_info_get(finfo, APR_FINFO_SIZE, file);
@@ -248,7 +252,7 @@
int toWrite=shm-size - filestat.st_size;
memset( bytes, 0, 1024 );
- lseek(fd, 0, SEEK_END);
+ lseek(fd, 0, SEEK_END);
while( toWrite 0 ) {
int written;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/conf workers2.properties
nacho 02/05/19 13:56:13 Modified:jk/conf workers2.properties Log: * Workaround, this should be done trasparently when porperty is setted, for now.. at least the correct one.. Revision ChangesPath 1.13 +1 -1 jakarta-tomcat-connectors/jk/conf/workers2.properties Index: workers2.properties === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/conf/workers2.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- workers2.properties 17 May 2002 00:35:18 - 1.12 +++ workers2.properties 19 May 2002 20:56:13 - 1.13 @@ -66,7 +66,7 @@ [worker.jni:jniCmd1] info=Command to be executed by the VM. This one will start tomcat. -class=org.apache.jk.apr.TomcatStarter +class=org/apache/jk/apr/TomcatStarter ARG=start disabled=1 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi_redirector2.reg
nacho 02/05/19 14:11:08 Added: jk/native2/server/isapi isapi_redirector2.reg Log: * Sample registry settings file for Isapi_redirector2.dll Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg Index: isapi_redirector2.reg === Windows Registry Editor Version 5.00 [HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Isapi Redirector\2.0] serverRoot=E:\\tomcat\\jakarta-tomcat\\build\\tomcat extensionUri=/jakarta/isapi_redirector2.dll workerFile=E:\\tomcat\\jakarta-tomcat\\build\\tomcat\\conf\\workers2.properties -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi_redirector2.reg
nacho 02/05/19 14:17:10 Modified:jk/native2/server/isapi isapi_redirector2.reg Log: Oops, committed as unicode, reverting to ascii Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg Index: isapi_redirector2.reg === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi_redirector2.reg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- isapi_redirector2.reg 19 May 2002 21:11:08 - 1.1 +++ isapi_redirector2.reg 19 May 2002 21:17:10 - 1.2 @@ -1,4 +1,4 @@ -Windows Registry Editor Version 5.00 +Windows Registry Editor Version 5.00 [HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta Isapi Redirector\2.0] serverRoot=E:\\tomcat\\jakarta-tomcat\\build\\tomcat -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
nacho 02/05/19 14:40:09
Modified:jk/native2/common jk_worker_status.c
Log:
* Do not try to do print stats if stats object is null
Revision ChangesPath
1.24 +4 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_worker_status.c16 May 2002 23:48:27 - 1.23
+++ jk_worker_status.c19 May 2002 21:40:09 - 1.24
@@ -180,8 +180,10 @@
continue;
ep=mbean-object;
-jk2_worker_status_displayStat( env, s, ep-stats,
- totalReq, totalErr, totalTime, maxTime);
+if( ep-stats != NULL ){
+jk2_worker_status_displayStat( env, s, ep-stats,
+ totalReq, totalErr, totalTime,
maxTime);
+}
}
s-jkprintf(env, s, /table\n);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_jni.c
nacho 02/05/19 14:41:25
Modified:jk/native2/common jk_channel_jni.c
Log:
* Better close, try to release memory and Java Objects..
Revision ChangesPath
1.21 +34 -9 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_channel_jni.c 16 May 2002 23:48:27 - 1.20
+++ jk_channel_jni.c 19 May 2002 21:41:25 - 1.21
@@ -192,7 +192,6 @@
jniCh-jniBridge =
(*jniEnv)-FindClass(jniEnv, jniCh-className );
-jniCh-jniBridge=(*jniEnv)-NewGlobalRef( jniEnv, jniCh-jniBridge);
if( jniCh-jniBridge == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
@@ -200,6 +199,13 @@
return JK_ERR;
}
+jniCh-jniBridge=(*jniEnv)-NewGlobalRef( jniEnv, jniCh-jniBridge);
+
+if( jniCh-jniBridge == NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ channel_jni.open() Unable to allocate globalref for
%s\n,jniCh-className );
+return JK_ERR;
+}
/* Interface to the callback mechansim. The idea is simple ( is it ? ) - we
use a similar pattern with java, trying to do as little as possible
@@ -291,12 +297,27 @@
jk_endpoint_t *endpoint)
{
jk_ch_jni_ep_private_t *epData;
-
+JNIEnv *jniEnv;
+jk_channel_jni_private_t *jniCh=_this-_privatePtr;
epData=(jk_ch_jni_ep_private_t *)endpoint-channelData;
-
-/* (*jniEnv)-DeleteGlobalRef( jniEnv, epData-msgJ ); */
-/* (*jniEnv)-DeleteGlobalRef( jniEnv, epData-jniJavaContext ); */
-
+jniEnv = (JNIEnv *)jniCh-vm-attach( env, jniCh-vm );
+
+if( jniEnv == NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_INFO,
+ channel_jni.close() can't attach\n );
+return JK_ERR;
+}
+if( epData-jarray != NULL ){
+(*jniEnv)-DeleteGlobalRef( jniEnv, epData-jarray );
+}
+if( epData-jniJavaContext != NULL){
+(*jniEnv)-DeleteGlobalRef( jniEnv, epData-jniJavaContext );
+}
+endpoint-mbean-pool-realloc(env,endpoint-mbean-pool,0,
+epData-carray,epData-arrayLen);
+endpoint-mbean-pool-realloc(env,endpoint-mbean-pool,0,
+epData,sizeof( jk_ch_jni_ep_private_t ));
+endpoint-channelData=NULL;
return JK_OK;
}
@@ -327,7 +348,7 @@
JNIEnv *jniEnv;
jk_channel_jni_private_t *jniCh=_this-_privatePtr;
jk_ch_jni_ep_private_t *epData=
-(jk_ch_jni_ep_private_t *)endpoint-channelData;;
+(jk_ch_jni_ep_private_t *)endpoint-channelData;
if( _this-mbean-debug 0 )
env-l-jkLog(env, env-l, JK_LOG_INFO,channel_jni.send() %p\n, epData );
@@ -336,9 +357,13 @@
jk2_channel_jni_open( env, _this, endpoint );
epData=(jk_ch_jni_ep_private_t *)endpoint-channelData;
}
-if( epData == NULL || epData-jniJavaContext == NULL ) {
+if( epData == NULL ){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,channel_jni.send() error opening
channel\n );
+return JK_ERR;
+}
+if( epData-jniJavaContext == NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,channel_jni.send() no java
context\n );
-
+jk2_channel_jni_close( env, _this, endpoint );
return JK_ERR;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 02/05/19 14:44:23
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* If workerEnv is already created use it, instead of trying to create another.
Revision ChangesPath
1.17 +4 -2
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jk_isapi_plugin.c 18 May 2002 22:38:11 - 1.16
+++ jk_isapi_plugin.c 19 May 2002 21:44:23 - 1.17
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.16 $ *
+ * Version: $Revision: 1.17 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -780,7 +780,9 @@
{
jk_env_t *env;
if( workerEnv==NULL ) {
-env=jk2_create_workerEnv();
+env = jk2_create_workerEnv();
+} else {
+env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
}
env-l-jkLog(env, env-l, JK_LOG_ERROR, JK2 Config Created);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_map.h
nacho 02/05/18 15:34:01
Modified:jk/native2/common jk_config.c jk_map.c
jk/native2/include jk_map.h
Log:
* Refactored reading of properties files into map object, this way arbitrary
properties files can be read, need for i_r2.dll
Revision ChangesPath
1.19 +2 -141jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_config.c 16 May 2002 21:03:44 - 1.18
+++ jk_config.c 18 May 2002 22:34:01 - 1.19
@@ -58,7 +58,7 @@
/***
* Description: General purpose config object *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.18 $ *
+ * Version: $Revision: 1.19 $ *
***/
#include jk_global.h
@@ -69,11 +69,6 @@
#define CAPACITY_INC_SIZE (50)
#define LENGTH_OF_LINE(1024)
-int jk2_config_read(struct jk_env *env, struct jk_config *cfg,
-struct jk_map *map);
-static void jk2_trim_prp_comment(char *prp);
-static int jk2_trim(char *s);
-
static int jk2_config_readFile(jk_env_t *env,
jk_config_t *cfg,
int *didReload, int firstTime);
@@ -359,113 +354,6 @@
-/* */
-/* Reading / parsing.
- */
-int jk2_config_parseProperty(jk_env_t *env, jk_config_t *cfg, jk_map_t *m, char
*prp )
-{
-int rc = JK_ERR;
-char *v;
-jk_map_t *prefNode=NULL;
-
-jk2_trim_prp_comment(prp);
-
-if( jk2_trim(prp)==0 )
-return JK_OK;
-
-/* Support windows-style 'sections' - for cleaner config
- */
-if( prp[0] == '[' ) {
-v=strchr(prp, ']' );
-*v='\0';
-jk2_trim( v );
-prp++;
-
-cfg-section=cfg-pool-pstrdup(env, m-pool, prp);
-
-jk2_map_default_create( env, prefNode, m-pool );
-
-m-add( env, m, cfg-section, prefNode);
-
-return JK_OK;
-}
-
-v = strchr(prp, '=');
-if(v==NULL)
-return JK_OK;
-
-*v = '\0';
-v++;
-
-if(strlen(v)==0 || strlen(prp)==0)
-return JK_OK;
-
-prefNode=m-get( env, m, cfg-section);
-
-if( prefNode==NULL )
-return JK_ERR;
-
-/* fprintf(stderr, Adding [%s] %s=%s\n, cfg-section, prp, v ); */
-prefNode-add( env, prefNode, m-pool-pstrdup(env, m-pool, prp),
- m-pool-pstrdup(env, m-pool, v));
-
-return JK_OK;
-}
-
-/** Read a query string into the map
- */
-int jk2_config_queryRead(jk_env_t *env, jk_config_t *cfg, jk_map_t *m, const char
*query)
-{
-char *sep;
-char *value;
-char *qry=cfg-pool-pstrdup( env, cfg-pool, query );
-
-while( qry != NULL ) {
-sep=strchr( qry, '');
-if( sep !=NULL ) {
-*sep='\0';
-sep++;
-}
-
-value = strchr(qry, '=');
-if(value==NULL) {
-value=;
-} else {
-*value = '\0';
-value++;
-}
-m-add( env, m, cfg-pool-pstrdup( env, cfg-pool, qry ),
-cfg-pool-pstrdup( env, cfg-pool, value ));
-qry=sep;
-}
-return JK_OK;
-}
-
-/** Read the config file
- */
-int jk2_config_read(jk_env_t *env, jk_config_t *cfg, jk_map_t *m)
-{
-FILE *fp;
-char buf[LENGTH_OF_LINE + 1];
-char *prp;
-char *f=cfg-file;
-
-if(m==NULL || f==NULL )
-return JK_ERR;
-
-fp= fopen(f, r);
-
-if(fp==NULL)
-return JK_ERR;
-
-cfg-section=NULL;
-while(NULL != (prp = fgets(buf, LENGTH_OF_LINE, fp))) {
-jk2_config_parseProperty( env, cfg, m, prp );
-}
-
-fclose(fp);
-return JK_OK;
-}
@@ -667,7 +555,7 @@
jk2_map_default_create(env, cfgData, env-tmpPool);
-rc=jk2_config_read(env, cfg, cfgData );
+rc=jk2_map_read(env, cfgData , cfg-file );
if( rc==JK_OK ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
@@ -722,33 +610,6 @@
return JK_OK;
}
-
-static void jk2_trim_prp_comment(char *prp)
-{
-char *comment = strchr(prp, '#');
-if(comment) {
-*comment = '\0';
-}
-}
-
-static int jk2_trim(char
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_requtil.c
nacho 02/05/18 15:35:36 Modified:jk/native2/common jk_requtil.c Log: * Reset msg too Revision ChangesPath 1.18 +2 -1 jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c Index: jk_requtil.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_requtil.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jk_requtil.c 14 May 2002 17:17:23 - 1.17 +++ jk_requtil.c 18 May 2002 22:35:36 - 1.18 @@ -1022,7 +1022,8 @@ s-ssl_session = NULL; s-jvm_route= NULL; s-uriEnv = NULL; -s-outBuf=NULL; +s-outBuf = NULL; +s-msg = NULL; s-jkprintf=jk2_requtil_printf; } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
nacho 02/05/18 15:38:11
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
* Better messages
* Adding some more checks when allocating maps
Revision ChangesPath
1.16 +94 -104
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_isapi_plugin.c 11 May 2002 01:44:13 - 1.15
+++ jk_isapi_plugin.c 18 May 2002 22:38:11 - 1.16
@@ -60,7 +60,7 @@
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Larry Isaacs [EMAIL PROTECTED] *
* Author: Ignacio J. Ortega [EMAIL PROTECTED] *
- * Version: $Revision: 1.15 $ *
+ * Version: $Revision: 1.16 $ *
***/
// This define is needed to include wincrypt,h, needed to get client certificates
@@ -82,10 +82,10 @@
#include jk_iis.h
//#include jk_uri_worker_map.h
-#define WORKERS_FILE_TAG (worker_file)
-#define SERVER_ROOT_TAG (server_root)
-#define URI_SELECT_TAG (uri_select)
-#define EXTENSION_URI_TAG (extension_uri)
+#define SERVER_ROOT_TAG (serverRoot)
+#define URI_SELECT_TAG (uriSelect)
+#define EXTENSION_URI_TAG (extensionUri)
+#define WORKERS_FILE_TAG (workersFile)
#define URI_SELECT_PARSED_VERB (parsed)
#define URI_SELECT_UNPARSED_VERB(unparsed)
@@ -116,9 +116,9 @@
static int init_jk(char *serverName);
-static int initialize_extension(void);
+static int initialize_extension();
-static int read_registry_init_data(void);
+static int read_registry_init_data(jk_env_t *env);
static int get_registry_config_parameter(HKEY hkey,
const char *tag,
@@ -556,12 +556,11 @@
{
int rc = JK_FALSE;
-jk_env_t *env=jk2_create_config();
-
-rc=(JK_OK == workerEnv-config-setPropertyString( env, workerEnv-config,
config.file, worker_file ));
-
+jk_env_t *env = workerEnv-globalEnv-getEnv( workerEnv-globalEnv );
/* Logging the initialization type: registry or properties file in virtual dir
*/
+//rc=(JK_OK == workerEnv-config-update( env, workerEnv-config, NULL));
+rc=(JK_OK == workerEnv-config-setPropertyString( env, workerEnv-config,
config.file, worker_file ));
if (using_ini_file) {
env-l-jkLog(env, env-l, JK_LOG_DEBUG, Using ini file %s.\n,
ini_file_name);
} else {
@@ -577,9 +576,13 @@
return rc;
}
-static int initialize_extension(void)
+static int initialize_extension()
{
-if (read_registry_init_data()) {
+jk_env_t *env=jk2_create_config();
+if (read_registry_init_data(env)) {
+workerEnv-initData-add( env, workerEnv-initData, serverRoot,
+ workerEnv-pool-pstrdup( env, workerEnv-pool,
server_root));
+env-l-jkLog(env, env-l, JK_LOG_ERROR, Set serverRoot %s\n,
server_root);
is_inited = JK_TRUE;
}
return is_inited;
@@ -602,106 +605,99 @@
return -1;
}
-static int read_registry_init_data(void)
+static int read_registry_init_data(jk_env_t *env)
{
char tmpbuf[INTERNET_MAX_URL_LENGTH];
HKEY hkey;
long rc;
int ok = JK_TRUE;
-/*
char *tmp;
jk_map_t *map;
-
-if (map_alloc(map)) {
-if (map_read_properties(map, ini_file_name)) {
-using_ini_file = JK_TRUE;
- }
-}
-if (using_ini_file) {
-tmp = map_get_string(map, JK_LOG_FILE_TAG, NULL);
-if (tmp) {
-strcpy(log_file, tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, JK_LOG_LEVEL_TAG, NULL);
-if (tmp) {
-log_level = jk2_logger_file_parseLogLevel(tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, EXTENSION_URI_TAG, NULL);
-if (tmp) {
-strcpy(extension_uri, tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, SERVER_ROOT_TAG, NULL);
-if (tmp) {
-strcpy(server_root, tmp);
-} else {
-ok = JK_FALSE;
-}
-tmp = map_get_string(map, URI_SELECT_TAG, NULL);
-if (tmp) {
-int opt = parse_uri_select(tmp);
-if (opt = 0) {
-uri_select_option = opt
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_service_iis.c
nacho 02/05/18 15:40:48
Modified:jk/native2/server/isapi jk_service_iis.c
Log:
* Now i_r2.dll starts jk when the filter is first loaded, and later when first used
reads the config file and continues..
* Added properies file config in addition to Rehistry one
* Changed names of Regitry and properties init settings to match wk2.p file ones
server_root-serverRoot and so on..
Revision ChangesPath
1.16 +21 -7
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
Index: jk_service_iis.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_service_iis.c 10 May 2002 23:15:35 - 1.15
+++ jk_service_iis.c 18 May 2002 22:40:47 - 1.16
@@ -90,7 +90,7 @@
int headerCount;
env-l-jkLog(env,env-l, JK_LOG_DEBUG,
- Into jk_ws_service_t::start_response\n);
+ Into jk_ws_service_t::head\n);
if (s-status 100 || s-status 1000) {
env-l-jkLog(env,env-l, JK_LOG_ERROR,
@@ -100,7 +100,7 @@
if( lpEcb == NULL ) {
env-l-jkLog(env,env-l, JK_LOG_ERROR,
- jk_ws_service_t::start_response, no lpEcp\n);
+ jk_ws_service_t::head, no lpEcp\n);
return JK_ERR;
}
@@ -109,7 +109,7 @@
/*
* Create the status line
*/
-if (!s-msg) {
+if (s-msg==NULL) {
reason = ;
} else {
reason = s-msg;
@@ -154,7 +154,7 @@
(LPDWORD)len_of_status,
(LPDWORD)headers_str)) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- jk_ws_service_t::start_response, ServerSupportFunction
failed\n);
+ jk_ws_service_t::head, ServerSupportFunction failed\n);
return JK_ERR;
}
@@ -317,9 +317,23 @@
s-ssl_session = NULL;
s-ssl_key_size = -1;
-jk2_map_default_create(env, s-headers_out, s-pool );
-jk2_map_default_create(env, s-attributes, s-pool );
-jk2_map_default_create(env, s-headers_in, s-pool );
+if (JK_OK!=jk2_map_default_create(env, s-headers_out, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create headers_out map \n);
+return JK_ERR;
+
+}
+if (JK_OK!=jk2_map_default_create(env, s-attributes, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create attributes map \n);
+return JK_ERR;
+
+}
+if (JK_OK!=jk2_map_default_create(env, s-headers_in, s-pool )){
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ jk_ws_service_t::init, Failed to create headers_in map \n);
+return JK_ERR;
+}
//s-headers_values = NULL;
// s-num_headers = 0;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
