Re: [Daemon] New commons component
Native code is used and needed by jk, and 'wrapping' APR is one of my current goals - it'll provide much more than chuid. I think it's much cleaner to use 'normal' JNI when you want to call C code from java, so I'll stick with this solution. IMHO, beyond Pier's and Remy's requirements, this will never fly in the real world. I don't see any way that you are going to convince webmasters (including me) to relax the sandbox enough to allow this. I'm committed enough to the principal of software Darwinism that I see no point in voting against this, however. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
[Wed Feb 20 00:19:28 2002] [notice] Apache/2.0.28 (Unix) mod_ssl/3.0a0 OpenSSL/0.9.6b DAV/2 mod_jk/1.2.0 mod_jk/1.2.0 configured -- resuming normal operations mod_jk/2.0.0 sounds better. ok, so let's call it mod_jk/2.0.0 3) To have both installed you should rename mod_jk.so from native2 to mod_jk2.so for example in apache lib. So - Why not rename mod_jk in native2 to mod_jk2. No because we are already in jakarta-tomcat-connectors/jk (mod_jk2 does not bring more information than native2). Are you agree : - in using jk2_module - directives : Jk2WorkersFile Jk2Properties Jk2Set Jk2Mount Jk2Worker Jk2Webapp Jk2Servlet Jk2MountCopy Jk2LogFile Jk2LogLevel Jk2LogStampFormat Jk2HTTPSIndicator Jk2CERTSIndicator Jk2CIPHERIndicator Jk2SESSIONIndicator Jk2KEYSIZEIndicator Jk2ExtractSSL Jk2ForwardSSLKeySize Jk2ForwardURICompat Jk2ForwardURICompatUnparsed Jk2ForwardURIEscaped Jk2EnvVar Some points : Jk(2)Mount is still very usefull for experienced admins when for example you want to have tomcat serving only servlet/jsp and Apache rest of datas (static/php...) That's a features not present in mod_webapp and required by some users (seeing on tomcat-user list) ie : Alias /examples /var/tomcat/webapps/examples Directory /var/tomcat/webapps/examples Options Indexes FollowSymLinks /Directory JkMount /examples/servlet/* ajp13 JkMount /examples/*.jsp ajp13 Location /examples/WEB-INF/ AllowOverride None deny from all /Location These directive need to be handled also, so the renaming : Jk2LogFile Jk2LogLevel Jk2LogStampFormat Jk2HTTPSIndicator Jk2CERTSIndicator Jk2CIPHERIndicator Jk2SESSIONIndicator Jk2KEYSIZEIndicator Jk2ExtractSSL Jk2ForwardSSLKeySize Jk2ForwardURICompat Jk2ForwardURICompatUnparsed Jk2ForwardURIEscaped Jk2EnvVar The goal of having all mod_jk 2.0.0 use Jk2 directives is to help users to determine which directives are for original mod_jk (Jk...) and which one are for mod_jk 2.0.0 (Jk2...). Also having at the same time mod_jk/1.x and mod_jk/2.x could help admins when they have to link against old tomcat (3.2) and new tomcats (3.3/4.0). For example IBM iSeries (AS/400) still use Tomcat 3.2.3 with original ajp12/ajp13 and keeping mod_jk 1.x on Apache is mandatory when Apache Web Server act as a master redirector for big Web Applications hosted on many heterogeneous systems, using TC 3.2/3.3/4.0 on differents platforms. Having both mod_jk is in that case absolutly mandatory. And as said Costin, it provide a good backup and fallback solution. Could I have detail on how to use new Jk(2) directives : Jk2WorkersFile Jk2Properties Jk2Set Jk2Worker Jk2Webapp Jk2Servlet Sometimes httpd.conf examples are better than documentation ;) BTW: Did there is plan to port mod_jk/2.0.0 to Apache 1.3 and IIS/iPlanet/Domino ? RE-BTW: I attached the latest diff + a quick / dirty correction to Jk(2)Worker directive ;) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
Oups miss to include diff ;) - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 jk2_renaming2.zip Description: jk2_renaming2.zip -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
Remy Maucherat wrote: Pier, I took a quick look at the code and found the RegisterNative function. This looks like an interesting feature. I also found the same function in your daemons code. The picture is becoming much clearer. Let me try to get it working in the next few days with the callback function set to invoke setuid() and have the callback invoke (via Java reflection since it won't be there on Windows or standalone start. If I can get this to work, I will post the patches first so that all can inspect. Now that I understand this approach, it basically seems to work through the same logical steps (from a Tomcat Java code) perspective as invoking the callback function via JNI. In your approach, the function is preloaded for Java (no System.loadLibrary() required) and the Java code invokes the function like any other method (it just happens that the method doesn't exist at compile time but only at runtime). There are only two native daemon configurations I'm interested in: - embedded in Apache 2 with a JNI connector - used through jsvc on Unix, and some similar wrapper on Win NT (or jsvc.exe using Cygwin; it works :)) The jsvc.exe is started by a monitor process. The monitor process is win32 code. jsvc uses Cygwin (That was a very fast to get it working). The signals in windoze are done via event and thread. But only SIGTERM is supported for the moment. With Daemon, from the C code, all you have to do is, as Pier pointed out: - Call init - Use setuid to downgrade to nobody - Call start - Wait for a stop signal, at which point you call stop At this point, I do not see the need for any use of native code from the Java side. Right we need JAVA code in native code ;-) Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
The to-be commited version will use ap_pstrdup instead of sprintf in jk2_setWorker ;) - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -Original Message- From: GOMEZ Henri Sent: Thursday, February 21, 2002 9:57 AM To: Tomcat Developers List Subject: RE: jk2 renaming - need revue and comments Oups miss to include diff ;) - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 1450] - Incorrect encode URL with session ID
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1450. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1450 Incorrect encode URL with session ID [EMAIL PROTECTED] changed: What|Removed |Added Severity|Minor |Major Status|RESOLVED|REOPENED Priority|Low |High Resolution|INVALID | Version|4.0 Beta 3 |4.0.2 Final --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 09:32 --- Let's put it that way: Even if the spec allowed Craigs interpretation, you should be aware of the fact, that your interpretation is deviant from many other vendors' interpretation. In the meantime I have tested encodeURL on Orion, on Caucho Resin, and on HP-AS 8.0, and Tomcat is the only Servlet engine that fails to recognize the URLs which it has encoded twice. Orion and HP-AS only put jsessionid into the URL once, no matter how many times I invoke encodeURL. Resin puts it there twice, but manages to keep the session. Tomcat puts it there twice and looses the session :-( Therefore I still vote for the inclusion of my proposed enhancement. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Content-length checking in mod_jk
Hello,
Credit goes to David Dankwerth for supplying this patch.
It is meant to abort an http connection if the content length value exceeds a
predefined value.
The predefined value can be specified in apache's httpd.conf by using the
LimitRequestBody directive.
F.e.:
LimitRequestBody 1
JkEnvVar JkLimitRequestBody apache
will limit the request to 10K.
Apache will throw a 413 error when the limit has been exceeded so you can
define an ErrorDocument in httpd.conf to show up an informative page indicating
the error.
Anyway, it's been a real and helpful solution for me and I was wondering if the
author would consider using it? :)
See attachment for a diff on the original v1.23 source.
Greetings, Philippe.
1326,1330d1325
* this function will also check the request length , if the length exceeds
* the limit set by JkEnvVar JkLimitRequestBody (values are a number[bytes]
* or apache to mark the use of LimitRequestBody , then this function will
* decline the request (to aviod Unrecoverable errors)
* added by David Dankwerth and David Brewster of ri3k
1333,1336c1328,1329
{
char *worker = NULL ;
if(!r-proxyreq) {
---
{
if(!r-proxyreq) {
1339c1332
---
1341,1395c1334,1335
worker = map_uri_to_worker(conf-uw_map,
r-uri,
conf-log ? conf-log : main_log);
// check if there is a contect length in the request (might
not have !)
if ( ap_table_get(r-headers_in, Content-Length) != NULL )
{
long requestLength =
atol(ap_table_get(r-headers_in, Content-Length)) ;
if (requestLength != 0 )
{
server_rec *s = r-server;
jk_server_conf_t *conf =
(jk_server_conf_t
*)ap_get_module_config(s-module_config, jk_module);
jk_logger_t *l = conf-log ? conf-log :
main_log;
long max = 0 ;
// get the defenition from the JkEnvVar
JkLimitRequestBody
const char* maxLength=
ap_table_get(conf-envvars,JkLimitRequestBody);
// apachs LimitRequestBody Value
long apacheLimit = ap_get_limit_req_body(r) ;
jk_log(l, JK_LOG_DEBUG,
mod_jk :: Apache
LimitRequestBody is %d \n,apacheLimit);
if (maxLength != NULL )
{
// check if to use apache's limit
if (0 == strcmp(apache,maxLength))
max = apacheLimit ;
else
max = atol(maxLength) ;
}
jk_log(l, JK_LOG_DEBUG,
mod_jk:: AllowedRequestSize is %d ,
current Request %d\n,max,requestLength);
// if max defined is 0 allow
if (max == 0 || requestLength max )
{
jk_log(l, JK_LOG_DEBUG,
mod_jk:: Request authorized to
pass length limitation);
}
else
{
jk_log(l, JK_LOG_DEBUG,
mod_jk:: Request declined to
pass length limitation);
return DECLINED ;
}
}
}
---
char *worker = map_uri_to_worker(conf-uw_map, r-uri, conf-log ?
conf-log : main_log);
1402c1342
---
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: Content-length checking in mod_jk
Seems a good idea ;) - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -Original Message- From: Philippe Van Der Gucht [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 21, 2002 11:19 AM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Content-length checking in mod_jk Hello, Credit goes to David Dankwerth for supplying this patch. It is meant to abort an http connection if the content length value exceeds a predefined value. The predefined value can be specified in apache's httpd.conf by using the LimitRequestBody directive. F.e.: LimitRequestBody 1 JkEnvVar JkLimitRequestBody apache will limit the request to 10K. Apache will throw a 413 error when the limit has been exceeded so you can define an ErrorDocument in httpd.conf to show up an informative page indicating the error. Anyway, it's been a real and helpful solution for me and I was wondering if the author would consider using it? :) See attachment for a diff on the original v1.23 source. Greetings, Philippe. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
problem in Struts sample code
Hello, I found error in Struts sample code. ServletEngine fails in compilation for an unnecessary semicolon. struts-exercise-taglib/html-select.jsp --- html-select.jsp Sat Jan 12 06:34:48 2002 +++ html-select.jsp Thu Feb 21 19:19:36 2002 @@ -1,4 +1,4 @@ -%@ page language=java import=java.util.*, org.apache.struts.webapp.exercise.*;% +%@ page language=java import=java.util.*, org.apache.struts.webapp.exercise.*% %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % - teik, E-Mail [EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_ajp14_worker.c jk_channel_apr_socket.c jk_channel_jni.c jk_channel_socket.c
hgomez 02/02/21 03:09:31
Modified:jk/native2/common jk_ajp14_worker.c jk_channel_apr_socket.c
jk_channel_jni.c jk_channel_socket.c
Log:
First batch of jk2 renaming commit
Revision ChangesPath
1.16 +39 -39jakarta-tomcat-connectors/jk/native2/common/jk_ajp14_worker.c
Index: jk_ajp14_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_ajp14_worker.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_ajp14_worker.c 6 Feb 2002 19:13:10 - 1.15
+++ jk_ajp14_worker.c 21 Feb 2002 11:09:31 - 1.16
@@ -91,7 +91,7 @@
* Initialize the worker.
*/
static int JK_METHOD
-jk_worker_ajp14_validate(jk_env_t *env, jk_worker_t *_this,
+jk2_worker_ajp14_validate(jk_env_t *env, jk_worker_t *_this,
jk_map_t*props,
jk_workerEnv_t *we)
{
@@ -104,11 +104,11 @@
char *channelType;
aw = _this;
-_this-secret = jk_map_getStrProp( env, props,
+_this-secret = jk2_map_getStrProp( env, props,
worker, aw-name, secretkey, NULL );
_this-secret= _this-pool-pstrdup(env, _this-pool, _this-secret);
-channelType = jk_map_getStrProp( env, props,
+channelType = jk2_map_getStrProp( env, props,
worker, aw-name, channel, socket );
if( _this-channel == NULL ) {
@@ -140,7 +140,7 @@
/*
* Close the endpoint (clean buf and close socket)
*/
-static void jk_close_endpoint(jk_env_t *env, jk_endpoint_t *ae)
+static void jk2_close_endpoint(jk_env_t *env, jk_endpoint_t *ae)
{
env-l-jkLog(env, env-l, JK_LOG_INFO, endpoint.close() %s\n,
ae-worker-name);
@@ -155,7 +155,7 @@
/** Connect a channel, implementing the logging protocol if ajp14
*/
-static int jk_worker_ajp14_connect(jk_env_t *env, jk_endpoint_t *ae) {
+static int jk2_worker_ajp14_connect(jk_env_t *env, jk_endpoint_t *ae) {
jk_channel_t *channel=ae-worker-channel;
jk_msg_t *msg;
@@ -179,7 +179,7 @@
is a reconnect */
msg=ae-reply;
-jk_serialize_ping( env, msg, ae );
+jk2_serialize_ping( env, msg, ae );
err = ae-worker-channel-send( env, ae-worker-channel, ae, msg );
@@ -190,7 +190,7 @@
/* Anything but OK - the login failed
*/
if( err != JK_TRUE ) {
-jk_close_endpoint( env, ae );
+jk2_close_endpoint( env, ae );
}
return err;
}
@@ -204,7 +204,7 @@
fails, try to reconnect.
*/
static int JK_METHOD
-jk_worker_ajp14_sendAndReconnect(jk_env_t *env, jk_worker_t *worker,
+jk2_worker_ajp14_sendAndReconnect(jk_env_t *env, jk_worker_t *worker,
jk_ws_service_t *s,
jk_endpoint_t *e )
{
@@ -243,7 +243,7 @@
channel-close( env, channel, e );
-err=jk_worker_ajp14_connect(env, e);
+err=jk2_worker_ajp14_connect(env, e);
if( err != JK_TRUE ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
@@ -263,13 +263,13 @@
static int JK_METHOD
-jk_worker_ajp14_forwardStream(jk_env_t *env, jk_worker_t *worker,
+jk2_worker_ajp14_forwardStream(jk_env_t *env, jk_worker_t *worker,
jk_ws_service_t *s,
jk_endpoint_t *e )
{
int err;
-err=jk_worker_ajp14_sendAndReconnect( env, worker, s, e );
+err=jk2_worker_ajp14_sendAndReconnect( env, worker, s, e );
if( err!=JK_TRUE )
return err;
@@ -287,7 +287,7 @@
* for resend if the remote Tomcat is down, a fact we will learn only
* doing a read (not yet)
*/
-err=jk_serialize_postHead( env, e-post, s, e );
+err=jk2_serialize_postHead( env, e-post, s, e );
if (err != JK_TRUE ) {
/* the browser stop sending data, no need to recover */
@@ -325,7 +325,7 @@
}
static int JK_METHOD
-jk_worker_ajp14_forwardSingleThread(jk_env_t *env, jk_worker_t *worker,
+jk2_worker_ajp14_forwardSingleThread(jk_env_t *env, jk_worker_t *worker,
jk_ws_service_t *s,
jk_endpoint_t *e )
{
@@ -343,7 +343,7 @@
}
static int JK_METHOD
-jk_worker_ajp14_service1(jk_env_t *env, jk_worker_t *w,
+jk2_worker_ajp14_service1(jk_env_t *env, jk_worker_t *w,
jk_ws_service_t *s,
jk_endpoint_t *e )
{
@@ -374,7 +374,7 @@
/*
* We get here initial request (in reqmsg)
*/
-err=jk_serialize_request13(env, e-request, s, e);
+
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_env.c jk_handler_discovery.c jk_handler_logon.c jk_handler_response.c
hgomez 02/02/21 03:10:12
Modified:jk/native2/common jk_env.c jk_handler_discovery.c
jk_handler_logon.c jk_handler_response.c
Log:
Second batch of jk2 renaming
Revision ChangesPath
1.10 +17 -17jakarta-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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_env.c 6 Feb 2002 19:20:41 - 1.9
+++ jk_env.c 21 Feb 2002 11:10:12 - 1.10
@@ -62,37 +62,37 @@
/* Private methods
*/
-static void jk_env_initEnv( jk_env_t *env, char *id );
+static void jk2_env_initEnv( jk_env_t *env, char *id );
/* XXX We should have one env per thread to avoid sync problems.
The env will provide access to pools, etc
*/
-jk_env_t* JK_METHOD jk_env_getEnv( char *id, jk_pool_t *pool ) {
+jk_env_t* JK_METHOD jk2_env_getEnv( char *id, jk_pool_t *pool ) {
if( jk_env_globalEnv == NULL ) {
jk_env_globalEnv=(jk_env_t *)pool-calloc( NULL, pool, sizeof( jk_env_t ));
jk_env_globalEnv-globalPool = pool;
- jk_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
+ jk2_env_initEnv( (jk_env_t *)jk_env_globalEnv, id );
}
return jk_env_globalEnv;
}
/* Implementation */
-static jk_env_t * JK_METHOD jk_env_get( jk_env_t *env )
+static jk_env_t * JK_METHOD jk2_env_get( jk_env_t *env )
{
return NULL;
}
-static int JK_METHOD jk_env_put( jk_env_t *parent, jk_env_t *chld )
+static int JK_METHOD jk2_env_put( jk_env_t *parent, jk_env_t *chld )
{
return JK_TRUE;
}
-static jk_env_objectFactory_t JK_METHOD jk_env_getFactory(jk_env_t *env,
- const char *type,
- const char *name )
+static jk_env_objectFactory_t JK_METHOD jk2_env_getFactory(jk_env_t *env,
+ const char *type,
+ const char *name)
{
jk_env_objectFactory_t result;
/* malloc/free: this is really temporary, and is executed only at setup
@@ -117,8 +117,8 @@
return result;
}
-static void *jk_env_getInstance( jk_env_t *_this, jk_pool_t *pool,
- const char *type, const char *name )
+static void *jk2_env_getInstance(jk_env_t *_this, jk_pool_t *pool,
+ const char *type, const char *name)
{
jk_env_objectFactory_t fac;
void *result;
@@ -147,7 +147,7 @@
}
-static void JK_METHOD jk_env_registerFactory(jk_env_t *env,
+static void JK_METHOD jk2_env_registerFactory(jk_env_t *env,
const char *type,
const char *name,
jk_env_objectFactory_t fact)
@@ -165,14 +165,14 @@
env-_registry-put( env, env-_registry, typeName, fact, old );
}
-static void jk_env_initEnv( jk_env_t *env, char *id ) {
+static void jk2_env_initEnv( jk_env_t *env, char *id ) {
/* env-logger=NULL; */
/* map_alloc( env-properties ); */
- env-getFactory= jk_env_getFactory;
- env-registerFactory= jk_env_registerFactory;
- env-getInstance= jk_env_getInstance;
- jk_map_default_create( env, env-_registry, env-globalPool );
- jk_registry_init(env);
+ env-getFactory= jk2_env_getFactory;
+ env-registerFactory= jk2_env_registerFactory;
+ env-getInstance= jk2_env_getInstance;
+ jk2_map_default_create( env, env-_registry, env-globalPool );
+ jk2_registry_init(env);
}
1.11 +8 -8
jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c
Index: jk_handler_discovery.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_discovery.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_handler_discovery.c16 Dec 2001 23:18:11 - 1.10
+++ jk_handler_discovery.c21 Feb 2002 11:10:12 - 1.11
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Discovery handler
* Author: Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.10 $
+ * Version: $Revision: 1.11 $
*/
#include jk_global.h
@@ -72,7 +72,7 @@
#include jk_workerEnv.h
#include jk_registry.h
-int JK_METHOD jk_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_lb_worker.c jk_logger_file.c jk_map.c jk_md5.c jk_msg_ajp.c
hgomez 02/02/21 03:11:15
Modified:jk/native2/common jk_lb_worker.c jk_logger_file.c jk_map.c
jk_md5.c jk_msg_ajp.c
Log:
Third Batch of jk2 renaming
Revision ChangesPath
1.14 +21 -21jakarta-tomcat-connectors/jk/native2/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_lb_worker.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_lb_worker.c26 Jan 2002 06:56:25 - 1.13
+++ jk_lb_worker.c21 Feb 2002 11:11:15 - 1.14
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.13 $ *
+ * Version: $Revision: 1.14 $ *
***/
#include jk_pool.h
@@ -77,7 +77,7 @@
#define ADDITINAL_WAIT_LOAD (20)
-int JK_METHOD jk_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
void **result,char *type, char *name);
@@ -86,7 +86,7 @@
* This + ADDITIONAL_WAIT_LOAD will be set on all the workers
* that recover after an error.
*/
-static double get_max_lb(jk_worker_t *p)
+static double jk2_get_max_lb(jk_worker_t *p)
{
int i;
double rc = 0.0;
@@ -109,13 +109,13 @@
It'll also adjust the load balancing factors.
*/
-static jk_worker_t *get_most_suitable_worker(jk_env_t *env, jk_worker_t *p,
- jk_ws_service_t *s, int attempt)
+static jk_worker_t *jk2_get_most_suitable_worker(jk_env_t *env, jk_worker_t *p,
+ jk_ws_service_t *s, int attempt)
{
jk_worker_t *rc = NULL;
double lb_min = 0.0;
int i;
-char *session_route = jk_requtil_getSessionRoute(env, s);
+char *session_route = jk2_requtil_getSessionRoute(env, s);
if(session_route) {
for(i = 0 ; i p-num_of_workers ; i++) {
@@ -163,9 +163,9 @@
Since we don't directly connect to anything, there's no
need for an endpoint.
*/
-static int JK_METHOD service(jk_env_t *env,
- jk_worker_t *w,
- jk_ws_service_t *s)
+static int JK_METHOD jk2_lb_service(jk_env_t *env,
+jk_worker_t *w,
+jk_ws_service_t *s)
{
int attempt=0;
@@ -179,7 +179,7 @@
s-realWorker=NULL;
while(1) {
-jk_worker_t *rec = get_most_suitable_worker(env, w, s, attempt++);
+jk_worker_t *rec = jk2_get_most_suitable_worker(env, w, s, attempt++);
int rc;
s-is_recoverable_error = JK_FALSE;
@@ -200,7 +200,7 @@
if(rc==JK_TRUE) {
if(rec-in_recovering) {
-rec-lb_value = get_max_lb(rec) + ADDITINAL_WAIT_LOAD;
+rec-lb_value = jk2_get_max_lb(rec) + ADDITINAL_WAIT_LOAD;
}
rec-in_error_state = JK_FALSE;
rec-in_recovering = JK_FALSE;
@@ -236,8 +236,8 @@
return JK_FALSE;
}
-static int JK_METHOD validate(jk_env_t *env, jk_worker_t *_this,
- jk_map_t *props, jk_workerEnv_t *we)
+static int JK_METHOD jk2_lb_validate(jk_env_t *env, jk_worker_t *_this,
+ jk_map_t *props, jk_workerEnv_t *we)
{
int err;
char **worker_names;
@@ -251,7 +251,7 @@
return JK_FALSE;
}
-tmp=jk_map_getStrProp( env, props, worker, _this-name,
+tmp=jk2_map_getStrProp( env, props, worker, _this-name,
balanced_workers, NULL );
if( tmp==NULL ) {
env-l-jkLog(env, env-l, JK_LOG_ERROR,
@@ -259,7 +259,7 @@
return JK_FALSE;
}
-worker_names=jk_map_split( env, props, props-pool,
+worker_names=jk2_map_split( env, props, props-pool,
tmp, NULL, num_of_workers );
if( worker_names==NULL || num_of_workers==0 ) {
@@ -293,7 +293,7 @@
continue;
}
-tmp=jk_map_getStrProp( env, props, worker, name, lbfactor, NULL );
+tmp=jk2_map_getStrProp( env, props, worker, name, lbfactor, NULL );
if( tmp==NULL )
_this-lb_workers[i]-lb_factor = DEFAULT_LB_FACTOR;
else
@@ -320,7 +320,7 @@
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_objCache.c jk_pool.c jk_registry.c jk_registry.h
hgomez 02/02/21 03:12:11
Modified:jk/native2/common jk_objCache.c jk_pool.c jk_registry.c
jk_registry.h
Log:
Fourth batch of jk2 renaming
Revision ChangesPath
1.5 +9 -9 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_objCache.c 6 Feb 2002 19:14:50 - 1.4
+++ jk_objCache.c 21 Feb 2002 11:12:11 - 1.5
@@ -65,7 +65,7 @@
#include jk_objCache.h
static int
-jk_objCache_put(jk_env_t *env, jk_objCache_t *_this, void *obj)
+jk2_objCache_put(jk_env_t *env, jk_objCache_t *_this, void *obj)
{
int rc;
@@ -107,7 +107,7 @@
}
static int
-jk_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
+jk2_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
int i;
if( cacheSize = 0 ) {
@@ -136,7 +136,7 @@
}
static int
-jk_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
+jk2_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
int i;
JK_DELETE_CS((_this-cs), i);
@@ -149,7 +149,7 @@
static void *
-jk_objCache_get(jk_env_t *env, jk_objCache_t *_this )
+jk2_objCache_get(jk_env_t *env, jk_objCache_t *_this )
{
int rc;
void *ae=NULL;
@@ -168,7 +168,7 @@
return NULL;
}
-jk_objCache_t *jk_objCache_create(jk_env_t *env, jk_pool_t *pool ) {
+jk_objCache_t *jk2_objCache_create(jk_env_t *env, jk_pool_t *pool ) {
jk_objCache_t *_this=pool-calloc( env, pool, sizeof( jk_objCache_t ));
_this-pool=pool;
@@ -177,10 +177,10 @@
_this-size=0;
_this-maxSize=-1;
-_this-get=jk_objCache_get;
-_this-put=jk_objCache_put;
-_this-init=jk_objCache_init;
-_this-destroy=jk_objCache_destroy;
+_this-get=jk2_objCache_get;
+_this-put=jk2_objCache_put;
+_this-init=jk2_objCache_init;
+_this-destroy=jk2_objCache_destroy;
return _this;
}
1.6 +40 -40jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_pool.c 16 Dec 2001 23:29:55 - 1.5
+++ jk_pool.c 21 Feb 2002 11:12:11 - 1.6
@@ -58,7 +58,7 @@
/***
* Description: Simple memory pool *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***/
#include jk_pool.h
@@ -81,34 +81,34 @@
typedef struct jk_pool_private jk_pool_private_t;
-int jk_pool_create( jk_env_t *env, jk_pool_t **newPool,
+int jk2_pool_create( jk_env_t *env, jk_pool_t **newPool,
jk_pool_t *parent, int size );
-int JK_METHOD jk_pool_factory( jk_env_t *env, void **result,
+int JK_METHOD jk2_pool_factory( jk_env_t *env, void **result,
char *type, char *name);
-static jk_pool_t *jk_pool_createChild( jk_env_t *env,
- jk_pool_t *parent, int size );
+static jk_pool_t *jk2_pool_createChild(jk_env_t *env,
+ jk_pool_t *parent, int size);
-static void *jk_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p,
- size_t size);
+static void *jk2_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p,
+size_t size);
-static void jk_pool_reset(jk_env_t *env, jk_pool_t *p);
+static void jk2_pool_reset(jk_env_t *env, jk_pool_t *p);
-static void jk_pool_close(jk_env_t *env, jk_pool_t *p);
+static void jk2_pool_close(jk_env_t *env, jk_pool_t *p);
-static void *jk_pool_alloc(jk_env_t *env, jk_pool_t *p, size_t size);
+static void *jk2_pool_alloc(jk_env_t *env, jk_pool_t *p, size_t size);
-static void *jk_pool_calloc(jk_env_t *env, jk_pool_t *p, size_t size);
+static void *jk2_pool_calloc(jk_env_t *env, jk_pool_t *p, size_t size);
-static void *jk_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
+static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
-static void *jk_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,const void *old,
-
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_requtil.c jk_serialize_ajp.c jk_uriMap.c jk_vm_default.c
hgomez 02/02/21 03:13:23
Modified:jk/native2/common jk_requtil.c jk_serialize_ajp.c
jk_uriMap.c jk_vm_default.c
Log:
Fifth batch of jk2 renaming task
Revision ChangesPath
1.7 +13 -13jakarta-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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_requtil.c 26 Jan 2002 07:07:41 - 1.6
+++ jk_requtil.c 21 Feb 2002 11:13:23 - 1.7
@@ -70,7 +70,7 @@
#define CHUNK_BUFFER_PAD (12)
-const char *response_trans_headers[] = {
+static const char *response_trans_headers[] = {
Content-Type,
Content-Language,
Content-Length,
@@ -89,7 +89,7 @@
*
* long_res_header_for_sc
*/
-const char *jk_requtil_getHeaderById(jk_env_t *env, int sc)
+const char *jk2_requtil_getHeaderById(jk_env_t *env, int sc)
{
const char *rc = NULL;
if(sc = SC_RES_HEADERS_NUM sc 0) {
@@ -104,7 +104,7 @@
*
* sc_for_req_method
*/
-int jk_requtil_getMethodId(jk_env_t *env, const char *method,
+int jk2_requtil_getMethodId(jk_env_t *env, const char *method,
unsigned char *sc)
{
int rc = JK_TRUE;
@@ -162,7 +162,7 @@
*
* sc_for_req_header
*/
-int jk_requtil_getHeaderId(jk_env_t *env, const char *header_name,
+int jk2_requtil_getHeaderId(jk_env_t *env, const char *header_name,
unsigned short *sc)
{
switch(header_name[0]) {
@@ -251,7 +251,7 @@
/** Retrieve the cookie with the given name
*/
-char *jk_requtil_getCookieByName(jk_env_t *env, jk_ws_service_t *s,
+char *jk2_requtil_getCookieByName(jk_env_t *env, jk_ws_service_t *s,
const char *name)
{
int i;
@@ -289,7 +289,7 @@
/* Retrieve the parameter with the given name
*/
-char *jk_requtil_getPathParam(jk_env_t *env, jk_ws_service_t *s,
+char *jk2_requtil_getPathParam(jk_env_t *env, jk_ws_service_t *s,
const char *name)
{
char *id_start = NULL;
@@ -323,12 +323,12 @@
/** Retrieve session id from the cookie or the parameter
* (parameter first)
*/
-char *jk_requtil_getSessionId(jk_env_t *env, jk_ws_service_t *s)
+char *jk2_requtil_getSessionId(jk_env_t *env, jk_ws_service_t *s)
{
char *val;
-val = jk_requtil_getPathParam(env, s, JK_PATH_SESSION_IDENTIFIER);
+val = jk2_requtil_getPathParam(env, s, JK_PATH_SESSION_IDENTIFIER);
if(!val) {
-val = jk_requtil_getCookieByName(env, s, JK_SESSION_IDENTIFIER);
+val = jk2_requtil_getCookieByName(env, s, JK_SESSION_IDENTIFIER);
}
return val;
}
@@ -337,9 +337,9 @@
* the id of the worker that generated the session and where all
* further requests in that session will be sent.
*/
-char *jk_requtil_getSessionRoute(jk_env_t *env, jk_ws_service_t *s)
+char *jk2_requtil_getSessionRoute(jk_env_t *env, jk_ws_service_t *s)
{
-char *sessionid = jk_requtil_getSessionId(env, s);
+char *sessionid = jk2_requtil_getSessionId(env, s);
char *ch;
if(!sessionid) {
@@ -367,7 +367,7 @@
* Socket API didn't garanty all the data will be kept in a single
* read, so we must loop up to all awaited data are received
*/
-int jk_requtil_readFully(jk_env_t *env, jk_ws_service_t *s,
+int jk2_requtil_readFully(jk_env_t *env, jk_ws_service_t *s,
unsigned char *buf,
unsigned len)
{
@@ -409,7 +409,7 @@
*
* jk_init_ws_service
*/
-void jk_requtil_initRequest(jk_env_t *env, jk_ws_service_t *s)
+void jk2_requtil_initRequest(jk_env_t *env, jk_ws_service_t *s)
{
s-ws_private = NULL;
s-method = NULL;
1.6 +13 -13jakarta-tomcat-connectors/jk/native2/common/jk_serialize_ajp.c
Index: jk_serialize_ajp.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_serialize_ajp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_serialize_ajp.c26 Jan 2002 07:10:05 - 1.5
+++ jk_serialize_ajp.c21 Feb 2002 11:13:23 - 1.6
@@ -86,7 +86,7 @@
#define JK_AJP13_SHUTDOWN (unsigned char)7
-#define JK_AJP13_PING (unsigned char)8
+#define JK_AJP13_PING (unsigned char)8
/*
* Build the ping cmd. Tomcat will get control and will be able
@@ -99,8 +99,8 @@
* XXX Add optional Key/Value set .
*
*/
-int jk_serialize_ping(jk_env_t *env,
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_workerEnv.c jk_worker_jni.c jk_worker_run.c jk_worker_status.c
hgomez 02/02/21 03:13:59
Modified:jk/native2/common jk_workerEnv.c jk_worker_jni.c
jk_worker_run.c jk_worker_status.c
Log:
Sixth batch of renaming (how borred)
Revision ChangesPath
1.16 +64 -64jakarta-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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_workerEnv.c6 Feb 2002 19:16:25 - 1.15
+++ jk_workerEnv.c21 Feb 2002 11:13:59 - 1.16
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Author: Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.15 $ *
+ * Version: $Revision: 1.16 $ *
***/
#include jk_workerEnv.h
@@ -69,21 +69,21 @@
#define DEFAULT_WORKER (ajp13)
-int JK_METHOD jk_workerEnv_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
-static void jk_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this);
-static void jk_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this);
-static int jk_workerEnv_init1(jk_env_t *env, jk_workerEnv_t *_this);
+static void jk2_workerEnv_close(jk_env_t *env, jk_workerEnv_t *_this);
+static void jk2_workerEnv_initHandlers(jk_env_t *env, jk_workerEnv_t *_this);
+static int jk2_workerEnv_init1(jk_env_t *env, jk_workerEnv_t *_this);
-static int jk_workerEnv_init(jk_env_t *env, jk_workerEnv_t *workerEnv)
+static int jk2_workerEnv_init(jk_env_t *env, jk_workerEnv_t *workerEnv)
{
int err;
char *opt;
int options;
-opt=jk_map_getString( env, workerEnv-init_data, workerFile, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, workerFile, NULL );
if( opt != NULL ) {
struct stat statbuf;
@@ -109,7 +109,7 @@
workerEnv-worker_file,
workerEnv-init_data-size(env, workerEnv-init_data) );
-err=jk_map_readFileProperties(env, workerEnv-init_data,
+err=jk2_map_readFileProperties(env, workerEnv-init_data,
workerEnv-worker_file);
if( err==JK_TRUE ) {
env-l-jkLog(env, env-l, JK_LOG_INFO,
@@ -123,7 +123,7 @@
}
}
-opt=jk_map_getString( env, workerEnv-init_data, logLevel, Error );
+opt=jk2_map_getString( env, workerEnv-init_data, logLevel, Error );
if(0 == strcasecmp(opt, JK_LOG_INFO_VERB)) {
env-l-level=JK_LOG_INFO_LEVEL;
@@ -131,22 +131,22 @@
if(0 == strcasecmp(opt, JK_LOG_DEBUG_VERB)) {
env-l-level=JK_LOG_DEBUG_LEVEL;
}
-opt=jk_map_getString( env, workerEnv-init_data, logFile, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, logFile, NULL );
env-l-jkLog(env, env-l, JK_LOG_INFO, mod_jk.init_jk()\n );
env-l-open( env, env-l, workerEnv-init_data );
-opt=jk_map_getString( env, workerEnv-init_data, sslEnable, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, sslEnable, NULL );
workerEnv-ssl_enable = JK_TRUE;
-opt=jk_map_getString( env, workerEnv-init_data, httpsIndicator, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, httpsIndicator, NULL );
workerEnv-https_indicator = opt;
-opt=jk_map_getString( env, workerEnv-init_data, certsIndicator, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, certsIndicator, NULL );
workerEnv-certs_indicator = opt;
-opt=jk_map_getString( env, workerEnv-init_data, cipherIndicator, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, cipherIndicator, NULL );
workerEnv-cipher_indicator = opt;
-opt=jk_map_getString( env, workerEnv-init_data, sessionIndicator, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, sessionIndicator, NULL );
workerEnv-session_indicator = opt;
-opt=jk_map_getString( env, workerEnv-init_data, keySizeIndicator, NULL );
+opt=jk2_map_getString( env, workerEnv-init_data, keySizeIndicator, NULL );
workerEnv-key_size_indicator = opt;
/* Small change in how we treat options: we have a default,
@@ -154,25 +154,25 @@
of overriding the default ( -Option == no option, leave the
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_env.h jk_global.h jk_map.h jk_md5.h
hgomez 02/02/21 03:15:05 Modified:jk/native2/include jk_env.h jk_global.h jk_map.h jk_md5.h Log: Seventh Batch of jk2 renaming Revision ChangesPath 1.6 +4 -4 jakarta-tomcat-connectors/jk/native2/include/jk_env.h Index: jk_env.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_env.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_env.h 6 Feb 2002 19:18:21 - 1.5 +++ jk_env.h 21 Feb 2002 11:15:04 - 1.6 @@ -88,8 +88,8 @@ /** * Factory used to create all jk objects. Factories are registered with - * jk_env_registerFactory ( or automatically - LATER ), and created - * with jk_env_getFactory. + * jk2_env_registerFactory ( or automatically - LATER ), and created + * with jk2_env_getFactory. * * Essentially, an abstract base class (or factory class) with a single * method -- think of it as createWorker() or the Factory Method Design @@ -112,7 +112,7 @@ /** Get a pointer to the jk_env. We could support multiple * env 'instances' in future - for now it's a singleton. */ -jk_env_t* JK_METHOD jk_env_getEnv( char *id, struct jk_pool *pool ); +jk_env_t* JK_METHOD jk2_env_getEnv( char *id, struct jk_pool *pool ); #define JK_LINE __FILE__,__LINE__ @@ -216,7 +216,7 @@ struct jk_exception *lastException; }; -void JK_METHOD jk_registry_init(jk_env_t *env); +void JK_METHOD jk2_registry_init(jk_env_t *env); #ifdef __cplusplus 1.4 +4 -4 jakarta-tomcat-connectors/jk/native2/include/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_global.h 12 Jan 2002 04:43:04 - 1.3 +++ jk_global.h 21 Feb 2002 11:15:04 - 1.4 @@ -59,7 +59,7 @@ * Description: Global definitions and include files that should exist * * anywhere * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.3 $ * + * Version: $Revision: 1.4 $ * ***/ #ifndef JK_GLOBAL_H @@ -77,10 +77,10 @@ #include sys/stat.h /** START OF AREA TO MODIFY BEFORE RELEASING */ -#define JK_VERMAJOR 1 -#define JK_VERMINOR 2 +#define JK_VERMAJOR 2 +#define JK_VERMINOR 0 #define JK_VERFIX 0 -#define JK_VERSTRING1.2.0 +#define JK_VERSTRING2.0.0 /* Beta number */ #define JK_VERBETA 1 1.9 +13 -13jakarta-tomcat-connectors/jk/native2/include/jk_map.h Index: jk_map.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_map.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk_map.h 12 Jan 2002 04:43:46 - 1.8 +++ jk_map.h 21 Feb 2002 11:15:04 - 1.9 @@ -58,7 +58,7 @@ /*** * Description: Map object header file * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.8 $ * + * Version: $Revision: 1.9 $ * ***/ #ifndef JK_MAP_H @@ -118,7 +118,7 @@ void *_private; }; -int jk_map_default_create(struct jk_env *env, jk_map_t **m, +int jk2_map_default_create(struct jk_env *env, jk_map_t **m, struct jk_pool *pool); /* int map_open(jk_env *env, jk_map_t *m); */ @@ -130,10 +130,10 @@ * on any map. */ -char *jk_map_getString(struct jk_env *env, struct jk_map *m, +char *jk2_map_getString(struct jk_env *env, struct jk_map *m, const char *name, char *def); -int jk_map_getBool(struct jk_env *env, struct jk_map *m, +int jk2_map_getBool(struct jk_env *env, struct jk_map *m, const char *prop, const char *def); /** Get a string property, using the worker's style @@ -141,18 +141,18 @@ will be used. Example worker.ajp13.host=localhost. */ -char *jk_map_getStrProp(struct jk_env *env, jk_map_t *m, +char *jk2_map_getStrProp(struct jk_env *env, jk_map_t *m, const char *objType, const char
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_msg.h jk_objCache.h jk_pool.h jk_requtil.h
hgomez 02/02/21 03:15:52 Modified:jk/native2/include jk_msg.h jk_objCache.h jk_pool.h jk_requtil.h Log: Eigth Batch of renaming (zzz zzz zzz) Revision ChangesPath 1.5 +2 -2 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_msg.h 26 Jan 2002 06:22:41 - 1.4 +++ jk_msg.h 21 Feb 2002 11:15:51 - 1.5 @@ -171,7 +171,7 @@ /** * Special method. Will read data from the server and add them as - * bytes. It is equivalent with jk_requtil_readFully() in a buffer + * bytes. It is equivalent with jk2_requtil_readFully() in a buffer * and then jk_msg_appendBytes(), except that we use directly the * internal buffer. * @@ -196,7 +196,7 @@ }; /* Temp */ -jk_msg_t *jk_msg_ajp_create(struct jk_env *env, struct jk_pool *p, +jk_msg_t *jk2_msg_ajp_create(struct jk_env *env, struct jk_pool *p, int buffSize); #ifdef __cplusplus 1.6 +1 -1 jakarta-tomcat-connectors/jk/native2/include/jk_objCache.h Index: jk_objCache.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_objCache.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_objCache.h 6 Feb 2002 19:19:16 - 1.5 +++ jk_objCache.h 21 Feb 2002 11:15:51 - 1.6 @@ -78,7 +78,7 @@ #define JK_OBJCACHE_DEFAULT_SZ (128) -jk_objCache_t *jk_objCache_create(struct jk_env *env, struct jk_pool *pool ); +jk_objCache_t *jk2_objCache_create(struct jk_env *env, struct jk_pool *pool ); /** * Simple object cache ( or pool for java people - don't confuse with the 1.6 +2 -2 jakarta-tomcat-connectors/jk/native2/include/jk_pool.h Index: jk_pool.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_pool.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_pool.h 16 Dec 2001 23:17:23 - 1.5 +++ jk_pool.h 21 Feb 2002 11:15:51 - 1.6 @@ -58,7 +58,7 @@ /*** * Description: Memory Pool object header file * * Author: Gal Shachor [EMAIL PROTECTED] * - * Version: $Revision: 1.5 $ * + * Version: $Revision: 1.6 $ * ***/ #ifndef _JK_POOL_H #define _JK_POOL_H @@ -159,7 +159,7 @@ XXX move this to the factory */ -int jk_pool_create( struct jk_env *env, jk_pool_t **newPool, jk_pool_t *parent, int size ); +int jk2_pool_create( struct jk_env *env, jk_pool_t **newPool, jk_pool_t *parent, int size ); #ifdef __cplusplus 1.4 +9 -9 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_requtil.h 16 Dec 2001 23:17:23 - 1.3 +++ jk_requtil.h 21 Feb 2002 11:15:51 - 1.4 @@ -154,50 +154,50 @@ /** Get header value using a lookup table. */ -const char *jk_requtil_getHeaderById(struct jk_env *env, int sc); +const char *jk2_requtil_getHeaderById(struct jk_env *env, int sc); /** * Get method id. */ -int jk_requtil_getMethodId(struct jk_env *env, const char*method, +int jk2_requtil_getMethodId(struct jk_env *env, const char*method, unsigned char *sc); /** * Get header id. */ -int jk_requtil_getHeaderId(struct jk_env *env, const char *header_name, +int jk2_requtil_getHeaderId(struct jk_env *env, const char *header_name, unsigned short *sc); /** Retrieve session id from the cookie or the parameter * (parameter first) */ -char *jk_requtil_getSessionId(struct jk_env *env, jk_ws_service_t *s); +char *jk2_requtil_getSessionId(struct jk_env *env, jk_ws_service_t *s); /** Retrieve the cookie with the given name */ -char *jk_requtil_getCookieByName(struct jk_env *env, jk_ws_service_t *s, +char *jk2_requtil_getCookieByName(struct jk_env *env, jk_ws_service_t *s,
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jk_channeljni_native.c jk_jni_aprImpl.c
hgomez 02/02/21 03:17:17
Modified:jk/native2/jni jk_channeljni_native.c jk_jni_aprImpl.c
Log:
Nineth Batch of jk2 renaming
Revision ChangesPath
1.2 +3 -3 jakarta-tomcat-connectors/jk/native2/jni/jk_channeljni_native.c
Index: jk_channeljni_native.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jk_channeljni_native.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_channeljni_native.c26 Jan 2002 07:13:02 - 1.1
+++ jk_channeljni_native.c21 Feb 2002 11:17:17 - 1.2
@@ -58,7 +58,7 @@
/***
* Description: JNI callbacks implementation for the JNI in process adapter*
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***/
#include jk_jnicb.h
@@ -67,7 +67,7 @@
#include jk_env.h
-int jk_channel_jni_javaSendPacket
+int jk2_channel_jni_javaSendPacket
(JNIEnv *jniEnv, jobject o, jlong envJ, jlong eP, jlong s, jbyteArray data,
jint len);
@@ -80,6 +80,6 @@
(JNIEnv *jniEnv, jobject o, jlong envJ, jlong eP, jlong s, jbyteArray data,
jint len)
{
-return (jint)jk_channel_jni_javaSendPacket( jniEnv, o, envJ, eP,
+return (jint)jk2_channel_jni_javaSendPacket( jniEnv, o, envJ, eP,
s, data, len);
}
1.6 +3 -3 jakarta-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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_jni_aprImpl.c 14 Jan 2002 09:36:13 - 1.5
+++ jk_jni_aprImpl.c 21 Feb 2002 11:17:17 - 1.6
@@ -113,14 +113,14 @@
return 0;
}
-static void jkSigAction(int signal) {
+static void jk2_SigAction(int signal) {
}
static struct sigaction jkAction;
/* XXX We need to: - preserve the old signal ( or get them ) - either
- implement waitSignal or use invocation in jkSigAction
+ implement waitSignal or use invocation in jk2_SigAction
Probably waitSignal() is better ( we can have a thread that waits )
*/
@@ -130,7 +130,7 @@
jobject func)
{
memset( jkAction, 0, sizeof(jkAction));
-jkAction.sa_handler=jkSigAction;
+jkAction.sa_handler=jk2_SigAction;
sigaction((int)bitMask, jkAction, (void *) NULL);
return 0;
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_apache2.h jk_logger_apache2.c jk_map_aprtable.c jk_pool_apr.c
hgomez 02/02/21 03:18:06
Modified:jk/native2/server/apache2 jk_apache2.h jk_logger_apache2.c
jk_map_aprtable.c jk_pool_apr.c
Log:
Tenth Batch of jK2 renaming (you know what I'm happy)
Revision ChangesPath
1.4 +6 -6 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h
Index: jk_apache2.h
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_apache2.h 16 Dec 2001 23:36:58 - 1.3
+++ jk_apache2.h 21 Feb 2002 11:18:05 - 1.4
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.3 $
+ * Version: $Revision: 1.4 $
*/
#include jk_global.h
@@ -73,21 +73,21 @@
#include jk_requtil.h
-int jk_service_apache2_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_service_apache2_factory(jk_env_t *env, jk_pool_t *pool,
void **result, char *type, char *name);
-int jk_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
void **result, char *type, char *name);
-int jk_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
void **result, char *type, char *name);
-int jk_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
char *type, char *name);
/* Temp. - we should use the factory ( we may need few changes ) */
-int jk_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
+int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
apr_pool_t *aprPool);
1.13 +9 -9
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_logger_apache2.c 6 Jan 2002 09:06:02 - 1.12
+++ jk_logger_apache2.c 21 Feb 2002 11:18:05 - 1.13
@@ -87,12 +87,12 @@
#define HUGE_BUFFER_SIZE (8*1024)
-int JK_METHOD jk_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
char *type, char *name);
-static int jk_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
+static int jk2_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
int level,
const char *what)
{
@@ -100,18 +100,18 @@
}
-static int jk_logger_apache2_open(jk_env_t *env, jk_logger_t *_this,
+static int jk2_logger_apache2_open(jk_env_t *env, jk_logger_t *_this,
jk_map_t *properties )
{
return JK_TRUE;
}
-static int jk_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
+static int jk2_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
{
return JK_TRUE;
}
-static int jk_logger_apache2_jkLog(jk_env_t *env, jk_logger_t *l,
+static int jk2_logger_apache2_jkLog(jk_env_t *env, jk_logger_t *l,
const char *file,
int line,
int level,
@@ -168,7 +168,7 @@
}
-int jk_logger_apache2_factory(jk_env_t *env,
+int jk2_logger_apache2_factory(jk_env_t *env,
jk_pool_t *pool,
void **result,
char *type,
@@ -181,10 +181,10 @@
return JK_FALSE;
}
-l-log = jk_logger_apache2_log;
+l-log = jk2_logger_apache2_log;
l-logger_private = NULL;
-l-open =jk_logger_apache2_open;
-l-jkLog = jk_logger_apache2_jkLog;
+l-open =jk2_logger_apache2_open;
+l-jkLog = jk2_logger_apache2_jkLog;
l-level=JK_LOG_ERROR_LEVEL;
1.6 +17 -17
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 jk_service_apache2.c
hgomez 02/02/21 03:18:59
Modified:jk/native2/server/apache2 jk_service_apache2.c
Log:
Still jk2 renaming, but also an update which use strcasecmp
in on/off/true/false util func
Revision ChangesPath
1.8 +26 -26
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_service_apache2.c 26 Jan 2002 07:13:47 - 1.7
+++ jk_service_apache2.c 21 Feb 2002 11:18:59 - 1.8
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor [EMAIL PROTECTED]
* Henri Gomez [EMAIL PROTECTED]
- * Version: $Revision: 1.7 $
+ * Version: $Revision: 1.8 $
*/
#include apu_compat.h
@@ -96,7 +96,7 @@
#define NULL_FOR_EMPTY(x) ((x !strlen(x)) ? NULL : x)
-static int JK_METHOD jk_service_apache2_head(jk_env_t *env, jk_ws_service_t *s )
+static int JK_METHOD jk2_service_apache2_head(jk_env_t *env, jk_ws_service_t *s )
{
int h;
request_rec *r;
@@ -167,9 +167,9 @@
* the jk_ws_service class. Think of the *s param as a this or self
* pointer.
*/
-static int JK_METHOD jk_service_apache2_read(jk_env_t *env, jk_ws_service_t *s,
- void *b, unsigned len,
- unsigned *actually_read)
+static int JK_METHOD jk2_service_apache2_read(jk_env_t *env, jk_ws_service_t *s,
+ void *b, unsigned len,
+ unsigned *actually_read)
{
if(s s-ws_private b actually_read) {
if(!s-read_body_started) {
@@ -207,8 +207,8 @@
#define CHUNK_SIZE 4096
#endif
-static int JK_METHOD jk_service_apache2_write(jk_env_t *env, jk_ws_service_t *s,
- const void *b, int len)
+static int JK_METHOD jk2_service_apache2_write(jk_env_t *env, jk_ws_service_t *s,
+ const void *b, int len)
{
if(s s-ws_private b) {
if(len) {
@@ -277,7 +277,7 @@
/* Utility functions */
/* = */
-static int get_content_length(jk_env_t *env, request_rec *r)
+static int jk2_get_content_length(jk_env_t *env, request_rec *r)
{
if(r-clength 0) {
return r-clength;
@@ -295,8 +295,8 @@
return 0;
}
-static int init_ws_service(jk_env_t *env, jk_ws_service_t *s,
- jk_worker_t *worker, void *serverObj)
+static int jk2_init_ws_service(jk_env_t *env, jk_ws_service_t *s,
+ jk_worker_t *worker, void *serverObj)
{
apr_port_t port;
char *ssl_temp = NULL;
@@ -306,7 +306,7 @@
/* Common initialization */
/* XXX Probably not needed, we're duplicating */
-jk_requtil_initRequest(env, s);
+jk2_requtil_initRequest(env, s);
s-ws_private = r;
s-response_started = JK_FALSE;
@@ -336,7 +336,7 @@
s-server_software = (char *)ap_get_server_version();
s-method = (char *)r-method;
-s-content_length = get_content_length(env, r);
+s-content_length = jk2_get_content_length(env, r);
s-is_chunked = r-read_chunked;
s-no_more_chunks = 0;
s-query_string = r-args;
@@ -427,14 +427,14 @@
/* We can't do that - the filtering should happen in
common to enable that.
- jk_map_aprtable_factory( workerEnv-env, s-pool,
+ jk2_map_aprtable_factory( workerEnv-env, s-pool,
s-attributes,
map, aprtable );
s-attributes-init( NULL, s-attributes, 0, XXX);
*/
-jk_map_default_create(env, s-attributes, s-pool );
+jk2_map_default_create(env, s-attributes, s-pool );
#else
-jk_map_default_create(env, s-attributes, s-pool );
+jk2_map_default_create(env, s-attributes, s-pool );
#endif
if(workerEnv-envvars_in_use) {
@@ -453,12 +453,12 @@
}
#ifdef USE_APRTABLES
-jk_map_aprtable_factory( env, s-pool,
+jk2_map_aprtable_factory( env, s-pool,
(void *)s-headers_in,
map, aprtable );
s-headers_in-init( env, s-headers_in, 0,
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk.c
hgomez 02/02/21 03:21:45
Modified:jk/native2/server/apache2 mod_jk.c
Log:
Last part of jk2 renaming
All Jk directive renamed to Jk2 to be able to have installed at the same
time mod_jk 1.x and mod_jk 2.x
Corrected also Jk(2)Worker directive, now you could use :
Jk2Worker myajp13 port 8009
Jk2Worker myajp13 host localhost
Jk2Worker myajp13 type ajp13
Jk2Worker myajp13 lbfactor 1
instead of
Jk2Setworker.myajp13.port 8009
Jk2Setworker.myajp13.host localhost
Jk2Setworker.myajp13.type ajp13
Jk2Setworker.myajp13.lbfactor 1
Revision ChangesPath
1.20 +99 -96jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_jk.c 6 Feb 2002 19:20:59 - 1.19
+++ mod_jk.c 21 Feb 2002 11:21:45 - 1.20
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.19 $ *
+ * Version: $Revision: 1.20 $ *
***/
/*
@@ -95,10 +95,10 @@
#include jk_apache2.h
-#define JK_HANDLER (jakarta-servlet)
-#define JK_MAGIC_TYPE (application/x-jakarta-servlet)
+#define JK_HANDLER (jakarta-servlet2)
+#define JK_MAGIC_TYPE (application/x-jakarta-servlet2)
-module AP_MODULE_DECLARE_DATA jk_module;
+module AP_MODULE_DECLARE_DATA jk2_module;
static jk_workerEnv_t *workerEnv;
@@ -133,13 +133,13 @@
*/
/**
- * In order to define a webapp you must add JkWebapp directive
+ * In order to define a webapp you must add Jk2Webapp directive
* in a Location.
*
* Example:
* VirtualHost foo.com
* Location /examples
- * JkWebapp worker ajp13
+ * Jk2Webapp worker ajp13
* /Location
* /VirtualHost
*
@@ -148,7 +148,7 @@
* of hosts and thousands of webapplications ), 'natural' to any
* apache user.
*/
-static const char *jk_setWebapp(cmd_parms *cmd, void *per_dir,
+static const char *jk2_setWebapp(cmd_parms *cmd, void *per_dir,
const char *name, const char *val)
{
jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
@@ -173,7 +173,7 @@
ap_pstrdup(cmd-pool, val));
}
-fprintf(stderr, JkWebapp %s %s dir=%s args=%s\n,
+fprintf(stderr, Jk2Webapp %s %s dir=%s args=%s\n,
uriEnv-webapp-workerName, cmd-path,
cmd-directive-directive,
cmd-directive-args);
@@ -187,12 +187,12 @@
* Example:
* VirtualHost foo.com
* Location /examples/servlet
- * JkServlet name servlet
+ * Jk2Servlet name servlet
* /Location
* /VirtualHost
*/
-static const char *jk_setServlet(cmd_parms *cmd, void *per_dir,
-const char *name, const char *val)
+static const char *jk2_setServlet(cmd_parms *cmd, void *per_dir,
+ const char *name, const char *val)
{
jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
@@ -216,14 +216,14 @@
/**
* Set jk options.
*
- * JkFoo value is equivalent with a foo=value setting in
+ * Jk2Foo value is equivalent with a foo=value setting in
* workers.properties. ( XXX rename workers.properties to jk.properties)
*
* We are using a small trick to avoid duplicating the code ( the 'dummy'
* parm ). The values are validated and initalized in jk_init.
*/
-static const char *jk_set1(cmd_parms *cmd, void *per_dir,
- const char *value)
+static const char *jk2_set1(cmd_parms *cmd, void *per_dir,
+const char *value)
{
server_rec *s = cmd-server;
struct stat statbuf;
@@ -232,14 +232,14 @@
jk_env_t *env;
jk_uriEnv_t *serverEnv=(jk_uriEnv_t *)
-ap_get_module_config(s-module_config, jk_module);
+ap_get_module_config(s-module_config, jk2_module);
jk_workerEnv_t *workerEnv = serverEnv-workerEnv;
jk_map_t *m=workerEnv-init_data;
env=workerEnv-globalEnv;
-value = jk_map_replaceProperties(env, m, m-pool, value);
+value = jk2_map_replaceProperties(env, m, m-pool, value);
if( cmd-info != NULL ) {
/* Multi-option config. */
RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk.c
There is still a problem with Jk2Worker directive (arg)
I'm working on it
-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .)
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Thursday, February 21, 2002 12:22 PM
To: [EMAIL PROTECTED]
Subject: cvs commit:
jakarta-tomcat-connectors/jk/native2/server/apache2
mod_jk.c
hgomez 02/02/21 03:21:45
Modified:jk/native2/server/apache2 mod_jk.c
Log:
Last part of jk2 renaming
All Jk directive renamed to Jk2 to be able to have installed
at the same
time mod_jk 1.x and mod_jk 2.x
Corrected also Jk(2)Worker directive, now you could use :
Jk2Worker myajp13 port 8009
Jk2Worker myajp13 host localhost
Jk2Worker myajp13 type ajp13
Jk2Worker myajp13 lbfactor 1
instead of
Jk2Setworker.myajp13.port 8009
Jk2Setworker.myajp13.host localhost
Jk2Setworker.myajp13.type ajp13
Jk2Setworker.myajp13.lbfactor 1
Revision ChangesPath
1.20 +99 -96
jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c
Index: mod_jk.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/m
od_jk.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mod_jk.c 6 Feb 2002 19:20:59 - 1.19
+++ mod_jk.c 21 Feb 2002 11:21:45 - 1.20
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
*
* Author: Gal Shachor [EMAIL PROTECTED]
*
* Henri Gomez [EMAIL PROTECTED]
*
- * Version: $Revision: 1.19 $
*
+ * Version: $Revision: 1.20 $
*
***
/
/*
@@ -95,10 +95,10 @@
#include jk_apache2.h
-#define JK_HANDLER (jakarta-servlet)
-#define JK_MAGIC_TYPE (application/x-jakarta-servlet)
+#define JK_HANDLER (jakarta-servlet2)
+#define JK_MAGIC_TYPE (application/x-jakarta-servlet2)
-module AP_MODULE_DECLARE_DATA jk_module;
+module AP_MODULE_DECLARE_DATA jk2_module;
static jk_workerEnv_t *workerEnv;
@@ -133,13 +133,13 @@
*/
/**
- * In order to define a webapp you must add JkWebapp directive
+ * In order to define a webapp you must add Jk2Webapp directive
* in a Location.
*
* Example:
* VirtualHost foo.com
* Location /examples
- * JkWebapp worker ajp13
+ * Jk2Webapp worker ajp13
* /Location
* /VirtualHost
*
@@ -148,7 +148,7 @@
* of hosts and thousands of webapplications ), 'natural' to any
* apache user.
*/
-static const char *jk_setWebapp(cmd_parms *cmd, void *per_dir,
+static const char *jk2_setWebapp(cmd_parms *cmd, void *per_dir,
const char *name, const char *val)
{
jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
@@ -173,7 +173,7 @@
ap_pstrdup(cmd-pool, val));
}
-fprintf(stderr, JkWebapp %s %s dir=%s args=%s\n,
+fprintf(stderr, Jk2Webapp %s %s dir=%s args=%s\n,
uriEnv-webapp-workerName, cmd-path,
cmd-directive-directive,
cmd-directive-args);
@@ -187,12 +187,12 @@
* Example:
* VirtualHost foo.com
* Location /examples/servlet
- * JkServlet name servlet
+ * Jk2Servlet name servlet
* /Location
* /VirtualHost
*/
-static const char *jk_setServlet(cmd_parms *cmd, void *per_dir,
-const char *name, const char *val)
+static const char *jk2_setServlet(cmd_parms *cmd, void *per_dir,
+ const char *name, const char *val)
{
jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)per_dir;
@@ -216,14 +216,14 @@
/**
* Set jk options.
*
- * JkFoo value is equivalent with a foo=value setting in
+ * Jk2Foo value is equivalent with a foo=value setting in
* workers.properties. ( XXX rename workers.properties to
jk.properties)
*
* We are using a small trick to avoid duplicating the code
( the 'dummy'
* parm ). The values are validated and initalized in jk_init.
*/
-static const char *jk_set1(cmd_parms *cmd, void *per_dir,
- const char *value)
+static const char *jk2_set1(cmd_parms *cmd, void *per_dir,
+const char *value)
{
server_rec *s = cmd-server;
struct stat statbuf;
@@ -232,14 +232,14 @@
jk_env_t *env;
Re: DO NOT REPLY [Bug 6598] - The Implicate mapping of TLDs in packaged libraries no longer works
Pardon me... Where should we create the temp directory ? [EMAIL PROTECTED] wrote: DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT . ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6598 The Implicate mapping of TLDs in packaged libraries no longer works [EMAIL PROTECTED] changed: What |Removed |Added Status|NEW |RESOLVED Resolution| |DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-02-20 22:57 --- This is a known issue. Just create a 'temp' subdirectory, and the issue should go away. *** This bug has been marked as a duplicate of 6400 *** -- To unsubscribe, e-mail: For additional commands, e-mail: - Do You Yahoo!? Yahoo! Sports - Coverage of the 2002 Olympic Games
Release servlet-api-4
For the project I'm working on (http://www.mmbase.org) I would like to download a servlet 2.3 comptible servlet.jar with the build.xml. I'v been using the daily build, but these get deleted after a while. Is it possible to make a milestone/release/rc/whatever build that will stay available for automated downloads? Jaco -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6609] New: - SendMailServlet.java is not compiled even if javamail is installed correctly
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6609.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6609
SendMailServlet.java is not compiled even if javamail is installed correctly
Summary: SendMailServlet.java is not compiled even if javamail
is installed correctly
Product: Tomcat 4
Version: 4.0.2 Final
Platform: All
OS/Version: All
Status: NEW
Severity: Normal
Priority: Other
Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Hi,
compiling Tomcat 4.0.2 Final I detected the following problem:
Even if you place javamail to the correct directory (which is also
said by catalina/build.xml) and set full.dist=on
webapps/examples/WEB-INF/classes/SendMailServlet.java won't be compiled thus
breaking the mail jsp example.
Taking a look at webapps/examples/build.xml I noticed that
webapps/examples/WEB-INF/classes/SendMailServlet.java will be compiled only if
compile.javamail is set (line 81). Running ant flags in webapps/examples says
that compile.javamail will be set. In my opinion the problem seems that the
target flags is not used by any other targets as dependency. So I added flags as
dependency to the target build-prepare, recompiled Tomcat and
webapps/examples/WEB-INF/classes/SendMailServlet.java got compiled.
Adding the dependency is done by the following Patch:
--- jakarta-tomcat-4.0.2-src.orig/webapps/examples/build.xmlSun Feb 10 20:11
+++ jakarta-tomcat-4.0.2-src/webapps/examples/build.xml Thu Feb 21 11:26:53 2002
@@ -53,7 +53,7 @@
/target
!-- === BUILD: Create Directories == --
- target name=build-prepare
+ target name=build-prepare depends=flags
mkdir dir=${webapps.build}/
mkdir dir=${webapps.build}/${webapp.name}/
/target
Is this ok? Any comments?
Best regards
Rüdiger Plüm
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: Release servlet-api-4
Get jakarta-servletapi-4-src.tar.gz in http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0/src/ yes, it should be also copied in 4.0.2 release (ASAP) - Henri Gomez ___[_] EMAIL : [EMAIL PROTECTED](. .) PGP KEY : 697ECEDD...oOOo..(_)..oOOo... PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 -Original Message- From: Jaco de Groot [mailto:[EMAIL PROTECTED]] Sent: Thursday, February 21, 2002 1:15 PM To: [EMAIL PROTECTED] Subject: Release servlet-api-4 For the project I'm working on (http://www.mmbase.org) I would like to download a servlet 2.3 comptible servlet.jar with the build.xml. I'v been using the daily build, but these get deleted after a while. Is it possible to make a milestone/release/rc/whatever build that will stay available for automated downloads? Jaco -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6610] New: - Request-Time Attribute Expressions in XML-Syntax JSPs not working
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6610. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6610 Request-Time Attribute Expressions in XML-Syntax JSPs not working Summary: Request-Time Attribute Expressions in XML-Syntax JSPs not working Product: Tomcat 4 Version: 4.0.2 Final Platform: All OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Jasper AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The Request-Time Attribute Expressions in XML coded JSPs are not working. JSP-Syntax: my:tag attribute=%= some-java-code % / should be the same as my:tag attribute=%= some-java-code % / in a XML-coded JSP page. This doesn't work, the strings %= ... % is forwarded unevaluated. See JSP Spec V 1.2 (JSP.5.3.11) for details. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Release servlet-api-4
GOMEZ Henri wrote: Get jakarta-servletapi-4-src.tar.gz in http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0/src/ Ok, tanx. Jaco -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6612] New: - Can set headers twice
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6612. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6612 Can set headers twice Summary: Can set headers twice Product: Tomcat 4 Version: 4.0.2 Final Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] According the the HTTP RFC (2616) section 4.2 Multiple message-header fields with the same field-name MAY be present in a message if and only if the entire field-value for that header field is defined as a comma-separated list [i.e., #(values)]. In tomcat 4.02 I can do the following response.addHeader(Content-Length, 113); response.addHeader(Content-Length, 83); and the reponse will contain both Content-Length headers. Same is true for other headers. I realise this is a stupid thing to do but a library I'm using (the JAXM ref impl) does this and causes problems for another Jakarta 'product' (httpclient). Should TC check for this duplicates and only allow through the headers that are allowed to be duplicate: (Accept-Ranges; Allow; Cache-Control;Connection;Content-Encoding;Content- Language;Pragma;Proxy-Authenticate;Trailer;Transfer- Encoding;Upgrade;Via;Warning;WWW-Authenticate) I think are the headers (and TC doesn't necessarily support all of these) Kevin Jones -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
On Wed, 20 Feb 2002, Bill Barker wrote: IMHO, beyond Pier's and Remy's requirements, this will never fly in the real world. I don't see any way that you are going to convince webmasters (including me) to relax the sandbox enough to allow this. Bill, this solution is what all servlet container are doing ( except tomcat ). Look at any servlet container that runs on port 80 on unix, and you'll find a small JNI library that change the user id. For tomcat3.x - we don't need that too much because it's far better to start as non-root from the beginning, and use a real web server on 80. But assuming we would want to, I'm not sure 'deamon' would work without major modifications in tomcat ( to implement its model ), and I'm not sure how many other applications will fit the model, and I'm not sure I want to make the 'daemon' a requirement. I like the sourceforge's wrapper a lot, that's what I would use, and I know many other solutions in use for starting and keeping java programms alive that don't impose such requirements. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
On Thu, 21 Feb 2002, GOMEZ Henri wrote: BTW: Did there is plan to port mod_jk/2.0.0 to Apache 1.3 and IIS/iPlanet/Domino ? Of course, but my primary goal is to clean the code and refactor it - and making it work well with Apache2.0. It should be reasonably easy to write the adapters for the other ( few days for each to get it running ). One of the changes in jk2 is that it allows better integration with the server - it can use the 'native' logger, 'native' maps, pools - and fall back to either APR or the 'original' impl. ( you don't need to send diffs, just check in and if there are problems we'll fix them ). Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
BTW: Did there is plan to port mod_jk/2.0.0 to Apache 1.3 and IIS/iPlanet/Domino ? Of course, but my primary goal is to clean the code and refactor it - and making it work well with Apache2.0. It should be reasonably easy to write the adapters for the other ( few days for each to get it running ). One of the changes in jk2 is that it allows better integration with the server - it can use the 'native' logger, 'native' maps, pools - and fall back to either APR or the 'original' impl. Ok, I'd like to have mod_jk 2.x with Apache 1.3 and may be with/without APR... ( you don't need to send diffs, just check in and if there are problems we'll fix them ). What about renaming mod_jk.c in native2 to mod_jk2.c Reason : To be able to use construction like : IfModule mod_jk.c ... handle jk directives ... /IfModule IfModule mod_jk2.c ... handle jk2 directives ... /IfModule BTW, I've got problems with Cookies with JK2, it seems to loop and fill all my error logs. Also I've got problem when using Include to load jk2 directives. I'm investigating -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6616] New: - date headers not working properly
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6616.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6616
date headers not working properly
Summary: date headers not working properly
Product: Tomcat 3
Version: 3.3 Final
Platform: Other
OS/Version: Other
Status: NEW
Severity: Normal
Priority: Other
Component: Unknown
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Under regular use, DateTool.format1123(...) does not work.
The logic used to determine when to use the cached date/date String is
incorrect (it uses % instead of /). This is particularly nasty when the
persistence mechanism only has precision to the second (most file systems and
DB's), as the RFC 1123 String representation of date headers will not change
once it has been set once. This renders getLastModified(HttpServletRequest)
useless.
The caching of the data is not Thread-safe and it also does not reflect the
date format being used.
A simple correction is just:
public static String format1123( Date d ) {
return rfc1123Format.format( d );
}
public static String format1123( Date d,DateFormat df ) {
return df.format( d );
}
I don't know if the code to support proper synchronization and date-format
storage would ultimately offset the cost of SimpleDateFormat.format(...).
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6614] New: - Have Bootstrap and StandardClassLoader use the same ClassLoader
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6614. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6614 Have Bootstrap and StandardClassLoader use the same ClassLoader Summary: Have Bootstrap and StandardClassLoader use the same ClassLoader Product: Tomcat 4 Version: 4.0.2 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Enhancement Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I'm starting tomcat through a URLClassLoader than knows where the tomcat Bootstrap.jar and tools.jar are. However, tomcat fails to start because it can't find org.apache.catalina.loader.Reloader (see the backtrace at the end of the message). I believe the problem is because of the lines in Bootstrap: commonLoader = ClassLoaderFactory.createClassLoader(unpacked, packed, null); Since the parent classloader is null, a StandardclassLoader is created that uses the ClassLoader.getSystemClassLoader() rather than my class loader. I think if you change the line from null to this.getClass().getClassLoader() it would then use my class loader and tomcat could start. java.lang.reflect.InvocationTargetException: java.lang.NoClassDefFoundError: org/apache/catalina/loader/Reloader at java.lang.ClassLoader.defineClass0(Native Method) at java.lang.ClassLoader.defineClass(ClassLoader.java:486) at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:111) at java.net.URLClassLoader.defineClass(URLClassLoader.java:248) at java.net.URLClassLoader.access$100(URLClassLoader.java:56) at java.net.URLClassLoader$1.run(URLClassLoader.java:195) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:188) at org.apache.catalina.loader.StandardClassLoader.findClass(StandardClassLoader.jav a:671) at org.apache.catalina.loader.StandardClassLoader.loadClass(StandardClassLoader.jav a:1090) at org.apache.catalina.loader.StandardClassLoader.loadClass(StandardClassLoader.jav a:989) at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:313) at org.apache.catalina.core.StandardContext.start(StandardContext.java:3313) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1123) at org.apache.catalina.core.StandardHost.start(StandardHost.java:612) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1123) at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:307) at org.apache.catalina.core.StandardService.start(StandardService.java:388) at org.apache.catalina.core.StandardServer.start(StandardServer.java:505) at org.apache.catalina.startup.Catalina.start(Catalina.java:776) at org.apache.catalina.startup.Catalina.execute(Catalina.java:681) at org.apache.catalina.startup.Catalina.process(Catalina.java:179) at java.lang.reflect.Method.invoke(Native Method) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:243) at TomcatBootstrap.start(TomcatBootstrap.java:8) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6557] - isapi_redirector can not handle post request from netscape 4.7x
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6557. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6557 isapi_redirector can not handle post request from netscape 4.7x [EMAIL PROTECTED] changed: What|Removed |Added Component|Connectors |HTTP/1.1 Connector Product|Tomcat 3|Tomcat 4 Version|3.3 Release Candidate 2 |Unknown --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 16:22 --- why does nobody response? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6557] - isapi_redirector can not handle post request from netscape 4.7x
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6557. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6557 isapi_redirector can not handle post request from netscape 4.7x --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 16:19 --- Created an attachment (id=1222) dump of data thru http -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
AW: mod_jk suggestion, add request logging option
Hi, what about adding 'port' to the list. For lb workers the worker would be the real one used not 'loadbalancer', right? I think it would be really helpful to have this log level. Cheers, Hans -Ursprungliche Nachricht- Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]Im Auftrag von Glenn Nielsen Gesendet: Donnerstag, 21. Februar 2002 16:57 An: Tomcat Developers List Betreff: Re: mod_jk suggestion, add request logging option Updated list of fields for request logging. Timestamp worker host URI Status (OK, FAIL, etc) Latency (Time in ms or us to handle request) Glenn Glenn Nielsen wrote: Currently mod_jk has four logging levels - (debug,info,error,emerg). I suggest a fifth log level be added called request. (debug, info, request, error, emerg) This log level would log each request with the following possible info, what info is logged could be controlled by an new config option JkLogRequestFormat. Timestamp URI Status (OK, FAIL, etc) Latency (Time in ms or us to handle request) And there may be other fields of interest to add to the above list. I am most interested in using mod_jk to log the request latency for Tomcat to handle different requests so that statistics can be generated. Having mod_jk do this instead of Tomcat avoids violating the heisenberg principal. Regards, Glenn -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 1450] - Incorrect encode URL with session ID
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1450. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1450 Incorrect encode URL with session ID [EMAIL PROTECTED] changed: What|Removed |Added Severity|Major |Enhancement Priority|High|Medium --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 17:11 --- I'm standing by my prior resolution. If you don't agree, you can submit a patch. Thanks. I'll leave the bug open this time, as this could indeed be considered an enhancement. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6612] - Can set headers twice
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6612. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6612 Can set headers twice [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 17:13 --- This has already been files a while ago. *** This bug has been marked as a duplicate of 3878 *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 3878] - Multiple Content-Type and Content-Length headers in response
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3878. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3878 Multiple Content-Type and Content-Length headers in response [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 17:13 --- *** Bug 6612 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: problem in Struts sample code
Forwarding to STRUTS-DEV, where this belongs. Craig On Thu, 21 Feb 2002, teik wrote: Date: Thu, 21 Feb 2002 19:46:47 +0900 From: teik [EMAIL PROTECTED] Reply-To: Tomcat Developers List [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: problem in Struts sample code Hello, I found error in Struts sample code. ServletEngine fails in compilation for an unnecessary semicolon. struts-exercise-taglib/html-select.jsp --- html-select.jsp Sat Jan 12 06:34:48 2002 +++ html-select.jsp Thu Feb 21 19:19:36 2002 @@ -1,4 +1,4 @@ -%@ page language=java import=java.util.*, org.apache.struts.webapp.exercise.*;% +%@ page language=java import=java.util.*, org.apache.struts.webapp.exercise.*% %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % - teik, E-Mail [EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
On Wed, 20 Feb 2002, Bill Barker wrote: IMHO, beyond Pier's and Remy's requirements, this will never fly in the real world. I don't see any way that you are going to convince webmasters (including me) to relax the sandbox enough to allow this. Bill, this solution is what all servlet container are doing ( except tomcat ). Look at any servlet container that runs on port 80 on unix, and you'll find a small JNI library that change the user id. For tomcat3.x - we don't need that too much because it's far better to start as non-root from the beginning, and use a real web server on 80. But assuming we would want to, I'm not sure 'deamon' would work without major modifications in tomcat ( to implement its model ), and I'm not sure how many other applications will fit the model, and I'm not sure I want to make the 'daemon' a requirement. I like the sourceforge's wrapper a lot, that's what I would use, and I know many other solutions in use for starting and keeping java programms alive that don't impose such requirements. I didn't write either APIs. Someone on the commons mentioned this project, so I went there. It seems to me that omitting the 'init' method is a glaring omission. The native part of the code looks miles ahead of damon's code, though :) The project looks inactive, so maybe it would be possible to talk to the authors and merge ? Eventually, this could end up as a top level project at Jakarta (seems useful enough functionality for me). Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 6598] - The Implicate mapping of TLDs in packaged libraries no longer works
Pardon me... Where should we create the temp directory ? In CATALINA_HOME (where else ?). Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6617] New: - Iterating over session attribute name enumeration fails with a ConcurrentModificationException on org.apache.catalina.util.Enumerator.nextElement(Enumerator.java:166);
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6617.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6617
Iterating over session attribute name enumeration fails with a
ConcurrentModificationException on
org.apache.catalina.util.Enumerator.nextElement(Enumerator.java:166);
Summary: Iterating over session attribute name enumeration fails
with a ConcurrentModificationException on
org.apache.catalina.util.Enumerator.nextElement(Enumerat
or.java:166);
Product: Tomcat 4
Version: 4.0.1 Final
Platform: All
OS/Version: Other
Status: NEW
Severity: Critical
Priority: Other
Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
Attempting to clean up the session by iterating over the enumeration of
attribute names fails with a ConcurrentModificationException on
org.apache.catalina.util.Enumerator.nextElement(Enumerator.java:166);
=CODE=
Enumeration enumeration = session.getAttributeNames();
System.out.println(Enum: + enumeration);
while(enumeration.hasMoreElements()) {
String name = null;
try{
name = (String)enumeration.nextElement();
}
catch(Throwable t){
System.out.println(Caught Throwable while getting next element from
enumeration. name: + name);
t.printStackTrace();
break;
}
System.out.println(Attempting to remove from enumeration: + name);
session.removeAttribute(name);
System.out.println(Done removing from enumeration: + name + .);
}
=LOG==
Cleaning up the session...
Enumeration: org.apache.catalina.util.Enumerator@f2225f
Attempting to remove from enumeration: mk
Done removing from enumeration: mk.
Caught Throwable while getting next element from enumeration. name: null
java.util.ConcurrentModificationException
at java.util.HashMap$HashIterator.nextEntry(HashMap.java:750)
at java.util.HashMap$KeyIterator.next(HashMap.java:786)
at org.apache.catalina.util.Enumerator.nextElement(Enumerator.java:166)
at com.bredex.servlet.Login.service(Login.java:113)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:853)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter
(ApplicationFilterChain.java:247)
at org.apache.catalina.core.ApplicationFilterChain.doFilter
(ApplicationFilterChain.java:193)
at org.apache.catalina.core.StandardWrapperValve.invoke
(StandardWrapperValve.java:243)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:943)
at org.apache.catalina.core.StandardContextValve.invoke
(StandardContextValve.java:201)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.valves.CertificatesValve.invoke
(CertificatesValve.java:246)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:943)
at org.apache.catalina.core.StandardContext.invoke
(StandardContext.java:2344)
at org.apache.catalina.core.StandardHostValve.invoke
(StandardHostValve.java:164)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.valves.ErrorDispatcherValve.invoke
(ErrorDispatcherValve.java:170)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.valves.ErrorReportValve.invoke
(ErrorReportValve.java:170)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.valves.AccessLogValve.invoke
(AccessLogValve.java:462)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:564)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at org.apache.catalina.core.ContainerBase.invoke(ContainerBase.java:943)
at org.apache.catalina.core.StandardEngineValve.invoke
(StandardEngineValve.java:163)
at org.apache.catalina.core.StandardPipeline.invokeNext
(StandardPipeline.java:566)
at org.apache.catalina.core.StandardPipeline.invoke
(StandardPipeline.java:472)
at
DO NOT REPLY [Bug 6557] - isapi_redirector can not handle post request from netscape 4.7x
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6557. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6557 isapi_redirector can not handle post request from netscape 4.7x [EMAIL PROTECTED] changed: What|Removed |Added Component|HTTP/1.1 Connector |Connectors Product|Tomcat 4|Tomcat 3 Version|Unknown |3.3 Final --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 17:43 --- Changing it back to Tomcat3 since the data supplied is for Tomcat 3.3. Based on your attached data, please try Ajp13 and see if the problem is still present there. Ajp12 is deprecated in Tomcat 3.3 (i.e. bugs aren't likely to be fixed) and isn't supported at all in Tomcat 4.x. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6494] - Tomcat 4.0.2 could not start from W2k service after adding webapps conf
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6494. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6494 Tomcat 4.0.2 could not start from W2k service after adding webapps conf --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 18:06 --- Hi, Remy, We have solvt this problem. It is from the ODBC. We should use system DSN, not user DSN. Thanks for your help. Dayong -- 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_jk.c
hgomez 02/02/21 10:13:18
Modified:jk/native2/server/apache2 mod_jk.c
Log:
Jk2Worker works now as needed, note it just use Jk2_set2
Revision ChangesPath
1.21 +15 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c
Index: mod_jk.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_jk.c 21 Feb 2002 11:21:45 - 1.20
+++ mod_jk.c 21 Feb 2002 18:13:17 - 1.21
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Henri Gomez [EMAIL PROTECTED] *
- * Version: $Revision: 1.20 $ *
+ * Version: $Revision: 1.21 $ *
***/
/*
@@ -284,6 +284,8 @@
env=workerEnv-globalEnv;
+fprintf( stderr, jk2_set2 : name=%s value=%s\n, name, value);
+
value = jk2_map_replaceProperties(env, m, m-pool, value);
if(value==NULL)
@@ -324,6 +326,15 @@
static const char *jk2_setWorker(cmd_parms *cmd,void *per_dir,
const char *wname, const char *wparam, const char
*value)
{
+#ifndef OLD_WAY
+
+char * name;
+name = ap_pstrcat(cmd-pool, worker., wname, ., wparam, NULL);
+/* fprintf( stderr, jk2_setWorker : name=%s value=%s\n, name, value); */
+return (jk2_set2(cmd, per_dir, name, value));
+
+#else
+
server_rec *s = cmd-server;
struct stat statbuf;
char *oldv;
@@ -339,9 +350,8 @@
jk_map_t *m=workerEnv-init_data;
env=workerEnv-globalEnv;
-
-nvalue = ap_pstrcat(cmd-pool, worker., wname, wparam);
-/* fprintf( stderr, wname=%s wparam=%s value=%s\n, wname, wparam, value); */
+nvalue = ap_pstrcat(cmd-pool, worker., wname, ., wparam, NULL); */
+/* fprintf( stderr, wname=%s wparam=%s value=%s zvalue=%s nvalue=%s\n, wname,
wparam, value, zvalue, nvalue); */
value = jk2_map_replaceProperties(env, m, m-pool, nvalue);
if(value==NULL)
@@ -351,6 +361,8 @@
/* ap_pstrdup(cmd-pool,name), */
/* ap_pstrdup(cmd-pool,value)); */
return NULL;
+
+#endif
}
/* Command table.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: mod_jk suggestion, add request logging option
On Thu, 21 Feb 2002, Glenn Nielsen wrote: Currently mod_jk has four logging levels - (debug,info,error,emerg). I suggest a fifth log level be added called request. (debug, info, request, error, emerg) This log level would log each request with the following possible info, what info is logged could be controlled by an new config option JkLogRequestFormat. +1, I don't know if I'll have time to help too much, but it's a good idea. However it may be easier to use the apache logger for that - it provides most of the info you need ( the access log ), and if you need more it is reasonably easy to add ( i.e. as a contribution to httpd project, or just create a new access log module that extends the current one. This is general-purpose and used for all requets. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
On Thu, 21 Feb 2002, GOMEZ Henri wrote: logger, 'native' maps, pools - and fall back to either APR or the 'original' impl. Ok, I'd like to have mod_jk 2.x with Apache 1.3 and may be with/without APR... I start to have doubts about supporting mod_jk2 without APR - we should keep doing that at least until APR is officially released and until we have a working mod_jk2 for IIS/etc using APR. After that we can deprecate/remove the duplicated code ( pool, map). ( you don't need to send diffs, just check in and if there are problems we'll fix them ). What about renaming mod_jk.c in native2 to mod_jk2.c If you talk about the module name - I think that's absolutely required. This is a very good solution for backward compatiblity - keep the old code around, it's the most backward compatible, and gradually move to the new one ( driven by new features like faster channels, etc ) That requires making both versions 'coexist', and that requires renaming the module and the conflicting directives. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re[2]: Re[2]: cvs commit: jakarta-tomcat-connectors/jk/java/
The nightlies are for the HEAD branch, not the 4.0 branch. In the HEAD: - tomcat-jk.jar is JK 1.x; that's equivalent to the current tomcat-ajp.jar - tomcat-jk2.jar is JK 2.x The two are independent. I guess tonight's nightly should pick up the changes. The fix for the ajp connector authentication issue is in the 4.0 branch tomcat-ajp.jar. When do these changes get merged back into the head branch tomcat-jk.jar? The nightly build of tomcat-jk.jar still has the bug in Ajp13Request so the JK1.x solution latest build won't support authentication through the connector if jk1.x is used. String remoteUser = ajp.remoteUser().toString(); if(remoteUser != null) setUserPrincipal(new Ajp13Principal(remoteUser)); Jonathan This email and any files transmitted with it are for the named person's use only. It may contain confidential, proprietary or legally privileged information. No confidentiality or privilege is waived or lost by any mistransmission. If you receive this message in error, please immediately delete it and all copies of it from your system, destroy any hard copies of it and notify the sender. You must not, directly or indirectly, use, disclose, distribute, print, or copy any part of this message if you are not the intended recipient. This email message has been swept by a virus software product for the presence of computer viruses. * -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector ResponseBase.java
remm02/02/21 10:23:35 Modified:catalina/src/share/org/apache/catalina/connector ResponseBase.java Log: - Tweak the code so that in the case of an unsupported encoding exception, the stream isn't initialized. Revision ChangesPath 1.24 +9 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java Index: ResponseBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ResponseBase.java 21 Feb 2002 06:06:35 - 1.23 +++ ResponseBase.java 21 Feb 2002 18:23:35 - 1.24 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.23 2002/02/21 06:06:35 remm Exp $ - * $Revision: 1.23 $ - * $Date: 2002/02/21 06:06:35 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.24 2002/02/21 18:23:35 remm Exp $ + * $Revision: 1.24 $ + * $Date: 2002/02/21 18:23:35 $ * * * @@ -89,7 +89,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.23 $ $Date: 2002/02/21 06:06:35 $ + * @version $Revision: 1.24 $ $Date: 2002/02/21 18:23:35 $ */ public abstract class ResponseBase @@ -750,11 +750,12 @@ throw new IllegalStateException (sm.getString(responseBase.getWriter.ise)); -stream = createOutputStream(); -((ResponseStream) stream).setCommit(false); +ResponseStream newStream = (ResponseStream) createOutputStream(); +newStream.setCommit(false); OutputStreamWriter osr = - new OutputStreamWriter(stream, getCharacterEncoding()); -writer = new ResponseWriter(osr, (ResponseStream) stream); +new OutputStreamWriter(newStream, getCharacterEncoding()); +writer = new ResponseWriter(osr, newStream); +stream = newStream; return (writer); } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
Ok, I'd like to have mod_jk 2.x with Apache 1.3 and may be with/without APR... I start to have doubts about supporting mod_jk2 without APR - we should keep doing that at least until APR is officially released and until we have a working mod_jk2 for IIS/etc using APR. After that we can deprecate/remove the duplicated code ( pool, map). ( you don't need to send diffs, just check in and if there are problems we'll fix them ). What about renaming mod_jk.c in native2 to mod_jk2.c If you talk about the module name - I think that's absolutely required. mv mod_jk.c mod_jk2.c, ok ? This is a very good solution for backward compatiblity - keep the old code around, it's the most backward compatible, and gradually move to the new one ( driven by new features like faster channels, etc ) That requires making both versions 'coexist', and that requires renaming the module and the conflicting directives. Done, I'll modify mod_jk.c to mod_jk2.c ASAP -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
On Thu, 21 Feb 2002, Remy Maucherat wrote: I didn't write either APIs. Someone on the commons mentioned this project, so I went there. It seems to me that omitting the 'init' method is a glaring omission. The native part of the code looks miles ahead of damon's code, though :) Having an init() method is a good idea, and the way deamon works is not bad - it's an usefull feature. However it's not the only way to do things - and I prefer to not depend on the wrapper that starts tomcat to do it ( there are many other good ways to start tomcat without requiring the daemon ) The project looks inactive, so maybe it would be possible to talk to the authors and merge ? Eventually, this could end up as a top level project at Jakarta (seems useful enough functionality for me). A big +1 from me. It can start in commons, I think would be a _very_ usefull component. The more I look at the wrapper code, the more I like it. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6621] New: - mod_webapp hangs when page is hit before the first page is finished loading
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6621. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6621 mod_webapp hangs when page is hit before the first page is finished loading Summary: mod_webapp hangs when page is hit before the first page is finished loading Product: Tomcat 4 Version: 4.0.2 Final Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Blocker Priority: Other Component: Webapp Connector AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Running Apache 1.3.22, Tomcat 4.0.2, Win2K SP2 When I first access the page, It loads fairly slowly, and not all images show up all the time. If I click refresh, or if somebody else goes to that page before my page is finished, whoever hits the site second gets: WebApp: Error 500 (File: pr_warp.c Line: 438) Invalid packet 16 Both Apache and Tomcat are still running at this point. All subsequent hits return the same error until Both Apache and Tomcat are restarted. Here are the error logs: somehost.com-error.log [Thu Feb 21 11:15:11 2002] [error] Invalid packet 16 [Thu Feb 21 11:15:11 2002] [error] Communitcation interrupted [Thu Feb 21 11:15:11 2002] [error] Communitcation interrupted [Thu Feb 21 11:15:17 2002] [error] Invalid packet 16 [Thu Feb 21 11:15:17 2002] [error] Communitcation interrupted [Thu Feb 21 11:15:17 2002] [error] Communitcation interrupted apache_log.2002-02-21.txt 2002-02-21 11:17:35 WarpHost[somehost.com]: Mapping request for Host 2002-02-21 11:17:35 [org.apache.catalina.connector.warp.WarpConnection] Exception on socket java.net.SocketException: Connection aborted by peer: socket write error at java.net.SocketOutputStream.socketWrite(Native Method) at java.net.SocketOutputStream.write(SocketOutputStream.java:65) at org.apache.catalina.connector.warp.WarpConnection.send (WarpConnection.java:219) at org.apache.catalina.connector.warp.WarpResponse$Stream.close (WarpResponse.java:301) at org.apache.catalina.connector.warp.WarpResponse$Stream.finish (WarpResponse.java:311) at org.apache.catalina.connector.warp.WarpResponse.finishResponse (WarpResponse.java:152) at org.apache.catalina.connector.warp.WarpRequestHandler.handle (WarpRequestHandler.java:222) at org.apache.catalina.connector.warp.WarpConnection.run (WarpConnection.java:194) at java.lang.Thread.run(Thread.java:484) This sometimes causes Apache to crash, generating errors: [error] Connection conn cannot connect [error] Cannot open connection conn [error] Cannot shutdown conn [error] Cannot shutdown conn Is this related to bug 3509 or 4793? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: mod_jk suggestion, add request logging option
I suggest a fifth log level be added called request. (debug, info, request, error, emerg) This log level would log each request with the following possible info, what info is logged could be controlled by an new config option JkLogRequestFormat. +1, I don't know if I'll have time to help too much, but it's a good idea. However it may be easier to use the apache logger for that - it provides most of the info you need ( the access log ), and if you need more it is reasonably easy to add ( i.e. as a contribution to httpd project, or just create a new access log module that extends the current one. This is general-purpose and used for all requets. Some may want to have this kind of debug also on IIS/iPlanet ? So will have to format the log message to apache logger and of course flat file on non Apache Web Servers ;) If you, requesters, have any code to add such stuff, I'll be happy to review and make necessary adaptation for mod_jk 1.2/2.0 ;) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: mod_jk suggestion, add request logging option
GOMEZ Henri wrote: These features could be added to mod_jk 1.2.0 (native) and 2.0.0 (native2) in jakarta-tomcat-connectors. What is the status of mod_jk (2) 1.2 and Ajp 14? mod_jk 1.2 is the original mod_jk from TC 3.3, with little cleanup. mod_jk 2.0 is a serious rewrite of mod_jk, using OO in C (Costin like OO), which will support ajp14. ajp14 is now a sort of ajp13++, as it works on ajp13 connections , but add extras features. As such an Ajp14 Java side connector is also an Ajp13 connector (Ajp13++ in fact) I went back through alot of the proposals and followup emails on the list, but I am unsure of where development of these is at. The works is in progress :) The mod_jk in TC 3.3 is now feature freezed Fine with me. -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
That requires making both versions 'coexist', and that requires renaming the module and the conflicting directives. Done, I'll modify mod_jk.c to mod_jk2.c ASAP Well I'll rename and update build files this nigth (CET) and will commit tomorrow morning (CET) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: mod_jk suggestion, add request logging option
OK, I think that explains it. So mod_jk 2.0 and Ajp14 are still in development, and it may be a while before they are finished. Depends on how many people will help, a known story ;) What about mod_jk 1.2, when will that be ready for production use? Ready to use, I'm using it since TC 4.0.2 release against TC 3.3 and 4.0.2 boxes without problems -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
On Thu, 21 Feb 2002, GOMEZ Henri wrote: If you talk about the module name - I think that's absolutely required. mv mod_jk.c mod_jk2.c, ok ? Change build.xml to generate mod_jk2.so, and the internal name ( so LoadModule will work ). Renaming mod_jk.c to mod_jk2.c doesn't help too much, but it's ok ( and will be more consistent). Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
On Thu, 21 Feb 2002, GOMEZ Henri wrote: If you talk about the module name - I think that's absolutely required. mv mod_jk.c mod_jk2.c, ok ? Change build.xml to generate mod_jk2.so, and the internal name ( so LoadModule will work ). Renaming mod_jk.c to mod_jk2.c doesn't help too much, but it's ok ( and will be more consistent). mod_jk2.c is mandatory for : IfModule mod_jk2.c ... handle jk2 directives ... /IfModule That's why renaming is mandatory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: jk2 renaming - need revue and comments
Renaming mod_jk.c to mod_jk2.c doesn't help too much, but it's ok ( and will be more consistent). mod_jk2.c is mandatory for : IfModule mod_jk2.c ... handle jk2 directives ... /IfModule That's why renaming is mandatory Urg, sorry for all these mandatory words ;? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: mod_jk suggestion, add request logging option
On Thu, 21 Feb 2002, Glenn Nielsen wrote: OK, I think that explains it. So mod_jk 2.0 and Ajp14 are still in development, and it may be a while before they are finished. What is the status of mod_jk (2) 1.2 and Ajp 14? My opinion: Jk2 supports all the features from jk1 ( and some more ). There are probably some new bugs and some old bugs that still need to be ported, but feature-wise the code can replace jk1 as soon as there is enough will and interest to do so. For the first release of jk2 the major goal is to be 'as good or better' than jk1. It is already a bit faster, IMHO it's much cleaner, and it has some nice extra features - that may not be yet ready ( like unix sockets, I think only me and JFC tested it ). But as a replacement for jk1, jk2 is already as good ( most of the code for ajp13 was just cutpasted ). All it needs is 3-4 tomcat commiters who are willing to review and play with the code - and we can move to beta. I don't plan too many more changes in the APIs, except those requeted by reviewers. On the java side things are much better, I did a lot of testing of the low level stuff and there are many optimizations ( like C2B conversions, etc ). It'll probably be most visible on tomcat4, but also tomcat33 will see some benefits from the new connector. Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpResponseBase.java
remm02/02/21 11:02:10 Modified:catalina/src/share/org/apache/catalina/connector HttpResponseBase.java Log: - Don't encode if the session is not URL based, rather than don't encode if the session is cookie based. - Fixes 6600. - Patch submitted by Stefan Wengi sgw at adnovum.com Revision ChangesPath 1.47 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java Index: HttpResponseBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- HttpResponseBase.java 21 Feb 2002 18:30:57 - 1.46 +++ HttpResponseBase.java 21 Feb 2002 19:02:10 - 1.47 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.46 2002/02/21 18:30:57 remm Exp $ - * $Revision: 1.46 $ - * $Date: 2002/02/21 18:30:57 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.47 2002/02/21 19:02:10 remm Exp $ + * $Revision: 1.47 $ + * $Date: 2002/02/21 19:02:10 $ * * * @@ -104,7 +104,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.46 $ $Date: 2002/02/21 18:30:57 $ + * @version $Revision: 1.47 $ $Date: 2002/02/21 19:02:10 $ */ public class HttpResponseBase @@ -506,7 +506,7 @@ HttpSession session = hreq.getSession(false); if (session == null) return (false); -if (hreq.isRequestedSessionIdFromCookie()) +if (!hreq.isRequestedSessionIdFromURL()) return (false); // Is this a valid absolute URL? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
On Thu, 21 Feb 2002, Remy Maucherat wrote: I didn't write either APIs. Someone on the commons mentioned this project, so I went there. It seems to me that omitting the 'init' method is a glaring omission. The native part of the code looks miles ahead of damon's code, though :) Having an init() method is a good idea, and the way deamon works is not bad - it's an usefull feature. However it's not the only way to do things - and I prefer to not depend on the wrapper that starts tomcat to do it ( there are many other good ways to start tomcat without requiring the daemon ) If it's good ways to start tomcat as a daemon, then I disagree (except if it's when embedded through JNI in Apache). At best, it will work as good as with the daemon code, so why bother ? The project looks inactive, so maybe it would be possible to talk to the authors and merge ? Eventually, this could end up as a top level project at Jakarta (seems useful enough functionality for me). A big +1 from me. It can start in commons, I think would be a _very_ usefull component. The more I look at the wrapper code, the more I like it. Ok, I'll send then an email. And would participate in the project ? Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
Remy, Remy Maucherat wrote: Ok, I'll send then an email. And would participate in the project ? If it allows me to start Tomcat and all of the other tools (e.g. jspc, etc.) without shell or batch scripts, count me in. Patrick -- _ Patrick Luby Email: [EMAIL PROTECTED] Sun Microsystems Phone: 408-276-7471 901 San Antonio Road, USCA14-303 Palo Alto, CA 94303-4900 _ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
On Thu, 21 Feb 2002, Patrick Luby wrote: Ok, I'll send then an email. And would participate in the project ? If it allows me to start Tomcat and all of the other tools (e.g. jspc, etc.) without shell or batch scripts, count me in. It allows to start tomcat or any server process, monitors it and restarts it if it dies. And it provide the same interface on windows and unix, integrating in the service manager for windows and using a C deamon on unix. It can be used to start all other tools - with all the control you want ( like setting classpaths, JVM parameters, etc ). BTW, tomcat already provide a way to start itself without any scripts ( i.e. java -jar tomcat.jar / java -jar catalina.jar ), and in 3.3 most tools can be started this way. Creating few additional executable jars for jspc, etc is quite easy and doesn't require any native code. You can use some of the 3.3 introspection code that will 'guess' the CLASSPATH from the command line and construct the class path - it is almost completely equivalent with tomcat.sh. ( the only missing part is that you can't set jvm parameters after you started, but that can be solved with an exec ). Costin -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6623] New: - HTMLManagerServlet broken in JDK 1.4 version of Tomcat 4.0.2 Final
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6623. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6623 HTMLManagerServlet broken in JDK 1.4 version of Tomcat 4.0.2 Final Summary: HTMLManagerServlet broken in JDK 1.4 version of Tomcat 4.0.2 Final Product: Tomcat 4 Version: 4.0.2 Final Platform: PC OS/Version: Linux Status: NEW Severity: Normal Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The org.apache.catalina.servlets.ManagerServlet seems to work fine in the jakarta-tomcat-4.0.2-LE-jdk14 release of Tomcat. However, the org.apache.catalina.servlets.HTMLManagerServlet throws the following exception when fetching the /manager/list url: java.lang.IllegalStateException: Current state = FLUSHED, new state = CODING_END at java.nio.charset.CharsetEncoder.throwIllegalStateException (CharsetEncoder.java:933) at java.nio.charset.CharsetEncoder.encode(CharsetEncoder.java:529) at sun.nio.cs.StreamEncoder$CharsetSE.flushLeftoverChar (StreamEncoder.java:356) at sun.nio.cs.StreamEncoder$CharsetSE.implClose(StreamEncoder.java:413) at sun.nio.cs.StreamEncoder.close(StreamEncoder.java:158) at java.io.OutputStreamWriter.close(OutputStreamWriter.java:222) at java.io.PrintWriter.close(PrintWriter.java:137) at org.apache.catalina.connector.ResponseBase.finishResponse (ResponseBase.java:482) at org.apache.catalina.connector.HttpResponseBase.finishResponse (HttpResponseBase.java:236) at org.apache.catalina.connector.http.HttpResponseImpl.finishResponse (HttpResponseImpl.java:288) at org.apache.catalina.connector.http.HttpProcessor.process (HttpProcessor.java:1039) at org.apache.catalina.connector.http.HttpProcessor.run (HttpProcessor.java:1107) at java.lang.Thread.run(Thread.java:536) -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6519] - Problem with HTMLManagerServlet when running JDK1.4
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6519. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6519 Problem with HTMLManagerServlet when running JDK1.4 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 21:10 --- *** Bug 6623 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 1450] - Incorrect encode URL with session ID
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1450. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1450 Incorrect encode URL with session ID --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:01 --- [PATCH] Hello! Here is my patch against Tomcat 4.0.2 sources The file is located at catalina/src/share/org/apache/catalina/connector --- HttpResponseBase.java.orig Thu Feb 21 21:53:02 2002 +++ HttpResponseBase.java Thu Feb 21 21:51:38 2002 @@ -715,6 +715,10 @@ if ((url == null) || (sessionId == null)) return (url); + if (url.indexOf(;jsessionid= + sessionId) != -1) + return (url); + + String path = url; String query = ; String anchor = ; I would really appreciate it if someone with CVS commit access committed this. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6628] New: - Can't specify application specific XML parsers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628
Can't specify application specific XML parsers
Summary: Can't specify application specific XML parsers
Product: Tomcat 4
Version: 4.0.2 Final
Platform: All
OS/Version: All
Status: NEW
Severity: Major
Priority: Other
Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
In org.apache.catalina.loader.WebappClassloader there are a set of
defined triggers which prevent certain classes from being loaded:
private static final String[] classTriggers = {
javax.net.,// JSSE added in 1.4
javax.security.cert., // JSSE added in 1.4
javax.naming., // JNDI added in 1.3
javax.xml.,// JAXP added in 1.4
org.xml.sax.,
org.w3c.dom.
};
You'll notice that all of the xml parsing packages are specified in this
trigger list. This means that Tomcat refuses to load any XML parser which may
have been placed in WEB-INF/lib folders. This makes it impossible to
specify per-application XML parsers, unless you load the XML classes yourself.
God bless,
-Toby
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6519] - Problem with HTMLManagerServlet when running JDK1.4
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6519. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6519 Problem with HTMLManagerServlet when running JDK1.4 --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:12 --- This worked fine for me with Tomcat 4.0.1 and the JDK 1.4 Beta 3 on Linux 7.1. I upgraded to Tomcat 4.0.2 final and JDK 1.4.0 final at the same time, and then the problem started. Perhaps this bug was introduced in the JDK 1.4 release candidate or the JDK 1.4.0 final release. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector ResponseBase.java
remm02/02/21 14:13:33 Modified:catalina/src/share/org/apache/catalina/connector Tag: tomcat_40_branch ResponseBase.java Log: - Port fixes for 6201. - Tweak the code so that in the case of an unsupported encoding exception, the stream isn't initialized. Revision ChangesPath No revision No revision 1.16.2.6 +9 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java Index: ResponseBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v retrieving revision 1.16.2.5 retrieving revision 1.16.2.6 diff -u -r1.16.2.5 -r1.16.2.6 --- ResponseBase.java 21 Feb 2002 06:09:51 - 1.16.2.5 +++ ResponseBase.java 21 Feb 2002 22:13:33 - 1.16.2.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.16.2.5 2002/02/21 06:09:51 remm Exp $ - * $Revision: 1.16.2.5 $ - * $Date: 2002/02/21 06:09:51 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.16.2.6 2002/02/21 22:13:33 remm Exp $ + * $Revision: 1.16.2.6 $ + * $Date: 2002/02/21 22:13:33 $ * * * @@ -89,7 +89,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.16.2.5 $ $Date: 2002/02/21 06:09:51 $ + * @version $Revision: 1.16.2.6 $ $Date: 2002/02/21 22:13:33 $ */ public abstract class ResponseBase @@ -750,11 +750,12 @@ throw new IllegalStateException (sm.getString(responseBase.getWriter.ise)); -stream = createOutputStream(); -((ResponseStream) stream).setCommit(false); +ResponseStream newStream = (ResponseStream) createOutputStream(); +newStream.setCommit(false); OutputStreamWriter osr = - new OutputStreamWriter(stream, getCharacterEncoding()); -writer = new ResponseWriter(osr, (ResponseStream) stream); +new OutputStreamWriter(newStream, getCharacterEncoding()); +writer = new ResponseWriter(osr, newStream); +stream = newStream; return (writer); } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpResponseBase.java
remm02/02/21 14:15:56
Modified:catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch HttpResponseBase.java
Log:
- Port fix for 6201.
- If the encoding is invalid, response output wouldn't work.
Revision ChangesPath
No revision
No revision
1.37.2.7 +10 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
retrieving revision 1.37.2.6
retrieving revision 1.37.2.7
diff -u -r1.37.2.6 -r1.37.2.7
--- HttpResponseBase.java 30 Jan 2002 03:48:54 - 1.37.2.6
+++ HttpResponseBase.java 21 Feb 2002 22:15:56 - 1.37.2.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.37.2.6 2002/01/30 03:48:54 billbarker Exp $
- * $Revision: 1.37.2.6 $
- * $Date: 2002/01/30 03:48:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
1.37.2.7 2002/02/21 22:15:56 remm Exp $
+ * $Revision: 1.37.2.7 $
+ * $Date: 2002/02/21 22:15:56 $
*
*
*
@@ -101,7 +101,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.37.2.6 $ $Date: 2002/01/30 03:48:54 $
+ * @version $Revision: 1.37.2.7 $ $Date: 2002/02/21 22:15:56 $
*/
public class HttpResponseBase
@@ -574,8 +574,12 @@
}
// Prepare a suitable output writer
-OutputStreamWriter osr =
-new OutputStreamWriter(getStream(), getCharacterEncoding());
+OutputStreamWriter osr = null;
+try {
+osr = new OutputStreamWriter(getStream(), getCharacterEncoding());
+} catch (UnsupportedEncodingException e) {
+osr = new OutputStreamWriter(getStream());
+}
final PrintWriter outputWriter = new PrintWriter(osr);
// Send the Status: header
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6629] New: - [PATCH] Response.encodeURL enhancement
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6629. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6629 [PATCH] Response.encodeURL enhancement Summary: [PATCH] Response.encodeURL enhancement Product: Tomcat 3 Version: 3.3.1 Beta 1 Platform: All OS/Version: Windows NT/2K Status: NEW Severity: Enhancement Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] Hello! This is the Tomcat 3.3.1 version of #1450 which is reported against Tomcat 4.0.2. Tomcat's Response.encodeURL implementation breaks URLs when it is invoked several times on the same URL. The Servlet 2.2 spec is unclear on whether this is legal behavior, but several competing products do not have this problem (Orion, Resin, HP-AS). I am therefore suggesting the following patch to fix this behavior. The affected file is src\facade22\org\apache\tomcat\facade\HttpServletResponseFacade.java The diff is --- HttpServletResponseFacade.java.orig Mon Feb 11 16:00:40 2002 +++ HttpServletResponseFacade.java Thu Feb 21 21:22:52 2002 @@ -434,6 +434,10 @@ return (url); String sessionId = session.getId().toString(); + + if (url.indexOf(;jsessionid= + sessionId) != -1) + return (url); + String path = null; String query = null; int question = url.indexOf(?); I do not have CVS commit access, and would appreciate it if someone else could commit it. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpResponseBase.java
remm02/02/21 14:18:13 Modified:catalina/src/share/org/apache/catalina/connector Tag: tomcat_40_branch HttpResponseBase.java Log: - Add missing import. - Port patch for 6600. - Don't encode if the session is not URL based, rather than don't encode if the session is cookie based. - Fixes 6600. - Patch submitted by Stefan Wengi sgw at adnovum.com Revision ChangesPath No revision No revision 1.37.2.8 +5 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java Index: HttpResponseBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v retrieving revision 1.37.2.7 retrieving revision 1.37.2.8 diff -u -r1.37.2.7 -r1.37.2.8 --- HttpResponseBase.java 21 Feb 2002 22:15:56 - 1.37.2.7 +++ HttpResponseBase.java 21 Feb 2002 22:18:12 - 1.37.2.8 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.37.2.7 2002/02/21 22:15:56 remm Exp $ - * $Revision: 1.37.2.7 $ - * $Date: 2002/02/21 22:15:56 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.37.2.8 2002/02/21 22:18:12 remm Exp $ + * $Revision: 1.37.2.8 $ + * $Date: 2002/02/21 22:18:12 $ * * * @@ -68,6 +68,7 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; // import java.net.URL; import java.security.AccessController; @@ -101,7 +102,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.37.2.7 $ $Date: 2002/02/21 22:15:56 $ + * @version $Revision: 1.37.2.8 $ $Date: 2002/02/21 22:18:12 $ */ public class HttpResponseBase -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseImpl.java
remm02/02/21 14:19:21
Modified:catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpResponseImpl.java
Log:
- Port fix for 6201.
- Using setAllowChunking here is redundant, and will cause a HTTP bug where
the tr-enc: chunked header won't be removed in some cases, which would end
up generating a bad request.
Revision ChangesPath
No revision
No revision
1.11.2.1 +4 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java
Index: HttpResponseImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- HttpResponseImpl.java 8 Aug 2001 19:26:07 - 1.11
+++ HttpResponseImpl.java 21 Feb 2002 22:19:21 - 1.11.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java,v
1.11 2001/08/08 19:26:07 pier Exp $
- * $Revision: 1.11 $
- * $Date: 2001/08/08 19:26:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java,v
1.11.2.1 2002/02/21 22:19:21 remm Exp $
+ * $Revision: 1.11.2.1 $
+ * $Date: 2002/02/21 22:19:21 $
*
*
*
@@ -79,7 +79,7 @@
*
* @author Craig R. McClanahan
* @author a href=mailto:[EMAIL PROTECTED];Remy Maucherat/a
- * @version $Revision: 1.11 $ $Date: 2001/08/08 19:26:07 $
+ * @version $Revision: 1.11.2.1 $ $Date: 2002/02/21 22:19:21 $
*/
final class HttpResponseImpl
@@ -179,7 +179,6 @@
*/
public void sendError(int status, String message) throws IOException {
-setAllowChunking(false);
addHeader(Connection, close);
super.sendError(status, message);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6630] New: - Cookies in the HttpServletRequest are not URL decoded when using the JK/AJP Connector
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6630. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6630 Cookies in the HttpServletRequest are not URL decoded when using the JK/AJP Connector Summary: Cookies in the HttpServletRequest are not URL decoded when using the JK/AJP Connector Product: Tomcat 4 Version: Nightly Build Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: JK/AJP Connector AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Cookies in Catalina are transparently URL encoded. Unlike the HTTP 1.1 connector, the AJP13 Connector does not URL decode cookies before making it available to the servlet. Cookies set by Catalina retrieved by the AJP13 Connector are all incorrectly URL encoded. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6630] - Cookies in the HttpServletRequest are not URL decoded when using the JK/AJP Connector
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6630. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6630 Cookies in the HttpServletRequest are not URL decoded when using the JK/AJP Connector --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:23 --- Created an attachment (id=1226) Patch to org.apache.ajp.tomcat4.Ajp13Request -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6628] - Can't specify application specific XML parsers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628 Can't specify application specific XML parsers [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:23 --- If you're using JAXP, then you're correct, and it won't be fixed. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6631] New: - [PATCH] Response.encodeURL enhancement
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6631. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6631 [PATCH] Response.encodeURL enhancement Summary: [PATCH] Response.encodeURL enhancement Product: Tomcat 3 Version: 3.3.1 Beta 1 Platform: All OS/Version: Windows NT/2K Status: NEW Severity: Enhancement Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] Hello! This is the Tomcat 3.3.1 version of #1450 which is reported against Tomcat 4.0.2. Tomcat's Response.encodeURL implementation breaks URLs when it is invoked several times on the same URL. The Servlet 2.2 spec is unclear on whether this is legal behavior, but several competing products do not have this problem (Orion, Resin, HP-AS). I am therefore suggesting the following patch to fix this behavior. The affected file is src\facade22\org\apache\tomcat\facade\HttpServletResponseFacade.java The diff is --- HttpServletResponseFacade.java.orig Mon Feb 11 16:00:40 2002 +++ HttpServletResponseFacade.java Thu Feb 21 21:22:52 2002 @@ -434,6 +434,10 @@ return (url); String sessionId = session.getId().toString(); + + if (url.indexOf(;jsessionid= + sessionId) != -1) + return (url); + String path = null; String query = null; int question = url.indexOf(?); I do not have CVS commit access, and would appreciate it if someone else could commit it. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6519] - Problem with HTMLManagerServlet when running JDK1.4
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6519. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6519 Problem with HTMLManagerServlet when running JDK1.4 --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:26 --- I don't know yet, but you shouldn't use 1.4B3 with Tomcat 4.0 (don't know about other versions, but there could be similar problems). There are *lots* of very insidious problems with it which have no workarounds (class loading, mostly) :-( -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6631] - [PATCH] Response.encodeURL enhancement
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6631. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6631 [PATCH] Response.encodeURL enhancement [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:27 --- *** This bug has been marked as a duplicate of 6629 *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6629] - [PATCH] Response.encodeURL enhancement
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6629. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6629 [PATCH] Response.encodeURL enhancement --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:27 --- *** Bug 6631 has been marked as a duplicate of this bug. *** -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6630] - Cookies in the HttpServletRequest are not URL decoded when using the JK/AJP Connector
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6630. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6630 Cookies in the HttpServletRequest are not URL decoded when using the JK/AJP Connector [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:30 --- Well, this won't be fixed, because the AJP connector is right. This creates compatibility problems, obviously, so that's why bug 4295 (please refer to it for more details) may not be fixed in the 4.0.x branch. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpResponseBase.java
remm02/02/21 14:32:48 Modified:catalina/src/share/org/apache/catalina/connector Tag: tomcat_40_branch HttpResponseBase.java Log: - Port patch for 6600. - Don't encode if the session is not URL based, rather than don't encode if the session is cookie based. - Patch submitted by Stefan Wengi sgw at adnovum.com Revision ChangesPath No revision No revision 1.37.2.9 +1 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java Index: HttpResponseBase.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v retrieving revision 1.37.2.8 retrieving revision 1.37.2.9 diff -u -r1.37.2.8 -r1.37.2.9 --- HttpResponseBase.java 21 Feb 2002 22:18:12 - 1.37.2.8 +++ HttpResponseBase.java 21 Feb 2002 22:32:48 - 1.37.2.9 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.37.2.8 2002/02/21 22:18:12 remm Exp $ - * $Revision: 1.37.2.8 $ - * $Date: 2002/02/21 22:18:12 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.37.2.9 2002/02/21 22:32:48 remm Exp $ + * $Revision: 1.37.2.9 $ + * $Date: 2002/02/21 22:32:48 $ * * * @@ -102,7 +102,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.37.2.8 $ $Date: 2002/02/21 22:18:12 $ + * @version $Revision: 1.37.2.9 $ $Date: 2002/02/21 22:32:48 $ */ public class HttpResponseBase @@ -491,7 +491,7 @@ HttpSession session = hreq.getSession(false); if (session == null) return (false); -if (hreq.isRequestedSessionIdFromCookie()) +if (!hreq.isRequestedSessionIdFromURL()) return (false); // Is this a valid absolute URL? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6628] - Can't specify application specific XML parsers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628 Can't specify application specific XML parsers --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:40 --- What if I've just got applications that depend even upon different revisions of the same parser - for example Xerces? What's the reasoning behind this? -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util CookieTools.java RequestUtil.java
remm02/02/21 14:51:55
Modified:catalina/src/share/org/apache/catalina/util CookieTools.java
RequestUtil.java
Log:
- Tentative fix for the cookie encoding problem (bug 4295). Please review (esp
Costin).
- This patch could cause compatibility problems (as seen in bug 6630).
- The question is: should this patch (if correct) be ported to the 4.0.x branch ?
I'd say yes, since we should have a standards-compliant behavior, even if it
creates
some problems at first. Comments ?
Revision ChangesPath
1.7 +7 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java
Index: CookieTools.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CookieTools.java 25 Sep 2001 20:40:42 - 1.6
+++ CookieTools.java 21 Feb 2002 22:51:55 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
1.6 2001/09/25 20:40:42 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/09/25 20:40:42 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
1.7 2002/02/21 22:51:55 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/21 22:51:55 $
*
*
*
@@ -63,7 +63,7 @@
package org.apache.catalina.util;
-import java.net.URLEncoder;
+
import java.text.*;
import java.util.*;
@@ -115,9 +115,9 @@
if (value == null)
value = ;
-buf.append(URLEncoder.encode(name));
+buf.append(name);
buf.append(=);
-maybeQuote(version, buf, URLEncoder.encode(value));
+maybeQuote(version, buf, value);
// add version 1 specific information
if (version == 1) {
@@ -127,8 +127,7 @@
// Comment=comment
if (cookie.getComment() != null) {
buf.append (;Comment=);
-maybeQuote (version, buf,
-URLEncoder.encode(cookie.getComment()));
+maybeQuote (version, buf, cookie.getComment());
}
}
1.19 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java
Index: RequestUtil.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- RequestUtil.java 15 Aug 2001 23:19:55 - 1.18
+++ RequestUtil.java 21 Feb 2002 22:51:55 - 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java,v
1.18 2001/08/15 23:19:55 craigmcc Exp $
- * $Revision: 1.18 $
- * $Date: 2001/08/15 23:19:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java,v
1.19 2002/02/21 22:51:55 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/02/21 22:51:55 $
*
*
*
@@ -78,7 +78,7 @@
*
* @author Craig R. McClanahan
* @author Tim Tye
- * @version $Revision: 1.18 $ $Date: 2001/08/15 23:19:55 $
+ * @version $Revision: 1.19 $ $Date: 2002/02/21 22:51:55 $
*/
public final class RequestUtil {
@@ -296,8 +296,8 @@
try {
int equals = token.indexOf('=');
if (equals 0) {
-String name = URLDecode(token.substring(0, equals).trim());
-String value = URLDecode(token.substring(equals+1).trim());
+String name = token.substring(0, equals).trim();
+String value = token.substring(equals+1).trim();
cookies.add(new Cookie(name, value));
}
} catch (Throwable e) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6628] - Can't specify application specific XML parsers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628 Can't specify application specific XML parsers --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 22:59 --- Ok. First, the trigger list as it is in 4.0.2 is causing problems (see bug 6374). Improving it was easy, and now the list is much more selective (and the classloader finally complies with what the specification says). Allowing the base classes in the webapp repositories will create problems (see bug 6248) which have no easy workaround. The filtering will not prevent you from having a webapp written specifically for, say, Xerces 1 or OpenXML from running, since all the classes, except the core JAXP classes and the XML API classes (which can be common for everything) will be loaded from the webapp classloader. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6628] - Can't specify application specific XML parsers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628 Can't specify application specific XML parsers --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 23:13 --- So this works as long as the JAXP API doesn't evolve incompatibly? For example, if JAXP 1.2 gets released, and a new application uses it, we have to replace the existing JAXP 1.1 library with the new 1.2 library - at which point the old apps written to 1.1 are now running with 1.1. But this only works if JAXP 1.2 is totally compatible with 1.1 - both interface and implementation wise. God bless, -Toby -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 6628] - Can't specify application specific XML parsers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6628 Can't specify application specific XML parsers --- Additional Comments From [EMAIL PROTECTED] 2002-02-21 23:21 --- 1.2 will run 1.0 and 1.1 providers. If it didn't, then we're in trouble, but at least there would be a lot of people in trouble. Now that JAXP 1.1 is in the JDK, I don't see any API breakage ocurring, at least not with the same package/class names. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/examples build.xml
remm02/02/21 15:27:04
Modified:webapps/examples build.xml
Log:
- Fix bug 6609 (SendMailServlet.java is not compiled even if javamail is installed
correctly).
Revision ChangesPath
1.16 +1 -1 jakarta-tomcat-4.0/webapps/examples/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 19 Sep 2001 23:04:42 - 1.15
+++ build.xml 21 Feb 2002 23:27:04 - 1.16
@@ -60,7 +60,7 @@
!-- BUILD: Copy Static Files == --
- target name=build-static depends=build-prepare
+ target name=build-static depends=flags,build-prepare
copy todir=${webapps.build}/${webapp.name}
fileset dir=.
exclude name=build.*/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/examples build.xml
remm02/02/21 15:28:26
Modified:webapps/examples Tag: tomcat_40_branch build.xml
Log:
- Fix bug 6609 (SendMailServlet.java is not compiled even if javamail is installed
correctly).
Revision ChangesPath
No revision
No revision
1.14.2.2 +1 -1 jakarta-tomcat-4.0/webapps/examples/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.xml,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- build.xml 26 Sep 2001 18:49:08 - 1.14.2.1
+++ build.xml 21 Feb 2002 23:28:26 - 1.14.2.2
@@ -60,7 +60,7 @@
!-- BUILD: Copy Static Files == --
- target name=build-static depends=build-prepare
+ target name=build-static depends=flags,build-prepare
copy todir=${webapps.build}/${webapp.name}
fileset dir=.
exclude name=build.*/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.0.3-B1.txt
remm02/02/21 16:41:11 Modified:.Tag: tomcat_40_branch RELEASE-NOTES-4.0.3-B1.txt Log: - Update status. Revision ChangesPath No revision No revision 1.1.2.9 +7 -1 jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.3-B1.txt Index: RELEASE-NOTES-4.0.3-B1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.3-B1.txt,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- RELEASE-NOTES-4.0.3-B1.txt20 Feb 2002 07:10:56 - 1.1.2.8 +++ RELEASE-NOTES-4.0.3-B1.txt22 Feb 2002 00:41:11 - 1.1.2.9 @@ -3,7 +3,7 @@ Release Notes = -$Id: RELEASE-NOTES-4.0.3-B1.txt,v 1.1.2.8 2002/02/20 07:10:56 remm Exp $ +$Id: RELEASE-NOTES-4.0.3-B1.txt,v 1.1.2.9 2002/02/22 00:41:11 remm Exp $ @@ -76,6 +76,11 @@ WebappClassLoader: Do not allow a a webapp to override classes from J2SE. +HttpResponseStream: Fix rare NPE which could occur when processing an invalid + HTTP request. + +HttpProcessor: Improve robustness of the main processing loop. + Jasper Bug Fixes: @@ -112,6 +117,7 @@ on repeated actions 6550 Old WebappClassLoaders can't be GC'd 6558 NPE in RequestDumperValve.toString if debug in catalina/XmlMapper +6569 setLocale() doesn't set the Content-Type charset attribute -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler CommandLineCompiler.java JasperMangler.java JspCompiler.java
billbarker02/02/21 19:16:09
Modified:src/share/org/apache/jasper/compiler
CommandLineCompiler.java JasperMangler.java
JspCompiler.java
Log:
Fix an edge case where JSP pages starting with a number don't mangle correctly.
The main fix is the simplest in JasperMangler. The other two files are ports from
JasperMangler. I don't believe that JspCompiler is used anymore, and JspC isn't used
much. In any case, the fixes can't hurt.
Fix for bug #6518.
Reported by: Paul Fu [EMAIL PROTECTED]
Revision ChangesPath
1.7 +18 -4
jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java
Index: CommandLineCompiler.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandLineCompiler.java 8 Dec 2000 23:18:34 - 1.6
+++ CommandLineCompiler.java 22 Feb 2002 03:16:09 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java,v
1.6 2000/12/08 23:18:34 costin Exp $
- * $Revision: 1.6 $
- * $Date: 2000/12/08 23:18:34 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java,v
1.7 2002/02/22 03:16:09 billbarker Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/22 03:16:09 $
*
* The Apache Software License, Version 1.1
*
@@ -233,8 +233,22 @@
// Fix for invalid characters. If you think of more add to the list.
StringBuffer modifiedClassName = new StringBuffer();
+ char c='/';
+ if( Character.isDigit( className.charAt( 0 ) )) {
+ className=_ +className;
+ }
for (int i = 0; i className.length(); i++) {
- if (Character.isLetterOrDigit(className.charAt(i)) == true)
+ char prev=c;
+ c=className.charAt(i);
+ // workaround for common // problem. Alternative
+ // would be to encode the dot.
+ if( prev=='/' c=='/' ) {
+ continue;
+ }
+
+ if (Character.isLetterOrDigit(c) == true ||
+ c=='_' ||
+ c=='/' )
modifiedClassName.append(className.substring(i,i+1));
else
modifiedClassName.append(mangleChar(className.charAt(i)));
1.9 +2 -2
jakarta-tomcat/src/share/org/apache/jasper/compiler/JasperMangler.java
Index: JasperMangler.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JasperMangler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JasperMangler.java27 Nov 2001 04:04:12 - 1.8
+++ JasperMangler.java22 Feb 2002 03:16:09 - 1.9
@@ -241,12 +241,12 @@
if( extIdx0 ) {
// no .
- if( lastComp 0 )
+ if( lastComp = 0 )
baseClassN=jspFile.substring( lastComp+1 );
else
baseClassN=jspFile.substring( 0 );
} else {
- if( lastComp 0 )
+ if( lastComp = 0 )
baseClassN=jspFile.substring( lastComp+1, extIdx );
else
baseClassN=jspFile.substring( 0, extIdx );
1.20 +15 -2
jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java
Index: JspCompiler.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspCompiler.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JspCompiler.java 2 Mar 2001 04:51:32 - 1.19
+++ JspCompiler.java 22 Feb 2002 03:16:09 - 1.20
@@ -259,13 +259,26 @@
// Fix for invalid characters. If you think of more add to the list.
StringBuffer modifiedClassName = new StringBuffer();
+ char c='/';
+ if( Character.isDigit( className.charAt( 0 ) )) {
+ className=_ +className;
+ }
for (int i = 0; i className.length(); i++) {
- if (Character.isLetterOrDigit(className.charAt(i)) == true)
+ char prev=c;
+ c=className.charAt(i);
+ // workaround for common // problem. Alternative
+ // would be to encode the dot.
+ if( prev=='/' c=='/' ) {
+ continue;
+ }
+
+ if (Character.isLetterOrDigit(c) == true ||
+ c=='_' ||
+ c=='/' )
modifiedClassName.append(className.substring(i,i+1));
else
modifiedClassName.append(mangleChar(className.charAt(i)));
}
DO NOT REPLY [Bug 6518] - class name generated from jsp filename mangles some valid identifier characters
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6518. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6518 class name generated from jsp filename mangles some valid identifier characters [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-02-22 03:17 --- This is now fixed in the CVS HEAD, and will appear in 3.3.1-RC1. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat RELEASE-NOTES-3.3.1.txt
billbarker02/02/21 19:19:32 Modified:.RELEASE-NOTES-3.3.1.txt Log: Document fix for 6518 Revision ChangesPath 1.38 +4 -1 jakarta-tomcat/RELEASE-NOTES-3.3.1.txt Index: RELEASE-NOTES-3.3.1.txt === RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.1.txt,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- RELEASE-NOTES-3.3.1.txt 21 Feb 2002 03:06:51 - 1.37 +++ RELEASE-NOTES-3.3.1.txt 22 Feb 2002 03:19:32 - 1.38 @@ -3,7 +3,7 @@ Release Notes = -$Id: RELEASE-NOTES-3.3.1.txt,v 1.37 2002/02/21 03:06:51 billbarker Exp $ +$Id: RELEASE-NOTES-3.3.1.txt,v 1.38 2002/02/22 03:19:32 billbarker Exp $ This document describes the changes that have been made since the @@ -238,6 +238,9 @@ in the web.xml. 6515 Block setting of Date-Headers from within an include. + +6518 Fix an edge condition where in some cases a JSP file beginning with + a number wouldn't get mangled correctly. Configuration: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [Daemon] New commons component
On Thu, 21 Feb 2002, Remy Maucherat wrote: However it's not the only way to do things - and I prefer to not depend on the wrapper that starts tomcat to do it ( there are many other good ways to start tomcat without requiring the daemon ) If it's good ways to start tomcat as a daemon, then I disagree (except if it's when embedded through JNI in Apache). At best, it will work as good as with the daemon code, so why bother ? Because there is not 'a single ( or only ) good way to start tomcat'. If doing a JNI call works and is a good solution, why reinventing the wheel ? The daemon requires using an init()-like method and a certain architecture - which the other solution doesn't. ? I wonder what prevents you from having an empty init method, and then doing whatever JNI calls you want suring start. Even for tomcat4.0, it would make my life more difficult if jk needs to do something as root ( given that I'm trying to make jk a self-contained trusted application that doesn't require changes in server.xml ). In general, I don't like the 'starter' to impose constraints or dictate the design of the application, especially when the same feature can be implemented without this constraint and in a simpler manner. I don't like the container to impose too many constraints on the application either. It's the old push versus pull - or IOC versus 'straight' programming. I have nothing against IOC as long as it doesn't try to force to be the 'only' way. Don't go on a rant just because the interface has an init method, and vaguely implies how some of the design of the server should be (and also of course because it's an interface), please ;-) I'm surprised you're not pushing to make it an abstract class, BTW. Ok, I'll send then an email. And would participate in the project ? Yes, I think the 'wrapper' is very good and promissing. I already sent them an email, but if you want to take care of this - it's great. I did send them an email too (writing the reply now). Remy -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util CookieTools.java RequestUtil.java
remm02/02/21 20:02:27
Modified:catalina/src/share/org/apache/catalina/util Tag:
tomcat_40_branch CookieTools.java RequestUtil.java
Log:
- Since nobody complained, I'm porting the patch to disable URL encoding /
decoding on cookies to the 4.0 branch (the patch is simple to revert anyway).
- Warning: this may cause compatibility problems, and will be indicated very
explicitely in the release notes. I think corectness should come first (esp since
there are already discrepancies in behavior between connectors, as seen in bug
6630;
Costin: great argument to force me to fix the problem, BTW ;-)).
Revision ChangesPath
No revision
No revision
1.5.2.2 +7 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java
Index: CookieTools.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- CookieTools.java 25 Sep 2001 20:44:42 - 1.5.2.1
+++ CookieTools.java 22 Feb 2002 04:02:27 - 1.5.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
1.5.2.1 2001/09/25 20:44:42 craigmcc Exp $
- * $Revision: 1.5.2.1 $
- * $Date: 2001/09/25 20:44:42 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
1.5.2.2 2002/02/22 04:02:27 remm Exp $
+ * $Revision: 1.5.2.2 $
+ * $Date: 2002/02/22 04:02:27 $
*
*
*
@@ -63,7 +63,7 @@
package org.apache.catalina.util;
-import java.net.URLEncoder;
+
import java.text.*;
import java.util.*;
@@ -115,9 +115,9 @@
if (value == null)
value = ;
-buf.append(URLEncoder.encode(name));
+buf.append(name);
buf.append(=);
-maybeQuote(version, buf, URLEncoder.encode(value));
+maybeQuote(version, buf, value);
// add version 1 specific information
if (version == 1) {
@@ -127,8 +127,7 @@
// Comment=comment
if (cookie.getComment() != null) {
buf.append (;Comment=);
-maybeQuote (version, buf,
-URLEncoder.encode(cookie.getComment()));
+maybeQuote (version, buf, cookie.getComment());
}
}
1.18.2.1 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java
Index: RequestUtil.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- RequestUtil.java 15 Aug 2001 23:19:55 - 1.18
+++ RequestUtil.java 22 Feb 2002 04:02:27 - 1.18.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java,v
1.18 2001/08/15 23:19:55 craigmcc Exp $
- * $Revision: 1.18 $
- * $Date: 2001/08/15 23:19:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/RequestUtil.java,v
1.18.2.1 2002/02/22 04:02:27 remm Exp $
+ * $Revision: 1.18.2.1 $
+ * $Date: 2002/02/22 04:02:27 $
*
*
*
@@ -78,7 +78,7 @@
*
* @author Craig R. McClanahan
* @author Tim Tye
- * @version $Revision: 1.18 $ $Date: 2001/08/15 23:19:55 $
+ * @version $Revision: 1.18.2.1 $ $Date: 2002/02/22 04:02:27 $
*/
public final class RequestUtil {
@@ -296,8 +296,8 @@
try {
int equals = token.indexOf('=');
if (equals 0) {
-String name = URLDecode(token.substring(0, equals).trim());
-String value = URLDecode(token.substring(equals+1).trim());
+String name = token.substring(0, equals).trim();
+String value = token.substring(equals+1).trim();
cookies.add(new Cookie(name, value));
}
} catch (Throwable e) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
DO NOT REPLY [Bug 4295] - Cookies not following RFC2109
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4295. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4295 Cookies not following RFC2109 [EMAIL PROTECTED] changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2002-02-22 04:03 --- Fixed on both branches. Nightly for 02/22 will have the fix. NOTE: THIS FIX MAY BREAK APPLICATIONS WHICH WOULD RELY ON CONTAINER PROVIDED URL ENCODING / DECODING. NOTE: This particular fix will be mentioned in the release notes for the next Tomcat 4.0.x release. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0 RELEASE-NOTES-4.0.3-B1.txt
remm02/02/21 20:03:35 Modified:.Tag: tomcat_40_branch RELEASE-NOTES-4.0.3-B1.txt Log: - Update bug status. Revision ChangesPath No revision No revision 1.1.2.10 +7 -1 jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.3-B1.txt Index: RELEASE-NOTES-4.0.3-B1.txt === RCS file: /home/cvs/jakarta-tomcat-4.0/Attic/RELEASE-NOTES-4.0.3-B1.txt,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- RELEASE-NOTES-4.0.3-B1.txt22 Feb 2002 00:41:11 - 1.1.2.9 +++ RELEASE-NOTES-4.0.3-B1.txt22 Feb 2002 04:03:35 - 1.1.2.10 @@ -3,7 +3,7 @@ Release Notes = -$Id: RELEASE-NOTES-4.0.3-B1.txt,v 1.1.2.9 2002/02/22 00:41:11 remm Exp $ +$Id: RELEASE-NOTES-4.0.3-B1.txt,v 1.1.2.10 2002/02/22 04:03:35 remm Exp $ @@ -102,10 +102,12 @@ -- 3770 HttpSessionListener.sessionCreated() called twice for each session +4295 Cookies not following RFC2109 4518 Jsp-file and load-on-startup and init-param does not work 5422 HTTP Headers not being cleared after form authentication 5647 AJP13 connector will not pass authentication requests 6090 Listener not instantiated in tld file +6201 ISO-8859-8-i problem. (hebrew) 6374 Class not found for: org/w3c/dom/range/Range 6396 LoggerBase class is package not public 6406 All classes in $CATALINA_HOME/classes become invisible @@ -118,6 +120,10 @@ 6550 Old WebappClassLoaders can't be GC'd 6558 NPE in RequestDumperValve.toString if debug in catalina/XmlMapper 6569 setLocale() doesn't set the Content-Type charset attribute +6600 EncodeURL adds 'jsession' when 'isRequestedSessionIdFromURL' + returns false +6609 SendMailServlet.java is not compiled even if javamail is installed + correctly -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
