cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_worker.h
hgomez 2004/02/27 00:34:18
Modified:jk/native2/server/apache2 mod_jk2.c
jk/native2/common jk_worker_lb.c
jk/native2/include jk_worker.h
Log:
Fix problem with ErrorDocument and Apache 2.0.
By default now, WE DON'T touch the headers
Revision ChangesPath
1.68 +12 -5 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mod_jk2.c 24 Feb 2004 08:44:42 - 1.67
+++ mod_jk2.c 27 Feb 2004 08:34:18 - 1.68
@@ -22,7 +22,7 @@
***/
/*
- * mod_jk: keeps all servlet/jakarta related ramblings together.
+ * mod_jk2: keeps all servlet/jakarta related ramblings together.
*/
@@ -697,7 +697,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
mod_jk.handle() No worker for %s\n, r-uri);
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return 500;
+return HTTP_INTERNAL_SERVER_ERROR;
}
if( uriEnv-mbean-debug 0 )
@@ -752,9 +752,16 @@
}
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- mod_jk.handler() Error connecting to tomcat %d\n, rc);
+ mod_jk.handler() Error connecting to tomcat %d, status %d\n,
rc, s-status);
+
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return 500;
+
+/* In case of error, if service() set a status code, send it back */
+/* Else fallback to HTTP_INTERNAL_SERVER_ERROR (500). */
+if (s-status != 0)
+return s-status;
+else
+return HTTP_INTERNAL_SERVER_ERROR;
}
/** Use the internal mod_jk mappings to find if this is a request for
1.37 +24 -16jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_worker_lb.c24 Feb 2004 08:44:40 - 1.36
+++ jk_worker_lb.c27 Feb 2004 08:34:18 - 1.37
@@ -326,7 +326,7 @@
}
/* Initialize here the recovery POST buffer */
- s-reco_buf = jk2_msg_ajp_create( env, s-pool, 0);
+s-reco_buf = jk2_msg_ajp_create( env, s-pool, 0);
s-reco_status = RECO_INITED;
while(1) {
@@ -356,17 +356,21 @@
s-status=lb-noWorkerCode; /* SERVICE_UNAVAILABLE is the default */
}
-if( s-status == 302 ) {
-s-headers_out-put(env, s-headers_out,
-Location, lb-noWorkerMsg, NULL);
-s-head(env, s );
-} else {
-s-headers_out-put(env, s-headers_out,
-Content-Type, text/html, NULL);
-s-head(env, s );
-s-jkprintf(env, s, lb-noWorkerMsg );
-}
-
+/* Don't touch headers if noErrorHeader set to TRUE, ie ErrorDocument
in Apache via mod_alias */
+if (! lb-noErrorHeader) {
+/* XXX: I didn't understand the 302, since s-status is
lb-hwBalanceErr or lb-noWorkerCode */
+/* Both could be set in workers2.properties so . */
+if( s-status == 302 ) {
+s-headers_out-put(env, s-headers_out,
+Location, lb-noWorkerMsg, NULL);
+s-head(env, s );
+} else {
+s-headers_out-put(env, s-headers_out,
+Content-Type, text/html, NULL);
+s-head(env, s );
+s-jkprintf(env, s, lb-noWorkerMsg );
+}
+}
s-afterRequest( env, s);
lb_priv-error_time = time(NULL);
return JK_ERR;
@@ -473,10 +477,10 @@
static char *jk2_worker_lb_multiValueInfo[]={worker, NULL };
static char *jk2_worker_lb_setAttributeInfo[]={attempts, stickySession,
recovery, timeout,
- hwBalanceErr, noWorkerMsg,
noWorkerCode, worker, NULL };
+ hwBalanceErr, noErrorHeader,
noWorkerMsg, noWorkerCode, worker, NULL };
static char *jk2_worker_lb_getAttributeInfo[]={attempts, stickySession,
recovery, timeout,
- hwBalanceErr, noWorkerMsg,
cvs commit: jakarta-tomcat-connectors/jk/native2 CHANGES.txt
hgomez 2004/02/27 00:34:34 Modified:jk/native2 CHANGES.txt Log: Update changelog Revision ChangesPath 1.15 +13 -5 jakarta-tomcat-connectors/jk/native2/CHANGES.txt Index: CHANGES.txt === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/CHANGES.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- CHANGES.txt 24 Feb 2004 08:44:42 - 1.14 +++ CHANGES.txt 27 Feb 2004 08:34:34 - 1.15 @@ -11,13 +11,21 @@ You could set connectTimeout, replyTimeout and prepostTimeout for such purpose in ajp properties. [Henri Gomez] * Add hasinput method for channel, which will check if datas are - available on input channel (TC-WEBSERVER). + available on input channel (TC-WEBSERVER). [Henri Gomez] * Make use apr_port_t instead of short to fix problem to have port higher than 32K. * Make default port configurable (9009 on Netware, 8009 elsewhere) -* Fix problem when in Load-Balancing and POST [Henri Gomez]. -* Add recovery strategy in LB mode, via noRecoveryIfRequestSent and noRecoveryIfHeaderSent options [Henri Gomez]. - +* Fix problem when in Load-Balancing and POST + [Henri Gomez]. +* Add recovery strategy in LB mode, via noRecoveryIfRequestSent and noRecoveryIfHeaderSent options + [Henri Gomez]. +* Add a noErrorHeader parameter for lb worker, by default set to 1, to prevent jk2 to touch the Headers when an + error is detected (which broke Apache 2, mod_alias and ErrorDocument) + [Henri Gomez]. +* Forward correctly the content-type and as such fix problems with Apache 2 and mod_deflate for example + [Henri Gomez]. + + Changes with JK2 2.0.3: * jk2 set correctly the content-type in Apache 2.0, making it ready to works with mod_deflate and AddOutputFilterByType - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/xdocs/jk2 configwebcom.xml
hgomez 2004/02/27 00:35:39 Modified:jk/xdocs/jk2 configwebcom.xml Log: Update documentation with noErrorHeader (lb won't touch headers) Revision ChangesPath 1.12 +7 -1 jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml Index: configwebcom.xml === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configwebcom.xml 24 Feb 2004 08:42:38 - 1.11 +++ configwebcom.xml 27 Feb 2004 08:35:39 - 1.12 @@ -483,6 +483,12 @@ td/ /tr tr +tdnoErrorHeader/td +td1 (true)/td +tdIf set, jk2 won't touch the headers in case of error and will let for example Apache present the ErrorDocument via mod_alias. +/td +/tr +tr tdnoWorkerMsg/td td/ td/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] mod_jk2 use AP_PCRE on Win32
Guenter Knauf wrote: Hi, if my last patch for PCRE functions gets accepted, this patch to the makefile makes usage of the AP_PCRE on Win32. Guenter. http://www.gknw.com/test/mod_jk2.dsp.diff ### --- ./jk/native2/server/apache2/mod_jk2.dsp.origWed Feb 25 00:14:30 2004 +++ ./jk/native2/server/apache2/mod_jk2.dsp Fri Feb 27 04:29:10 2004 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_PCRE /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_AP_PCRE /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d NDEBUG @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D _DEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_PCRE /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D _DEBUG /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_AP_PCRE /FR /YX /FD /GZ /c # SUBTRACT CPP /X # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 I'm waiting for Kurt review, and I'll commit - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
hgomez 2004/02/27 00:37:48
Modified:jk/native2/common jk_worker_status.c
Log:
Gunter addon (and initial stylesheet)
Revision ChangesPath
1.49 +5 -0 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- jk_worker_status.c24 Feb 2004 08:44:40 - 1.48
+++ jk_worker_status.c27 Feb 2004 08:37:48 - 1.49
@@ -36,6 +36,8 @@
#define JK_CHECK_NULL( str ) ( ((str)==NULL) ? null : (str) )
+#define DEFAULT_CSS (BODY {COLOR: #00; FONT-STYLE: normal; FONT-FAMILY:
\Times New Roman\, Times, serif; BACKGROUND-COLOR: #ff} H1 { COLOR: #0033cc;
FONT-FAMILY: Arial, Helvetica, sans-serif} H2 { COLOR: #0033cc; FONT-FAMILY: Arial,
Helvetica, sans-serif} H3 {FONT: 110% Arial, Helvetica, sans-serif; COLOR: #0033cc} B
{FONT-WEIGHT: bold} )
+
/** Display info for one endpoint
*/
static void jk2_worker_status_displayStat(jk_env_t *env, jk_ws_service_t *s,
@@ -173,6 +175,7 @@
int needHeader=JK_TRUE;
if( wenv-shm==NULL || wenv-shm-head==NULL) {
+ s-jkprintf(env, s, h3No Scoreboard avaiable/h3\n);
return;
}
@@ -942,6 +945,8 @@
Content-Type, text/html, NULL);
}
s-head(env, s );
+
+ s-jkprintf(env, s, style%s/style\n, DEFAULT_CSS );
/** Process the query string.
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_worker.h
hgomez 2004/02/27 00:40:04 Modified:jk/native2/include jk_worker.h Log: Oups, Revision ChangesPath 1.36 +2 -1 jakarta-tomcat-connectors/jk/native2/include/jk_worker.h Index: jk_worker.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- jk_worker.h 27 Feb 2004 08:34:18 - 1.35 +++ jk_worker.h 27 Feb 2004 08:40:04 - 1.36 @@ -50,6 +50,7 @@ in error state, we move to the next leve. */ #define JK_LB_LEVELS 4 +#define JK_LB_MAX_WORKERS 256 /* XXX Separate this in 2 structures: jk_lb.h and jk_ajp.h. Using 'worker' as a generic term is confusing, the objects are very different. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27281] - Mod_jk2 logs a 500 error in apache access log when user presses Stop
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=27281. 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=27281 Mod_jk2 logs a 500 error in apache access log when user presses Stop --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 08:58 --- Do you suggest to return instead 200 ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 LocalStrings_fr.properties
[EMAIL PROTECTED] wrote:
Heureusement que nous avons nos cousins québécois pour corriger
nos petites boulettes :)
jfarcand2004/02/26 09:21:32
Modified:catalina/src/share/org/apache/coyote/tomcat5
LocalStrings_fr.properties
Log:
Fix minor typo.
Revision ChangesPath
1.3 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/LocalStrings_fr.properties
Index: LocalStrings_fr.properties
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/LocalStrings_fr.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings_fr.properties 26 Feb 2004 16:02:38 - 1.2
+++ LocalStrings_fr.properties 26 Feb 2004 17:21:32 - 1.3
@@ -7,13 +7,13 @@
coyoteConnector.alreadyStarted=Le connecteur a déjà été démarré
coyoteConnector.cannotRegisterProtocol=Impossible d'enregistrer le MBean pour le Protocol
coyoteConnector.notStarted=Le connecteur Coyote n''a pas été démarré
-coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de protocole a échoué: {0}
+coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de protocole a échouée: {0}
coyoteConnector.protocolHandlerInitializationFailed=L''initialisation du gestionnaire de protocole a échoué: {0}
coyoteConnector.protocolHandlerInstantiationFailed=L''instantiation du gestionnaire de protocole a échoué: {0}
coyoteConnector.protocolHandlerStartFailed=Le démarrage du gestionnaire de protocole a échoué: {0}
coyoteConnector.protocolRegistrationFailed=L'enregistrement du protocol JMX a échoué
-coyoteConnector.protocolHandlerPauseFailed=La suspension du gestionnaire de protocole a échoué
-coyoteConnector.protocolHandlerResumeFailed=Le redémarrage du gestionnaire de protocole a échoué
+coyoteConnector.protocolHandlerPauseFailed=La suspension du gestionnaire de protocole a échouée
+coyoteConnector.protocolHandlerResumeFailed=Le redémarrage du gestionnaire de protocole a échoué
#
# CoyoteAdapter
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
hgomez 2004/02/27 01:07:23 Modified:jk/native2/common jk_worker_ajp13.c Log: Fix BR27281, when user stop its browser return 206 instead of 500 Revision ChangesPath 1.60 +4 -0 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c Index: jk_worker_ajp13.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- jk_worker_ajp13.c 24 Feb 2004 08:44:40 - 1.59 +++ jk_worker_ajp13.c 27 Feb 2004 09:07:23 - 1.60 @@ -444,6 +444,10 @@ s-is_recoverable_error = JK_FALSE; env-l-jkLog(env, env-l, JK_LOG_ERROR, ajp13.service() Error receiving initial post %d %d %d\n, err, errno, attempt); + +/* BR #27281 : Should we return HTTP 500 since its the user who stop the sending ? */ +/* may be not, so return another HTTP code - use PARTIAL CONTENT, 206 instead */ +s-status = 206; return JK_ERR; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27281] - Mod_jk2 logs a 500 error in apache access log when user presses Stop
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=27281. 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=27281 Mod_jk2 logs a 500 error in apache access log when user presses Stop [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 09:08 --- Thanks to take a look at CVS code, return 206 instead - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27281] - Mod_jk2 logs a 500 error in apache access log when user presses Stop
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=27281. 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=27281 Mod_jk2 logs a 500 error in apache access log when user presses Stop --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 09:12 --- Various options: 200 - request completed sucessfull. That the user has gone away should be of no consequence to the server. 204 - no content. If no content was served to the user. 206 - partial content. If partial content was served to the user. 503 - service temporarily unavailable. sonce the failure is temporary this could be indicated. My preference is for 204/206. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
Good evening Henri.
Can the 'avaiable' be 'available' by the time of the jk2 release? :-)
Norm
P.S. Great work regardless of my nitpicking.
P.S.2 Gunter deliberately puts a few crumbs in his contributions so others
less gifted can contribute something.
hgomez 2004/02/27 00:37:48
Modified:jk/native2/common jk_worker_status.c
Log:
Gunter addon (and initial stylesheet)
Revision ChangesPath
1.49 +5 -0
jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- jk_worker_status.c 24 Feb 2004 08:44:40 - 1.48
+++ jk_worker_status.c 27 Feb 2004 08:37:48 - 1.49
@@ -36,6 +36,8 @@
#define JK_CHECK_NULL( str ) ( ((str)==NULL) ? null : (str) )
+#define DEFAULT_CSS (BODY {COLOR: #00; FONT-STYLE: normal;
FONT-FAMILY: \Times New Roman\, Times, serif; BACKGROUND-COLOR: #ff}
H1 { COLOR: #0033cc; FONT-FAMILY: Arial, Helvetica, sans-serif} H2 { COLOR:
#0033cc; FONT-FAMILY: Arial, Helvetica, sans-serif} H3 {FONT: 110% Arial,
Helvetica, sans-serif; COLOR: #0033cc} B {FONT-WEIGHT: bold} )
+
/** Display info for one endpoint
*/
static void jk2_worker_status_displayStat(jk_env_t *env,
jk_ws_service_t *s,
@@ -173,6 +175,7 @@
int needHeader=JK_TRUE;
if( wenv-shm==NULL || wenv-shm-head==NULL) {
+ s-jkprintf(env, s, h3No Scoreboard avaiable/h3\n);
return;
}
@@ -942,6 +945,8 @@
Content-Type, text/html, NULL);
}
s-head(env, s );
+
+ s-jkprintf(env, s, style%s/style\n, DEFAULT_CSS );
/** Process the query string.
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
hgomez 2004/02/27 01:24:45
Modified:jk/native2/common jk_worker_status.c
Log:
Fix typo
Revision ChangesPath
1.50 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
Index: jk_worker_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- jk_worker_status.c27 Feb 2004 08:37:48 - 1.49
+++ jk_worker_status.c27 Feb 2004 09:24:45 - 1.50
@@ -175,7 +175,7 @@
int needHeader=JK_TRUE;
if( wenv-shm==NULL || wenv-shm-head==NULL) {
- s-jkprintf(env, s, h3No Scoreboard avaiable/h3\n);
+ s-jkprintf(env, s, h3No Scoreboard available/h3\n);
return;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
NormW wrote: Good evening Henri. Can the 'avaiable' be 'available' by the time of the jk2 release? :-) Norm P.S. Great work regardless of my nitpicking. P.S.2 Gunter deliberately puts a few crumbs in his contributions so others less gifted can contribute something. Fixed. I wonder how to cleanup the HTML for jkstatus, so if you're CSS specialist, you're more than welcome :) BTW, don't expect release before next week ;-( - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
Good evening from Down Under. NormW wrote: Good evening Henri. Can the 'avaiable' be 'available' by the time of the jk2 release? :-) Norm P.S. Great work regardless of my nitpicking. P.S.2 Gunter deliberately puts a few crumbs in his contributions so others less gifted can contribute something. Fixed. * Thanks. Should quieten less socially aware nitpickers... I wonder how to cleanup the HTML for jkstatus, so if you're CSS specialist, you're more than welcome :) * Not a CSS specialist but will give it a closer look. The one thing that did surprise was a line 353 characters long if there are tab-police out there, this might excite some... but it will do for testing regardless. BTW, don't expect release before next week ;-( * When giving birth to a baby, it's best to wait until all the bits are in working order. Sooner one good fully-featured release than a number chase. Norm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
NormW wrote: Good evening from Down Under. NormW wrote: Good evening Henri. Can the 'avaiable' be 'available' by the time of the jk2 release? :-) Norm P.S. Great work regardless of my nitpicking. P.S.2 Gunter deliberately puts a few crumbs in his contributions so others less gifted can contribute something. Fixed. * Thanks. Should quieten less socially aware nitpickers... I wonder how to cleanup the HTML for jkstatus, so if you're CSS specialist, you're more than welcome :) * Not a CSS specialist but will give it a closer look. The one thing that did surprise was a line 353 characters long if there are tab-police out there, this might excite some... but it will do for testing regardless. Don't send cvs commit log to ASF Tab Police please ;) BTW, don't expect release before next week ;-( * When giving birth to a baby, it's best to wait until all the bits are in working order. Sooner one good fully-featured release than a number chase. Sure, we need this release as soon as possible, even if we make a 2.0.5 a little later to fix remaining problems - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c
Good evening Henri. NormW wrote: Good evening from Down Under. NormW wrote: Good evening Henri. Can the 'avaiable' be 'available' by the time of the jk2 release? :-) Norm P.S. Great work regardless of my nitpicking. P.S.2 Gunter deliberately puts a few crumbs in his contributions so others less gifted can contribute something. Fixed. * Thanks. Should quieten less socially aware nitpickers... I wonder how to cleanup the HTML for jkstatus, so if you're CSS specialist, you're more than welcome :) * Not a CSS specialist but will give it a closer look. The one thing that did surprise was a line 353 characters long if there are tab-police out there, this might excite some... but it will do for testing regardless. Don't send cvs commit log to ASF Tab Police please ;) No way my conf's use them, Apache ignores them and they take less space to store and read. BTW, don't expect release before next week ;-( * When giving birth to a baby, it's best to wait until all the bits are in working order. Sooner one good fully-featured release than a number chase. Sure, we need this release as soon as possible, even if we make a 2.0.5 a little later to fix remaining problems Ahem... I thought you would be aware of the shortcomings of haste by now... :-) Norm. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27216] - Problem start app with document base containing spaces
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=27216. 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=27216 Problem start app with document base containing spaces --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 10:48 --- No, you have to put the docBase in your context.xml (as simple copying is used, rather than saving it again, which is riskier). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 buglets II
Dues to the environment the word upgrade tends to send shivers down some of my team! We have a strict complaince system to work under. This is not just a tomcat issue, but an Opensource issue where bug fixes are released as upgrades. Most vendors release patches so that an existing version can continued to be used. Which is our case is handy. We might look at 4.1.3x in a few months depending on issues with 4.1.29. Thanks anyway! Greg -Original Message- From: David Rees [mailto:[EMAIL PROTECTED] Sent: 26 February 2004 19:33 To: [EMAIL PROTECTED] Subject: RE: jk2 buglets II [EMAIL PROTECTED] wrote: This seemed to be an issue with tomcat 4.1.24. Using 4.1.29 resolves this issue. Thanks for the pointers, especially the one to open my eyes and check which tomcat version I was using. While you're at it, you should upgrade to 4.1.30 which fixes some memory leaks and other minor issues which could crop up as well. -Dave - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
isapi_redirect Filter runs as local system account?
Hi I'm mystified as to how the isapi_redirect filter treats interacts with the NTFS permissions set on the physical dll file. My intent is to restrict access to my Tomcat application to a users in a particular Active Directory group. I've tried to do this by setting the NTFS permissions on isapi_redirect.dll to allow access by those users, and also by SYSTEM. This shouldn't work according to Q158229, since according to that, ISAPI Filter DLLs, .. run in the original context of the IIS service. All services run by default under the Local System account of the machine on which they are installed. But, on one Windows 2000 server, it works fine, provided the first user to attempt to access the Tomcat context has the appropriate NTFS permissions. If that is the case, it seems that IIS correctly passes users through (if they are in the Active Directory group) or gives them a 403 (if they aren't). On this machine things work with Windows Integrated Authentication, or with Basic Authentication. On another Windows 2000 server, everyone who can login to windows (its using Windows integrated authentication), is passed through to tomcat by the isapi_redirect filter (as you'd expect if Q158229 is correct and the code in jakarta-tomcat-connectors/jk/native/iis/ isn't doing anything tricky to impersonate the user or test whether the user can read isapi_redirect.dll). I'm not sure whether the code does anything which would explain what is happening? I had a quick look at r1.22 of jk_isapi_plugin.c but couldn't see anything obvious. I guess i could patch the code to at least test whether the user can read the file, but it might be easier to use apache and something like mod_ntlm or mod_sspi, or something else. cheers, Jason - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 buglets
Dear All, Testing the jk2-2.0.3 cvs we seem to get this error, which makes 2.0.3-dev useable for us. I can only assume others are not seeing this (apache 1.3.26 + mod_perl) on Solaris 2.8 (sparc). Has anyone had any success with 1.3.x on Solaris with the jk2-dev code? I an getting apr and apr-utils from CVS to see it this helps, otherwise I'll get acquainted with apr/shm and jk_shm.c! Greg [Fri Feb 27 09:58:28 2004] (error ) [jk_shm.c (233)] shm.create(): error mmapping /tmp/cr.sandwich.pfizer.com_81.shm [Fri Feb 27 09:58:28 2004] (error ) [jk_shm.c (158)] shm.create(): error creating /tmp/cr.sandwich.pfizer.com_81.shm 0 22 0x44e020 Invalid argument [Fri Feb 27 09:58:28 2004] (error ) [jk_shm.c (233)] shm.create(): error mmapping /tmp/cr.sandwich.pfizer.com_81.shm --- ab started [Fri Feb 27 09:59:21 2004] (error ) [jk_shm.c (350)] shm.createSlot() no shared memory head [Fri Feb 27 09:59:21 2004] (error ) [jk_endpoint.c (49)] workerEnv.init() create slot epStat.0 failed [Fri Feb 27 09:59:29 2004] (error ) [jk_shm.c (350)] shm.createSlot() no shared memory head - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 buglets
Hi, Testing the jk2-2.0.3 cvs we seem to get this error, which makes 2.0.3-dev useable for us. you mean 2.0.4-dev? I can only assume others are not seeing this (apache 1.3.26 + mod_perl) on Solaris 2.8 (sparc). Has anyone had any success with 1.3.x on Solaris with the jk2-dev code? look at your apr.h for APR_HAS_MMAP and tell us how this is set... Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
JK2 Close to 2.0.4
Hi, I finally have a couple of days to spare on JK2. Since Henri is doing great job on Apache side, I'm willing to clean the IIS port. Are there any pending issues that I can help with, so we can make the release. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK2 Close to 2.0.4
Mladen Turk wrote: Hi, I finally have a couple of days to spare on JK2. Since Henri is doing great job on Apache side, I'm willing to clean the IIS port. Are there any pending issues that I can help with, so we can make the release. Bugzilla reports 59 bugs... Help is _needed_ !!! MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] signature.asc Description: OpenPGP digital signature
[PATCH] jki_shm.c revert code removal v1.35-v1.36
Hi all, I would like to get the MMAP code back into CVS which was removed with version 1.36: http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c?r1=1.35r2=1.36 This code would enable the scoreboard working on NetWare; and probably on other platforms too where mmap() support isnt in APR for whatever reason (Solaris?) I've the problem that I cant compile Apache2 with APR_HAS_MMAP cause the mmap() support is new in the NetWare OS, and currently marked as experimental. Nevertheless it works with mod_jk2's scoreboard, and so would enable to test further with mod_jk2 on NetWare... If this gets accepted I can provide also a patch. thanks, Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] jki_shm.c revert code removal v1.35-v1.36
Guenter Knauf wrote: Hi all, I would like to get the MMAP code back into CVS which was removed with version 1.36: http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c?r1=1.35r2=1.36 This code would enable the scoreboard working on NetWare; and probably on other platforms too where mmap() support isnt in APR for whatever reason (Solaris?) I've the problem that I cant compile Apache2 with APR_HAS_MMAP cause the mmap() support is new in the NetWare OS, and currently marked as experimental. Nevertheless it works with mod_jk2's scoreboard, and so would enable to test further with mod_jk2 on NetWare... If this gets accepted I can provide also a patch. Let's go Guenter, send the patch for review - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK2 Close to 2.0.4
jean-frederic clere wrote: Mladen Turk wrote: Hi, I finally have a couple of days to spare on JK2. Since Henri is doing great job on Apache side, I'm willing to clean the IIS port. Are there any pending issues that I can help with, so we can make the release. Bugzilla reports 59 bugs... Help is _needed_ !!! Mladen, JF, Guenter, what about the APR_HOOK_MIDDLE in jk2_translate ? Any reason to have it set to APR_HOOK_FIRST ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 buglets
Hi Greg, look at your apr.h for APR_HAS_MMAP and tell us how this is set... #define APR_HAS_MMAP 1 thats strange. Is is possible that there's a permission issue with creating the file? Can you please try to configure the shm file to be created in a public writable dir, f.e. /tmp or such? Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK2 Close to 2.0.4
Mladen Turk wrote: -Original Message- From: jean-frederic clere Are there any pending issues that I can help with, so we can make the release. Bugzilla reports 59 bugs... Help is _needed_ !!! How did you came to that number? http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemail1=emailtype1=substringemailassigned_to1=1email2=emailtype2=substringemailreporter2=1bugidtype=includebug_id=changedin=votes=chfieldfrom=chfieldto=Nowchfieldvalue=product=Tomcat+4component=Connector%3ACoyote+JK+2short_desc=short_desc_type=allwordssubstrlong_desc=long_desc_type=allwordssubstrbug_file_loc=bug_file_loc_type=allwordssubstrkeywords=keywords_type=anywordsfield0-0-0=nooptype0-0-0=noopvalue0-0-0=cmdtype=doitnewqueryname=order=Reuse+same+sort+as+last+time (Tomcat4 + Connector:Coyote Jk2). I'm seeing only 25 of them. What was your query? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] signature.asc Description: OpenPGP digital signature
RE: JK2 Close to 2.0.4
Hi, -Original Message- From: jean-frederic clere Are there any pending issues that I can help with, so we can make the release. Bugzilla reports 59 bugs... Help is _needed_ !!! How did you came to that number? I'm seeing only 25 of them. I've also have some problems with the bugzilla query; Jean-Frederic, is it possible that you post here the query URL so that we all look at the same...? G. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] jki_shm.c revert code removal v1.35-v1.36
Hi, Let's go Guenter, send the patch for review http://www.gknw.com/test/jk_shm.c.diff thanks, Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK2 Close to 2.0.4
jean-frederic clere wrote: http://nagoya.apache.org/bugzilla/buglist.cgi?bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemail1=emailtype1=substringemailassigned_to1=1email2=emailtype2=substringemailreporter2=1bugidtype=includebug_id=changedin=votes=chfieldfrom=chfieldto=Nowchfieldvalue=product=Tomcat+4component=Connector%3ACoyote+JK+2short_desc=short_desc_type=allwordssubstrlong_desc=long_desc_type=allwordssubstrbug_file_loc=bug_file_loc_type=allwordssubstrkeywords=keywords_type=anywordsfield0-0-0=nooptype0-0-0=noopvalue0-0-0=cmdtype=doitnewqueryname=order=Reuse+same+sort+as+last+time (Tomcat4 + Connector:Coyote Jk2). There are some of them for TC 5 as well. The category is Native:JK. They are probably a little bit more up to date. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[OT] [FW: Please update your email address...]
Anyone has a clue why I'm receiving this on each mail send to this group? -Original Message- From: Autoresponder [mailto:[EMAIL PROTECTED] Sent: Friday, February 27, 2004 2:17 PM To: [EMAIL PROTECTED] Subject: Please update your email address... Reply-To: Autoresponder [EMAIL PROTECTED] X-Loop: [EMAIL PROTECTED] X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N We're sorry, but the RAD general email addresses have changed recently (to slow the flood of spam sigh). Please use one of these addresses instead: Sales: [EMAIL PROTECTED] RAD Video Tools Support: [EMAIL PROTECTED] Bink SDK Support: [EMAIL PROTECTED] Miles SDK Support: [EMAIL PROTECTED] Granny SDK Support: [EMAIL PROTECTED] Pixomatic SDK Support: [EMAIL PROTECTED] Smacker SDK Support: [EMAIL PROTECTED] Webmaster: [EMAIL PROTECTED] Sorry for the inconvenience and thanks for your support! RAD Game Tools - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] jki_shm.c revert code removal v1.35-v1.36
Guenter Knauf wrote: Hi, Let's go Guenter, send the patch for review http://www.gknw.com/test/jk_shm.c.diff Seems ok for me, I commit if nobody object... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK2 Close to 2.0.4
Henri Gomez wrote:
jean-frederic clere wrote:
Mladen Turk wrote:
Hi,
I finally have a couple of days to spare on JK2.
Since Henri is doing great job on Apache side, I'm willing to clean
the IIS
port.
Are there any pending issues that I can help with, so we can make the
release.
Bugzilla reports 59 bugs... Help is _needed_ !!!
Mladen, JF, Guenter, what about the APR_HOOK_MIDDLE in jk2_translate ?
I am +0 for an APR_HOOK_MIDDLE, but I think we have to make sure mod_rewrite is
before us:
+++
static const char * const aszPre[] = { mod_rewrite.c, NULL };
ap_hook_translate_name(jk2_translate,aszPre,NULL,APR_HOOK_MIDDLE);
+++
I have no problems with the APR_HOOK_FIRST and mod_dav.
Any reason to have it set to APR_HOOK_FIRST ?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
signature.asc
Description: OpenPGP digital signature
RE: jk2 buglets
-Original Message- From: Guenter Knauf [mailto:[EMAIL PROTECTED] Sent: 27 February 2004 13:20 To: [EMAIL PROTECTED] Subject: RE: jk2 buglets Hi Greg, look at your apr.h for APR_HAS_MMAP and tell us how this is set... #define APR_HAS_MMAP 1 thats strange. Is is possible that there's a permission issue with creating the file? Can you please try to configure the shm file to be created in a public writable dir, f.e. /tmp or such? Permissions should be ok. It does create a file, but with 0 size (even though we have set something like 16m) ie: -rw-r--r-- 1 root other 0 Feb 27 12:31 cr.sandwich.pfizer.com_81.shm Compared to the old version (same config bar the name and old conector used) -rwxr-xr-x 1 root root 1000448 Feb 24 11:14 shm.file Greg Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Q: why was jk2 doc removed from TC5?
Hi, found yesterday that the jk2 folder belows tomcat-docs is now removed, and the link now goes online to apache.org? what was the reason for this change? Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
jk2 : init child
I'm looking now why jk2_init() can't find child XXX in scoreboard. The MPM should BEFORE after us ? : ap_hook_child_init(jk2_child_init, NULL, NULL, APR_HOOK_LAST); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] jki_shm.c revert code removal v1.35-v1.36
Henri Gomez wrote: Guenter Knauf wrote: Hi, Let's go Guenter, send the patch for review http://www.gknw.com/test/jk_shm.c.diff Seems ok for me, I commit if nobody object... That is a work-around... The correct would be to fix APR. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] signature.asc Description: OpenPGP digital signature
DO NOT REPLY [Bug 10789] - Setting DirectoryIndex of index.jsp does not get served by jk2
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=10789. 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=10789 Setting DirectoryIndex of index.jsp does not get served by jk2 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 13:58 --- Seems to works with the latest jk2 in CVS... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14177] - modJk value used for jkConfig
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=14177. 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=14177 modJk value used for jkConfig [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 14:01 --- RPM / Redhat related, invalid for me - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] jki_shm.c revert code removal v1.35-v1.36
jean-frederic clere wrote: Henri Gomez wrote: Guenter Knauf wrote: Hi, Let's go Guenter, send the patch for review http://www.gknw.com/test/jk_shm.c.diff Seems ok for me, I commit if nobody object... That is a work-around... The correct would be to fix APR. I agree, but let fix this problem in jk 2.0.4 and will remove it as soon as APR is fixed. Let be Pragmatic :) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16331] - don't override the default port for the channelSocket
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=16331. 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=16331 don't override the default port for the channelSocket [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 14:07 --- Please clarify the report and reopen if needed - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] jki_shm.c revert code removal v1.35-v1.36
Hi, jean-frederic clere wrote: That is a work-around... The correct would be to fix APR. sure, agreed; and I work closely together with those maintaining Apache at Novell, as well as with the core OS folks; but I cant expect that I have mmap support in APR before the next half year... I agree, but let fix this problem in jk 2.0.4 and will remove it as soon as APR is fixed. thanks, and I promise to provide another patch as soon as we get fixed APR and OS. Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 buglets
Hi, Permissions should be ok. It does create a file, but with 0 size (even though we have set something like 16m) ie: -rw-r--r-- 1 root other 0 Feb 27 12:31 cr.sandwich.pfizer.com_81.shm Compared to the old version (same config bar the name and old conector used) -rwxr-xr-x 1 root root 1000448 Feb 24 11:14 shm.file hmm, seems not so ok to me; I believe the init creates the file, and the child cant access it... can you please try to change the file open in jk_shm.c at line 100 and test if it perhaps fixes the issue? /* First make sure the file exists and is big enough */ rc=apr_file_open( file, shm-fname, APR_READ | APR_WRITE | APR_CREATE | APR_BINARY, APR_WREAD|APR_WWRITE|APR_WEXECUTE, globalShmPool); Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
hgomez 2004/02/27 06:24:57
Modified:jk/native2/server/apache2 mod_jk2.c
Log:
Move translate to APR_HOOK_MIDDLE and make sure mod_rewrite will be
before us
Revision ChangesPath
1.69 +8 -4 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mod_jk2.c 27 Feb 2004 08:34:18 - 1.68
+++ mod_jk2.c 27 Feb 2004 14:24:57 - 1.69
@@ -891,11 +891,15 @@
static void jk2_register_hooks(apr_pool_t *p)
{
+static const char * const aszPre[] = { mod_rewrite.c, NULL };
+
ap_hook_handler(jk2_handler, NULL, NULL, APR_HOOK_MIDDLE);
-ap_hook_post_config(jk2_post_config,NULL,NULL,APR_HOOK_MIDDLE);
+ap_hook_post_config(jk2_post_config, NULL, NULL, APR_HOOK_MIDDLE);
+
/* Force the mpm to run before us and set the scoreboard image */
-ap_hook_child_init(jk2_child_init,NULL,NULL,APR_HOOK_LAST);
-ap_hook_translate_name(jk2_translate,NULL,NULL,APR_HOOK_FIRST); /* use
APR_HOOK_MIDDLE instead ? */
+ap_hook_child_init(jk2_child_init, NULL, NULL, APR_HOOK_LAST);
+
+ap_hook_translate_name(jk2_translate, aszPre, NULL, APR_HOOK_MIDDLE);
ap_hook_map_to_storage(jk2_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_shm.c
hgomez 2004/02/27 06:25:32
Modified:jk/native2/common jk_shm.c
Log:
Revert to old code until APR shm problem is fixed...
Revision ChangesPath
1.38 +85 -0 jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
Index: jk_shm.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_shm.c 24 Feb 2004 08:44:40 - 1.37
+++ jk_shm.c 27 Feb 2004 14:25:32 - 1.38
@@ -179,6 +179,91 @@
return JK_OK;
}
+#elif defined(HAVE_MMAP) !defined(WIN32)
+
+static int JK_METHOD jk2_shm_destroy(jk_env_t *env, jk_shm_t *shm)
+{
+caddr_t shmf=(caddr_t)shm-privateData;
+
+munmap(shmf, shm-size);
+
+return JK_OK;
+}
+
+static int jk2_shm_create(jk_env_t *env, jk_shm_t *shm)
+{
+int rc;
+struct stat filestat;
+
+int fd = open(shm-fname, O_RDWR|O_CREAT, 0777);
+
+if (fd == -1) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ shm.create(): Can't open %s %d %s\n,
+ shm-fname, errno, strerror( errno ));
+return JK_ERR;
+}
+
+rc=stat( shm-fname, filestat);
+if ( rc == -1) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ shm.create(): Can't stat %s %d %s\n,
+ shm-fname, errno, strerror( errno ));
+return JK_ERR;
+}
+
+if( shm-mbean-debug 0 )
+env-l-jkLog(env, env-l, JK_LOG_DEBUG,
+ shm.create(): file open %s %d %d\n, shm-fname, shm-size,
filestat.st_size );
+
+if (filestat.st_size shm-size ) {
+char bytes[1024];
+int toWrite=shm-size - filestat.st_size;
+
+memset( bytes, 0, 1024 );
+lseek(fd, 0, SEEK_END);
+
+while( toWrite 0 ) {
+int written;
+written=write(fd, bytes, 1024);
+if( written == -1 ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ shm.create(): Can't write %s %d %s\n,
+ shm-fname, errno, strerror( errno ));
+return JK_ERR;
+}
+toWrite-=written;
+}
+
+rc=stat( shm-fname, filestat);
+if ( rc == -1) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ shm.create(): Can't stat2 %s %d %s\n,
+ shm-fname, errno, strerror( errno ));
+return JK_ERR;
+ }
+}
+
+shm-privateData = mmap(NULL, filestat.st_size, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, 0);
+
+if (shm-privateData == (caddr_t)-1 ||
+shm-privateData == NULL ) {
+env-l-jkLog(env, env-l, JK_LOG_ERROR,
+ shm.create(): Can't mmap %s %d %s\n,
+ shm-fname, errno, strerror( errno ));
+
+close(fd);
+return JK_ERR;
+}
+
+shm-image = (void *)shm-privateData;
+shm-head = (jk_shm_head_t *)shm-image;
+
+close(fd);
+
+return JK_OK;
+}
+
#else
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK2 Close to 2.0.4
Mladen Turk wrote: -Original Message- From: jean-frederic clere Are there any pending issues that I can help with, so we can make the release. Bugzilla reports 59 bugs... Help is _needed_ !!! While you take a look at IIS, could you investigate the BR #15278. Seems to be a problem with 16bits int ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Moving to license 2.0
Hi, I've started migrating the jakarta-tomcat-catalina module to the Apache License v2.0 per the instructions in http://www.apache.org/dev/apply-license.html. I assume no one else is doing this at this time, so no conflicts or issues should arise? I should be done within a few hours, depending on how hectic this morning is at work. Expect a massive commit at the end. Yoav Shapira Millennium ChemInformatics This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: JK2 Close to 2.0.4
-Original Message- From: Henri Gomez While you take a look at IIS, could you investigate the BR #15278. Seems to be a problem with 16bits int ? Sure :-). Well I'd like to use apr types on all function calls, returning APR_STATUS, etc... Some work has already been done, but few remaining are still open. What is the APR version we are relying on? CVS or 0.94? The CVS version has a timeout reslist (my patch introduced to be used in JK2), that I can use instead of all that fuzzy load balancing code, and for socket recycling. Are we gonna wait for that or release as is? Perhaps using #defines? MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JK2 Close to 2.0.4
Mladen Turk wrote: -Original Message- From: Henri Gomez While you take a look at IIS, could you investigate the BR #15278. Seems to be a problem with 16bits int ? Sure :-). Well I'd like to use apr types on all function calls, returning APR_STATUS, etc... Ok, but for next release, jk2 2.0.5... Some work has already been done, but few remaining are still open. Sure. What is the APR version we are relying on? CVS or 0.94? The latest available for Apache 2.0.48 (0.94 I think ?) The CVS version has a timeout reslist (my patch introduced to be used in JK2), that I can use instead of all that fuzzy load balancing code, and for socket recycling. Are we gonna wait for that or release as is? First release Perhaps using #defines? Could we have this determined at runtime ? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27293] - Date computation incorrect, causing If-Unmodified-Since failure
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=27293. 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=27293 Date computation incorrect, causing If-Unmodified-Since failure [EMAIL PROTECTED] changed: What|Removed |Added AssignedTo|jsled- |tomcat- |[EMAIL PROTECTED] |[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 14:58 --- Attached are two versions of a fix... specific-check.patch is a patch in checkIfUnmodifiedSince to reduce the resolution of 'lastModified' just before the check. We've been using a version of this in a DefaultServlet replacement internall to get around the bug. reduce-resolution.patch fixes this in ResourceInfo.set(...), which seems better, but is entirely untested. In fact, I didn't even see if either of these work or even compile. But bug + patch is better than nothing. :/ Reassigning bug to default component owner for action. FWIW, this has been true since at least 4.1.24, where we noticed it. I believe it's been true since before then. I have not checked the 5.x code to see if the analagous problem exists. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
remm2004/02/27 07:06:54
Modified:catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Bug 27293: Fix if-unmodified-since check, using the old-and-simple trick of
adding 1000.
Revision ChangesPath
1.20 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultServlet.java 27 Feb 2004 14:58:46 - 1.19
+++ DefaultServlet.java 27 Feb 2004 15:06:54 - 1.20
@@ -1825,7 +1825,7 @@
long lastModified = resourceInfo.date;
long headerValue = request.getDateHeader(If-Unmodified-Since);
if (headerValue != -1) {
-if ( lastModified headerValue ) {
+if ( lastModified (headerValue + 1000)) {
// The entity has not been modified since the date
// specified by the client. This is not an error case.
response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27293] - Date computation incorrect, causing If-Unmodified-Since failure
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=27293. 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=27293 Date computation incorrect, causing If-Unmodified-Since failure --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 15:09 --- This does make sense to me, and this is now fixed in Tomcat 5. The other comparisons simply add 1000 to headerValue, so I'll do the same to the check. Your way is more accurate, but IMO we don't need to care. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
jakarta-tomcat-catalina changed to Apache License 2.0
Hi, I've finished migrating this module to license 2.0, added the NOTICE file, and tested a clean anonymous build from scratch -- no problem. I've also hand-inspected a dozen or so files to make sure they're fine, again no problems. Assuming no objects, I'll proceed with jakarta-tomcat-connectors, jakarta-tomcat-5, jakarta-tomcat-site, etc. Thanks, Yoav Shapira Millennium ChemInformatics This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/procrun tomcat.rc
yoavs 2004/02/27 07:14:09 Modified:coyote/src/test/org/apache/coyote SimpleAdapter.java http11/src/test/java/org/apache/coyote/http11 FileTester.java RandomAdapter.java TestAdapter.java jk/native/domino config.h jk/native2/server/dsapi config.h procrun tomcat.rc Added: .NOTICE Log: Migrated license to Apache License 2.0 per PMC directive. See http://www.apache.org/licenses, http://www.apache.org/dev/apply-license.html Used script in CVS module committers, committers/relicense/src/java/org/apache/committers/ReplaceLicense.java Apparently many C files don't have the license? Revision ChangesPath 1.1 jakarta-tomcat-connectors/NOTICE Index: NOTICE === This product includes software developed by The Apache Software Foundation (http://www.apache.org/). 1.2 +13 -56 jakarta-tomcat-connectors/coyote/src/test/org/apache/coyote/SimpleAdapter.java Index: SimpleAdapter.java === RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/test/org/apache/coyote/SimpleAdapter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SimpleAdapter.java14 Jun 2001 01:08:00 - 1.1 +++ SimpleAdapter.java27 Feb 2004 15:14:08 - 1.2 @@ -1,60 +1,17 @@ /* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Tomcat, and Apache Software - *Foundation must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - *nor may Apache appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the
Re: cvs commit: jakarta-tomcat-connectors/procrun tomcat.rc
On 27 Feb 2004, [EMAIL PROTECTED] wrote: Apparently many C files don't have the license? This is bad. The insert_license.pl script from almost the same location that holds the Java file you've used worked quite well for me to mass add licenses to files in Gump. You'd probably need to add .c and .h to the javaTypeFiles array in the script to have it recognize the sources and automatically choose the correct comment characters. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/procrun tomcat.rc
[EMAIL PROTECTED] wrote: yoavs 2004/02/27 07:14:09 Modified:coyote/src/test/org/apache/coyote SimpleAdapter.java http11/src/test/java/org/apache/coyote/http11 FileTester.java RandomAdapter.java TestAdapter.java jk/native/domino config.h jk/native2/server/dsapi config.h procrun tomcat.rc Added: .NOTICE Log: Migrated license to Apache License 2.0 per PMC directive. See http://www.apache.org/licenses, http://www.apache.org/dev/apply-license.html Used script in CVS module committers, committers/relicense/src/java/org/apache/committers/ReplaceLicense.java Apparently many C files don't have the license? On JTC, all .c files are in Apache License 2.0, done that in beg of week. Including .h, .pl, .m4 :) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 buglets
/* First make sure the file exists and is big enough */ rc=apr_file_open( file, shm-fname, APR_READ | APR_WRITE | APR_CREATE | APR_BINARY, APR_WREAD|APR_WWRITE|APR_WEXECUTE, globalShmPool); Thanks Guenter, Same sort of issue: [Fri Feb 27 15:12:08 2004] (error ) [jk_shm.c (163)] shm.create(): error creating /tmp/cr.sandwich.pfizer.com_81.shm 2117992 22 0x1f5020 Invalid argument [Fri Feb 27 15:12:08 2004] (error ) [jk_shm.c (238)] shm.create(): error mmapping /tmp/cr.sandwich.pfizer.com_81.shm ( 22 = Invalid argument ) Ideas? Come Monday I'll have a rummage in jk_shm.c and apr. Greg Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27216] - Problem start app with document base containing spaces
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=27216. 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=27216 Problem start app with document base containing spaces --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 16:03 --- I have decided to refactor a little bit the deployer to address these issues (the check for an existing /META-INF/context.xml will be done in the deployer, which will also be in charge of saving the XML if needed). This obviously might introduce regressions, but will be cleaner. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: jk2 buglets
Hi Greg, Same sort of issue: [Fri Feb 27 15:12:08 2004] (error ) [jk_shm.c (163)] shm.create(): error creating /tmp/cr.sandwich.pfizer.com_81.shm 2117992 22 0x1f5020 Invalid argument [Fri Feb 27 15:12:08 2004] (error ) [jk_shm.c (238)] shm.create(): error mmapping /tmp/cr.sandwich.pfizer.com_81.shm ( 22 = Invalid argument ) Ideas? hmm, you could check to use the old mmap code which Henri just has checked in again; get latest jk_shm.c from cvs and modifiy it to ignore APR_HAS_MMAP and use HAVE_MMAP instead; if that works then we know for sure that APR mmap supportg is somehow broken on Solaris, and you have to ask in the apr group for a fix... Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [OT] [FW: Please update your email address...]
This has happened to a few people in the last few months. Whomever from radgametools that is subscribed here needs to unsubscribe out of curteousy to the rest of the group, or subscribe on of these accepted addresses they list. [EMAIL PROTECTED] 2/27/04 6:33:38 AM Anyone has a clue why I'm receiving this on each mail send to this group? -Original Message- From: Autoresponder [mailto:[EMAIL PROTECTED] Sent: Friday, February 27, 2004 2:17 PM To: [EMAIL PROTECTED] Subject: Please update your email address... Reply-To: Autoresponder [EMAIL PROTECTED] X-Loop: [EMAIL PROTECTED] X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N We're sorry, but the RAD general email addresses have changed recently (to slow the flood of spam sigh). Please use one of these addresses instead: Sales: [EMAIL PROTECTED] RAD Video Tools Support: [EMAIL PROTECTED] Bink SDK Support: [EMAIL PROTECTED] Miles SDK Support: [EMAIL PROTECTED] Granny SDK Support: [EMAIL PROTECTED] Pixomatic SDK Support: [EMAIL PROTECTED] Smacker SDK Support: [EMAIL PROTECTED] Webmaster: [EMAIL PROTECTED] Sorry for the inconvenience and thanks for your support! RAD Game Tools - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] Jeff Tulley ([EMAIL PROTECTED]) (801)861-5322 Novell, Inc., The Leading Provider of Net Business Solutions http://www.novell.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [OT] [FW: Please update your email address...]
From: Jeff Tulley This has happened to a few people in the last few months. Whomever from radgametools that is subscribed here needs to unsubscribe out of curteousy to the rest of the group, or subscribe on of these accepted addresses they list. In fact I'm receiving tree mails on each post i make (_very_ annoying ). 1. Thank you for your enquiry or message. (from [EMAIL PROTECTED]) 2. Dear PC Mechanic Supporter, (from [EMAIL PROTECTED]) 3. Thank you for your email to The Bridal Shop. (from [EMAIL PROTECTED]) The second one has a subject ' Thank You For Ordering' (very spamish). Is the solution only to kindly ask them to unsubscribe and subscribe under a different account, or else? I'm getting those for months, same or similar, so could that be treated as spam? It looks like one to me. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27296] New: - Session may be used before being declared valid
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=27296. 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=27296 Session may be used before being declared valid Summary: Session may be used before being declared valid Product: Tomcat 5 Version: 5.0.19 Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Catalina:Cluster AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] taken from my email : it seems that DeltaSession.setId() fires the sessionCreated events to registered listeners, but this happens before a session is declared valid ( i.e. setValid(true) has not been called ). so when a registered listener tries to utilize ( what it seems to believe is ) a newly created session, the setAttribute method throws the IllegalStateException.. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27296] - Session may be used before being declared valid
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=27296. 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=27296 Session may be used before being declared valid --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 17:14 --- Created an attachment (id=10594) patch for issue . n.b. patch is against HEAD, but bug was reported against 5.0.19 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27216] - Problem start app with document base containing spaces
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=27216. 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=27216 Problem start app with document base containing spaces --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 17:16 --- Remy, thanks. Will it also fix the case when deploying using the manager application? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [OT] [FW: Please update your email address...]
Hi, In fact I'm receiving tree mails on each post i make (_very_ annoying ). 1. Thank you for your enquiry or message. (from [EMAIL PROTECTED]) 2. Dear PC Mechanic Supporter, (from [EMAIL PROTECTED]) 3. Thank you for your email to The Bridal Shop. (from [EMAIL PROTECTED]) The second one has a subject ' Thank You For Ordering' (very spamish). Is the solution only to kindly ask them to unsubscribe and subscribe under a different account, or else? I'm getting those for months, same or similar, so could that be treated as spam? It looks like one to me. There are a variety of causes. We've seen a great increase in the number of 'smart' spam mailers than can subscribe themselves to our lists. Accordingly, the amount of things like the above has increased. The fact that only you get these three messages suggest it's your computer or a computer along the way, such as in your company, that's corrupted with one of these spam mailer worms. Nonetheless, I've sent new unsubscribe instructions to the above three addresses, which I can do as a moderator for tomcat-dev. Try sending a message to this list in a few minutes and see if you still get all three responses, or if something has changed. Please post your results. Thanks, Yoav Shapira This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17668] - mod_jk2 does not handle multiple wildcards in one regular expression
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=17668. 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=17668 mod_jk2 does not handle multiple wildcards in one regular expression [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 17:22 --- Use something like(in the httpd.conf VirtualHost entry): LocationMatch /*/servlet/ JkUriSet worker ajp13:localhost:8106 /LocationMatch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [OT] [FW: Please update your email address...]
Hi, There are a variety of causes. We've seen a great increase in the number of 'smart' spam mailers than can subscribe themselves to our lists. Accordingly, the amount of things like the above has increased. The fact that only you get these three messages suggest it's your computer or a computer along the way, such as in your company, that's corrupted with one of these spam mailer worms. I get exactly the same too - and a coule of others also. First I use latest virus scanners, second I use regulary standalone scanners to get those which deactivate scanners, and third which is the most inportant point: I dont use a SPAM mailer such as Outlook; so chances that a worm has subscribed to one of those lists from my machine is == 0. In addition I believe that many do just the same as I: they have a separate account for list post, and a white list which only accepts post from the list server, so normally they dont see those spam... Negative side effect of course is that all private replies to this address get also into the spam folder... Guenter. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 3888] - WebappClassLoader: Lifecycle error : CL stopped
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=3888. 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=3888 WebappClassLoader: Lifecycle error : CL stopped --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 17:31 --- Hi Jacob, I think you misunderstood what I was saying. We expanded the jar file into WEB-INF/classes. That is, jar -xf my.jar. We then removed the jar file from WEB-INF/lib. Therefore, any resources that were previously being loaded from the jar file would now be getting loaded from the classes directory. However, whereas the jar file would be locked after undeploy in the previous case, we now see undeploy happen successfully when the jar file is expanded. If it were any of our threads holding a resource open, it still would have it open in the classes directory. The only difference we should have seen were that individual files would have been locked. We arrived at this point after having eliminated several cases where our threads were holding resources open. We've now verified this by getting a thread dump on threads still around after the undeploy. Also, we have no problem in running the exact same scenario in WebLogic. We're still investigating the problem and should have more info from a profiling tool pretty soon. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27299] New: - Using -security and port 80 causes crash
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=27299. 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=27299 Using -security and port 80 causes crash Summary: Using -security and port 80 causes crash Product: Tomcat 5 Version: 5.0.19 Platform: PC OS/Version: Windows XP Status: NEW Severity: Critical Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] download and install jakarta-tomcat5.19.zip - feb 27 version Set environment CATALINA_HOME=C:\Servers\Tomcat-5.0.19 with port 8080 and no use of -security - ok with 8080 and -security in commandline - ok change server.xml to port 80 regular startup.bat http://localhost/- works fine continue with server.xml port 80 with -security in startup.bat command line try for http://localhost/ no response, extended bunch of errors in command prompt window, the total log is: 2004-02-27 11:20:49 StandardContext[/balancer]org.apache.webapp.balancer. BalancerFilter: init(): ruleChain: [org.apache.webapp.balancer.RuleChain: [org. apache.webapp.balancer.rules.URLStringMatchRule: Target string: News / Redirect URL: http://www.cnn.com], [org.apache.webapp.balancer.rules. RequestParameterRule: Target param name: paramName / Target param value: paramValue / Redirect URL: http://www.yahoo.com], [org.apache.webapp.balancer. rules.AcceptEverythingRule: Redirect URL: http://jakarta.apache.org]] 2004-02-27 11:20:50 StandardContext[/jsp-examples]ContextListener: contextInitialized() 2004-02-27 11:20:50 StandardContext[/jsp-examples]SessionListener: contextInitialized() 2004-02-27 11:20:50 StandardContext[/servlets-examples]ContextListener: contextInitialized() 2004-02-27 11:20:50 StandardContext[/servlets-examples]SessionListener: contextInitialized() 2004-02-27 11:21:04 StandardWrapperValve[org.apache.jsp.index_jsp]: Servlet. service() for servlet org.apache.jsp.index_jsp threw exception java.lang.NoClassDefFoundError: org/apache/tomcat/util/buf/HexUtils at org.apache.coyote.http11.filters.ChunkedOutputFilter. doWrite(ChunkedOutputFilter.java:163) at org.apache.coyote.http11.InternalOutputBuffer. doWrite(InternalOutputBuffer.java:612) at org.apache.coyote.Response.doWrite(Response.java:586) at org.apache.coyote.tomcat5.OutputBuffer.realWriteBytes(OutputBuffer.java: 411) at org.apache.tomcat.util.buf.ByteChunk.append(ByteChunk.java:332) at org.apache.tomcat.util.buf.IntermediateOutputStream.write(C2BConverter. java:274) at sun.nio.cs.StreamEncoder$CharsetSE.writeBytes(StreamEncoder.java:336) at sun.nio.cs.StreamEncoder$CharsetSE.implFlushBuffer(StreamEncoder.java: 404) at sun.nio.cs.StreamEncoder$CharsetSE.implFlush(StreamEncoder.java:408) at sun.nio.cs.StreamEncoder.flush(StreamEncoder.java:152) at java.io.OutputStreamWriter.flush(OutputStreamWriter.java:213) at org.apache.tomcat.util.buf.WriteConvertor.flush(C2BConverter.java:223) at org.apache.tomcat.util.buf.C2BConverter.flushBuffer(C2BConverter.java: 166) at org.apache.coyote.tomcat5.OutputBuffer.realWriteChars(OutputBuffer.java: 613) at org.apache.tomcat.util.buf.CharChunk.append(CharChunk.java:298) at org.apache.coyote.tomcat5.OutputBuffer.write(OutputBuffer.java:518) at org.apache.coyote.tomcat5.CoyoteWriter.write(CoyoteWriter.java:165) at org.apache.jasper.runtime.JspWriterImpl.flushBuffer(JspWriterImpl.java: 161) at org.apache.jasper.runtime.JspWriterImpl.write(JspWriterImpl.java:368) at org.apache.jasper.runtime.JspWriterImpl.write(JspWriterImpl.java:379) at org.apache.jsp.index_jsp._jspService(index_jsp.java:50) at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:133) at javax.servlet.http.HttpServlet.service(HttpServlet.java:856) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl. java:39) at sun.reflect.DelegatingMethodAccessorImpl. invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:324) at org.apache.catalina.security.SecurityUtil$1.run(SecurityUtil.java:284) at java.security.AccessController.doPrivileged(Native Method) at javax.security.auth.Subject.doAsPrivileged(Subject.java:500) at org.apache.catalina.security.SecurityUtil.execute(SecurityUtil.java:306) at org.apache.catalina.security.SecurityUtil.doAsPrivilege(SecurityUtil. java:200) at org.apache.catalina.core.ApplicationFilterChain. internalDoFilter(ApplicationFilterChain.java:278)
RE: [OT] [FW: Please update your email address...]
From: Guenter Knauf I dont use a SPAM mailer such as Outlook; so chances that a worm has subscribed to one of those lists from my machine is == 0. :-). In addition I believe that many do just the same as I: they have a separate account for list post, and a white list which only accepts post from the list server, so normally they dont see those spam... Negative side effect of course is that all private replies to this address get also into the spam folder... Yes, I even tried to monitor the networ trafic for my spam mailer and it sends only one mail (to apache.org), so it's not on my side I'm affraid. In other cases I would see couple of mails sent. It's not the faulty recipient (altrough it tries to behave like one), cause it would bounce message back to the list. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [OT] [FW: Please update your email address...]
-Original Message- From: Shapira, Yoav Nonetheless, I've sent new unsubscribe instructions to the above three addresses, which I can do as a moderator for tomcat-dev. Try sending a message to this list in a few minutes and see if you still get all three responses, or if something has changed. Please post your results. Ok, two have gone. I'm sending you the header's of the rest two I receive. Return-Path: [EMAIL PROTECTED] Delivered-To: [EMAIL PROTECTED] Received: (qmail 22924 invoked from network); 27 Feb 2004 18:42:51 +0100 Received: from mx.iskon.hr ([EMAIL PROTECTED]) by pop.iskon.hr with SMTP; 27 Feb 2004 18:42:51 +0100 Received: (qmail 15087 invoked from network); 27 Feb 2004 18:42:50 +0100 X-Remote-IP: 209.237.227.194 Received: from minotaur.apache.org (209.237.227.194) by mx.iskon.hr with SMTP; 27 Feb 2004 18:42:50 +0100 Received: (qmail 24869 invoked by uid 1526); 27 Feb 2004 17:42:52 - Delivered-To: [EMAIL PROTECTED] Received: (qmail 24823 invoked from network); 27 Feb 2004 17:42:52 - Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur.apache.org with SMTP; 27 Feb 2004 17:42:52 - Received: (qmail 95723 invoked by uid 500); 27 Feb 2004 17:42:45 - Delivered-To: [EMAIL PROTECTED] Received: (qmail 95714 invoked from network); 27 Feb 2004 17:42:45 - Received: from unknown (HELO qs194.pair.com) (216.92.131.194) by daedalus.apache.org with SMTP; 27 Feb 2004 17:42:45 - Received: (qmail 72868 invoked by uid 3008); 27 Feb 2004 17:42:48 - Message-ID: [EMAIL PROTECTED] From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Date: 27 Feb 2004 12:42:48 EST Precedence: junk Subject: Thank You For Ordering Reply-To: [EMAIL PROTECTED] X-Loop: [EMAIL PROTECTED] X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N and Return-Path: [EMAIL PROTECTED] Delivered-To: [EMAIL PROTECTED] Received: (qmail 22860 invoked from network); 27 Feb 2004 18:42:51 +0100 Received: from mx.iskon.hr ([EMAIL PROTECTED]) by pop.iskon.hr with SMTP; 27 Feb 2004 18:42:51 +0100 Received: (qmail 5893 invoked from network); 27 Feb 2004 18:42:50 +0100 X-Remote-IP: 209.237.227.194 Received: from minotaur.apache.org (209.237.227.194) by mx.iskon.hr with SMTP; 27 Feb 2004 18:42:50 +0100 Received: (qmail 24714 invoked by uid 1526); 27 Feb 2004 17:42:51 - Delivered-To: [EMAIL PROTECTED] Received: (qmail 24699 invoked from network); 27 Feb 2004 17:42:51 - Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur.apache.org with SMTP; 27 Feb 2004 17:42:51 - Received: (qmail 95390 invoked by uid 500); 27 Feb 2004 17:42:41 - Delivered-To: [EMAIL PROTECTED] Received: (qmail 95364 invoked from network); 27 Feb 2004 17:42:41 - Received: from unknown (HELO itonami.pair.com) (209.68.2.178) by daedalus.apache.org with SMTP; 27 Feb 2004 17:42:41 - Received: (qmail 4165 invoked by uid 3055); 27 Feb 2004 17:42:44 - Message-ID: [EMAIL PROTECTED] From: Autoresponder [EMAIL PROTECTED] To: [EMAIL PROTECTED] Date: 27 Feb 2004 12:42:44 EST Precedence: junk Subject: Please update your email address... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27299] - Using -security and port 80 causes crash
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=27299. 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=27299 Using -security and port 80 causes crash [EMAIL PROTECTED] changed: What|Removed |Added Severity|Critical|Normal --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 17:53 --- This is indeed 100% specific to port 80. Other ports don't do that. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27300] New: - SMAP line numbers incorrect when JSP comments are present
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=27300.
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=27300
SMAP line numbers incorrect when JSP comments are present
Summary: SMAP line numbers incorrect when JSP comments are
present
Product: Tomcat 5
Version: 5.0.19
Platform: All
OS/Version: All
Status: NEW
Severity: Normal
Priority: Other
Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
If a JSP contains JSP comments, the generated servlet does not contain the JSP
comments. Consequently, the SMAP line mappings are incorrect.
For example, given a JSP:
html
head
titleUntitled Document/title
/head
%--
JSP comment
--%
body
/body
/html
The relevant section of the generated servlet (lines 42 to 49, inclusive) is:
out.write(html\n);
out.write( head\n);
out.write(titleUntitled Document/title\n);
out.write( /head\n);
out.write( \n);
out.write( body\n);
out.write( /body\n);
out.write(/html);
And the Generated SMAP is:
SMAP
test_jsp.java
JSP
*S JSP
*F
+ 0 test.jsp
test.jsp
*L
1,8:42
*E
The fix requires the following two modications:
1) In the class org.apache.jasper.compiler.TextOptimizer, the overriden method
visit(Node.Comment n) must be removed.
2) The inner class org.apache.jasper.compiler.Generator.GenerateVisitor must
override the method visit(Node.Comment n). I tested this, using the following
code, which works correctly:
public void visit(Node.Comment n) throws JasperException {
n.setBeginJavaLine(out.getJavaLine());
out.printin(out.write(\%--);
String text = n.getText();
boolean newLine = false;
if (text != null) {
for (int i = 0; i text.toCharArray().length; i++)
{
if (newLine) {
out.printin(out.write(\);
}
char ch = text.charAt(i);
if (ch == '\n') {
out.println(\\n\););
newLine = true;
}
else {
out.print(ch);
newLine = false;
}
}
}
// @todo: should the closing tag have a newline appended to it?
if (newLine) {
out.printil(out.write(\--%\););
}
else {
out.println(--%\););
}
n.setEndJavaLine(out.getJavaLine());
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Are the docs: serverStartup.pdf and requestProcess.pdf broken?
Hi, I think the files http://jakarta.apache.org/tomcat/tomcat-5.0-doc/architecture/requestProcess/requestProcess.pdf and http://jakarta.apache.org/tomcat/tomcat-5.0-doc/architecture/startup/serverStartup.pdf are broken. I've tested in under linux with gs and under Windows with Acrobat Reader 5 and received the same errors. I've checked the sources of tomcat5 out and the files there are corrupted too... Somebody forgot to add -kb cvs sticky tag? :) But seriously - can somebody open this file successfully? best regards, Michal Kostrzewa [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
- Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, February 27, 2004 1:07 AM Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c hgomez 2004/02/27 01:07:23 Modified:jk/native2/common jk_worker_ajp13.c Log: Fix BR27281, when user stop its browser return 206 instead of 500 Revision ChangesPath 1.60 +4 -0 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c Index: jk_worker_ajp13.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- jk_worker_ajp13.c 24 Feb 2004 08:44:40 - 1.59 +++ jk_worker_ajp13.c 27 Feb 2004 09:07:23 - 1.60 @@ -444,6 +444,10 @@ s-is_recoverable_error = JK_FALSE; env-l-jkLog(env, env-l, JK_LOG_ERROR, ajp13.service() Error receiving initial post %d %d %d\n, err, errno, attempt); + +/* BR #27281 : Should we return HTTP 500 since its the user who stop the sending ? */ +/* may be not, so return another HTTP code - use PARTIAL CONTENT, 206 instead */ +s-status = 206; return JK_ERR; } IMHO, mod_jk2 shouldn't touch the status code in this case (since it can't possibly be sent back to the client). It should leave the status code as whatever Tomcat set it to. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments. In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 23610] - unknown SSI directives
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=23610. 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=23610 unknown SSI directives --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 18:43 --- Some patches were indeed not ported to the Tomcat 5 branch, and would now need to be merged (which I'm not going to do so a volunteer is needed). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp isapi.dsw
mturk 2004/02/27 10:48:22
Modified:jk/native2/server/isapi isapi.dsp isapi.dsw
Log:
Remove unneeded link targets to apr libraries.
Use the dependencies instead.
Revision ChangesPath
1.25 +4 -4 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp
Index: isapi.dsp
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- isapi.dsp 3 Feb 2004 16:27:56 - 1.24
+++ isapi.dsp 27 Feb 2004 18:48:22 - 1.25
@@ -55,7 +55,7 @@
LINK32=link.exe
# ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept
/libpath:$(APACHE2_HOME)\lib
# SUBTRACT BASE LINK32 /nodefaultlib
-# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib
pcre.lib pcreposix.lib /nologo /dll /debug /machine:I386
/out:Debug/isapi_redirector2.dll /pdbtype:sept /libpath:..\..\srclib\apr\libD
/libpath:..\..\srclib\apr-util\libD /libpath:..\..\srclib\apr-iconv\libD
/libpath:..\..\srclib\pcre\libD
+# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386
/out:Debug/isapi_redirector2.dll /pdbtype:sept /libpath:..\..\srclib\apr\libD
/libpath:..\..\srclib\apr-util\libD /libpath:..\..\srclib\apr-iconv\libD
/libpath:..\..\srclib\pcre\libD
# SUBTRACT LINK32 /nodefaultlib
!ELSEIF $(CFG) == isapi - Win32 Release
@@ -83,7 +83,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/machine:I386 /out:Release/isapi_redirector2.dll /libpath:$(APACHE2_HOME)\lib
-# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib
pcre.lib pcreposix.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll
/libpath:..\..\srclib\apr\libR /libpath:..\..\srclib\apr-util\libR
/libpath:..\..\srclib\apr-iconv\libR /libpath:..\..\srclib\pcre\libD
+# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386
/out:Release/isapi_redirector2.dll /libpath:..\..\srclib\apr\libR
/libpath:..\..\srclib\apr-util\libR /libpath:..\..\srclib\apr-iconv\libR
/libpath:..\..\srclib\pcre\libD
!ENDIF
@@ -371,7 +371,7 @@
# PROP BASE Ignore_Default_Tool 1
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating resources from $(InputPath)
-InputDir=\WORK\PROJECTS\apache\jk2\common
+InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common
InputPath=..\..\common\jk_logger_win32_message.mc
..\..\common\jk_logger_win32_message.rc : $(SOURCE) $(INTDIR) $(OUTDIR)
@@ -382,7 +382,7 @@
!ELSEIF $(CFG) == isapi - Win32 Release
# Begin Custom Build - Creating resources from $(InputPath)
-InputDir=\WORK\PROJECTS\apache\jk2\common
+InputDir=\WRKPLACE\PROJECTS\jtc\jk\native2\common
InputPath=..\..\common\jk_logger_win32_message.mc
..\..\common\jk_logger_win32_message.rc : $(SOURCE) $(INTDIR) $(OUTDIR)
1.5 +21 -0 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsw
Index: isapi.dsw
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsw,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- isapi.dsw 25 Feb 2004 15:10:02 - 1.4
+++ isapi.dsw 27 Feb 2004 18:48:22 - 1.5
@@ -38,6 +38,15 @@
Begin Project Dependency
Project_Dep_Name gen_uri_delims
End Project Dependency
+Begin Project Dependency
+Project_Dep_Name apr
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name apriconv
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name xml
+End Project Dependency
}}}
###
@@ -74,6 +83,18 @@
Package=4
{{{
+Begin Project Dependency
+Project_Dep_Name apr
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name aprutil
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name pcre
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name pcreposix
+End Project Dependency
}}}
###
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: Are the docs: serverStartup.pdf and requestProcess.pdf broken?
Howdy, I think the files http://jakarta.apache.org/tomcat/tomcat-5.0- doc/architecture/requestProcess/requestProcess.pdf and http://jakarta.apache.org/tomcat/tomcat-5.0- doc/architecture/startup/serverStartup.pdf are broken. They're broken on the web site, but they're OK in CVS: http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/webapps/docs/a rchitecture/ So they must be corrupted by our website staging process. I've restaged the website twice already with no effect. I've posted a question to the tomcat-dev list with this issue, no answer yet. Yoav Shapira This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsp
mturk 2004/02/27 10:53:30 Modified:jk/native2/server/isapi isapi.dsp Log: Remove unneeded linker paths to apr and pcre libraries. Revision ChangesPath 1.26 +2 -2 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- isapi.dsp 27 Feb 2004 18:48:22 - 1.25 +++ isapi.dsp 27 Feb 2004 18:53:30 - 1.26 @@ -55,7 +55,7 @@ LINK32=link.exe # ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept /libpath:$(APACHE2_HOME)\lib # SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept /libpath:..\..\srclib\apr\libD /libpath:..\..\srclib\apr-util\libD /libpath:..\..\srclib\apr-iconv\libD /libpath:..\..\srclib\pcre\libD +# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept # SUBTRACT LINK32 /nodefaultlib !ELSEIF $(CFG) == isapi - Win32 Release @@ -83,7 +83,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll /libpath:$(APACHE2_HOME)\lib -# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll /libpath:..\..\srclib\apr\libR /libpath:..\..\srclib\apr-util\libR /libpath:..\..\srclib\apr-iconv\libR /libpath:..\..\srclib\pcre\libD +# ADD LINK32 ws2_32.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll !ENDIF - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler TextOptimizer.java
kinman 2004/02/27 10:54:34
Modified:jasper2/src/share/org/apache/jasper/compiler
TextOptimizer.java
Log:
- Fix bugzilla 27300: Wrong Smap when jsp comments are present
Revision ChangesPath
1.3 +3 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TextOptimizer.java
Index: TextOptimizer.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TextOptimizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextOptimizer.java10 Nov 2003 22:26:20 - 1.2
+++ TextOptimizer.java27 Feb 2004 18:54:34 - 1.3
@@ -105,9 +105,6 @@
public void visit(Node.VariableDirective n) throws JasperException {
}
-public void visit(Node.Comment n) throws JasperException {
-}
-
/*
* Don't concatenate text across body boundaries
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: [OT] [FW: Please update your email address...]
HI, Ok, two have gone. I'm sending you the header's of the rest two I receive. Return-Path: [EMAIL PROTECTED] snip / Good, we're making progress. I've booted [EMAIL PROTECTED] and [EMAIL PROTECTED] off tomcat-dev, in addition to [EMAIL PROTECTED] which I unsubscribed earlier. Hopefully you'll be all set now. Yoav Shapira This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27300] - SMAP line numbers incorrect when JSP comments are present
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=27300. 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=27300 SMAP line numbers incorrect when JSP comments are present [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Summary|SMAP line numbers incorrect |SMAP line numbers incorrect |when JSP comments are |when JSP comments are |present |present --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 19:01 --- Applying the first step in you suggestion seems to fix the line mapping problem. I don't think it is necessary, or even correct, to generate the jsp comments in the response. Thanks for reporting and the patch. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c jk_uriMap.c
truk2004/02/27 11:10:07
Modified:jk/native2/common jk_uriEnv.c jk_uriMap.c
Log:
Use apache pcre functions when HAVE_AP_PCRE is defined. From Guenter Knauf.
Revision ChangesPath
1.54 +16 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jk_uriEnv.c 24 Feb 2004 08:44:40 - 1.53
+++ jk_uriEnv.c 27 Feb 2004 19:10:07 - 1.54
@@ -28,10 +28,14 @@
#include jk_uriMap.h
#include jk_registry.h
+#ifdef HAS_AP_PCRE
+#include httpd.h
+#else
#ifdef HAS_PCRE
#include pcre.h
#include pcreposix.h
#endif
+#endif
/* return non-zero if pattern has any glob chars in it */
@@ -65,7 +69,7 @@
int pcre = 0;
if (*name == '$') {
-#ifdef HAS_PCRE
+#if defined(HAS_PCRE) || defined(HAS_AP_PCRE)
++name;
uriEnv-uri = uriEnv-pool-pstrdup(env, uriEnv-pool, name);
uriEnv-match_type = MATCH_TYPE_REGEXP;
@@ -73,8 +77,13 @@
uriEnv.parseName() parsing %s regexp\n,
name);
{
+#ifdef HAS_AP_PCRE
+regex_t *preg = ap_pregcomp((apr_pool_t *)uriEnv-pool-_private,
uriEnv-uri, REG_EXTENDED);
+if (!preg) {
+#else
regex_t *preg = (regex_t *)uriEnv-pool-calloc( env, uriEnv-pool,
sizeof(regex_t));
if (regcomp(preg, uriEnv-uri, REG_EXTENDED)) {
+#endif
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
uriEnv.parseName() error compiling regexp %s\n,
uri);
@@ -132,14 +141,19 @@
if (pcre) {
++uri;
uriEnv-match_type = MATCH_TYPE_REGEXP;
-#ifdef HAS_PCRE
+#if defined(HAS_PCRE) || defined(HAS_AP_PCRE)
uriEnv-uri = uriEnv-pool-pstrdup(env, uriEnv-pool, uri);
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
uriEnv.parseName() parsing regexp %s\n,
uri);
{
+#ifdef HAS_AP_PCRE
+regex_t *preg = ap_pregcomp((apr_pool_t *)uriEnv-pool-_private,
uriEnv-uri, REG_EXTENDED);
+if (!preg) {
+#else
regex_t *preg = (regex_t *)uriEnv-pool-calloc( env, uriEnv-pool,
sizeof(regex_t));
if (regcomp(preg, uriEnv-uri, REG_EXTENDED)) {
+#endif
env-l-jkLog(env, env-l, JK_LOG_DEBUG,
uriEnv.parseName() error compiling regexp %s\n,
uri);
1.68 +8 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- jk_uriMap.c 24 Feb 2004 08:44:40 - 1.67
+++ jk_uriMap.c 27 Feb 2004 19:10:07 - 1.68
@@ -34,9 +34,15 @@
#include jk_uriMap.h
#include jk_registry.h
+#ifdef HAS_AP_PCRE
+#include httpd.h
+#define REGEXEC ap_regexec
+#else
#ifdef HAS_PCRE
#include pcre.h
#include pcreposix.h
+#define REGEXEC regexec
+#endif
#endif
static INLINE const char *jk2_findExtension(jk_env_t *env, const char *uri);
@@ -304,7 +310,7 @@
return uriMap-vhosts-get(env, uriMap-vhosts, *);
}
-#ifdef HAS_PCRE
+#if defined(HAS_PCRE) || defined(HAS_AP_PCRE)
static jk_uriEnv_t *jk2_uriMap_regexpMap(jk_env_t *env, jk_uriMap_t *uriMap,
jk_map_t *mapTable, const char *uri)
{
@@ -317,7 +323,7 @@
if (uwr-regexp) {
regex_t *r = (regex_t *)uwr-regexp;
regmatch_t regm[10];
-if (!regexec(r, uri, r-re_nsub + 1, regm, 0)) {
+if (!REGEXEC(r, uri, r-re_nsub + 1, regm, 0)) {
return uwr;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in NWGNUmakefile mod_jk2.dsp
truk2004/02/27 11:14:33
Modified:jk/native2/server/apache2 Makefile.apxs.in Makefile.in
NWGNUmakefile mod_jk2.dsp
Log:
Remove HAS_PCRE and add HAS_AP_PCRE. From Guenter Knauf.
apache2 doesn't need --with-pcre now and is silently ignored.
pcre support is always included for apache2
Revision ChangesPath
1.9 +1 -1
jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.apxs.in 10 Feb 2004 04:39:51 - 1.8
+++ Makefile.apxs.in 27 Feb 2004 19:14:33 - 1.9
@@ -11,7 +11,7 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
1.20 +3 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 24 Feb 2004 04:00:30 - 1.19
+++ Makefile.in 27 Feb 2004 19:14:33 - 1.20
@@ -37,11 +37,11 @@
${APR_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifdef APR_LIBDIR_LA
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0
endif
## Based on rules.mk ##
1.2 +1 -2
jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile
Index: NWGNUmakefile
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NWGNUmakefile 20 Nov 2003 00:26:30 - 1.1
+++ NWGNUmakefile 27 Feb 2004 19:14:33 - 1.2
@@ -59,9 +59,8 @@
-D__NOVELL_LIBC__ \
-D_POSIX_SOURCE \
-DHAS_APR \
+ -DHAS_AP_PCRE \
$(EOLIST)
-
-#-DHAS_PCRE
#
# These flags will be added to the link.opt file
1.8 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp
Index: mod_jk2.dsp
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_jk2.dsp 2 Feb 2004 21:58:55 - 1.7
+++ mod_jk2.dsp 27 Feb 2004 19:14:33 - 1.8
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D
_MBCS /D _USRDLL /D MOD_JK2_EXPORTS /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I
$(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I
$(APACHE2_HOME)\os\win32 /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D
_USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_PCRE /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\..\include /I $(JAVA_HOME)\include /I
$(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I
$(APACHE2_HOME)\os\win32 /D NDEBUG /D WIN32 /D _WINDOWS /D _MBCS /D
_USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_AP_PCRE /FR /YX /FD
/c
# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32
# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32
# ADD BASE RSC /l 0xc0a /d NDEBUG
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D
_WINDOWS /D _MBCS /D _USRDLL /D MOD_JK2_EXPORTS /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\include /I
$(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I
$(APACHE2_HOME)\os\win32 /D _DEBUG /D WIN32 /D _WINDOWS /D _MBCS /D
_USRDLL /D MOD_JK2_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_PCRE /FR /YX /FD
/GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\include /I
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsw
mturk 2004/02/27 11:15:45
Modified:jk/native2/server/isapi isapi.dsw
Log:
Change the dependencies so that VS7 makes
correct solution file
Revision ChangesPath
1.6 +6 -6 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsw
Index: isapi.dsw
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsw,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- isapi.dsw 27 Feb 2004 18:48:22 - 1.5
+++ isapi.dsw 27 Feb 2004 19:15:45 - 1.6
@@ -23,6 +23,9 @@
Package=4
{{{
+Begin Project Dependency
+Project_Dep_Name pcre
+End Project Dependency
}}}
###
@@ -39,12 +42,6 @@
Project_Dep_Name gen_uri_delims
End Project Dependency
Begin Project Dependency
-Project_Dep_Name apr
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name apriconv
-End Project Dependency
-Begin Project Dependency
Project_Dep_Name xml
End Project Dependency
}}}
@@ -94,6 +91,9 @@
End Project Dependency
Begin Project Dependency
Project_Dep_Name pcreposix
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name apriconv
End Project Dependency
}}}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c
mturk 2004/02/27 11:28:51
Modified:jk/native2/server/isapi jk_isapi_plugin.c
Log:
Remove the SF_NOTIFY_AUTH_COMPLETE define
checking. If someone wishes to compile jk2 he will anyhow
need the platform SDK. Any sdk since year 2000 has that
defined in the httpfilt.h
Revision ChangesPath
1.60 +5 -17
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- jk_isapi_plugin.c 24 Feb 2004 08:44:42 - 1.59
+++ jk_isapi_plugin.c 27 Feb 2004 19:28:51 - 1.60
@@ -39,7 +39,6 @@
#include jk_worker.h
#include apr_general.h
#include jk_iis.h
-//#include jk_uri_worker_map.h
#define SERVER_ROOT_TAG (serverRoot)
#define EXTENSION_URI_TAG (extensionUri)
@@ -160,7 +159,7 @@
pVer-dwFilterVersion = http_filter_revision;
}
auth_notification_flags = get_auth_flags();
-#ifdef SF_NOTIFY_AUTH_COMPLETE
+
if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
pVer-dwFlags = SF_NOTIFY_ORDER_HIGH|
SF_NOTIFY_SECURE_PORT |
@@ -168,9 +167,7 @@
SF_NOTIFY_PREPROC_HEADERS |
SF_NOTIFY_AUTH_COMPLETE;
}
-else
-#endif
-{
+else {
pVer-dwFlags = SF_NOTIFY_ORDER_HIGH|
SF_NOTIFY_SECURE_PORT |
SF_NOTIFY_NONSECURE_PORT|
@@ -232,15 +229,13 @@
DWORD szTranslate = sizeof(Translate);
DWORD szPort = sizeof(Port);
int nPort;
-#ifdef SF_NOTIFY_AUTH_COMPLETE
+
if (auth_notification_flags == SF_NOTIFY_AUTH_COMPLETE) {
GetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-GetHeader;
SetHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-SetHeader;
AddHeader=((PHTTP_FILTER_AUTH_COMPLETE_INFO)pvNotification)-AddHeader;
}
-else
-#endif
-{
+else {
GetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-GetHeader;
SetHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-SetHeader;
AddHeader=((PHTTP_FILTER_PREPROC_HEADERS)pvNotification)-AddHeader;
@@ -805,7 +800,6 @@
return env;
}
-#ifdef SF_NOTIFY_AUTH_COMPLETE
static int get_auth_flags()
{
HKEY hkey;
@@ -839,9 +833,3 @@
return rv;
}
-#else
-static int get_auth_flags()
-{
-return SF_NOTIFY_PREPROC_HEADERS;
-}
-#endif
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Are the docs: serverStartup.pdf and requestProcess.pdf broken?
Shapira, Yoav wrote: Howdy, I think the files http://jakarta.apache.org/tomcat/tomcat-5.0- doc/architecture/requestProcess/requestProcess.pdf and http://jakarta.apache.org/tomcat/tomcat-5.0- doc/architecture/startup/serverStartup.pdf are broken. They're broken on the web site, but they're OK in CVS: http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-catalina/webapps/docs/a rchitecture/ So they must be corrupted by our website staging process. I've restaged the website twice already with no effect. I've posted a question to the tomcat-dev list with this issue, no answer yet. Maybe it occurs because I upload the docs using a zip. I'll try to improve this in the next release. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Are the docs: serverStartup.pdf and requestProcess.pdf broken?
Howdy, Maybe it occurs because I upload the docs using a zip. I'll try to improve this in the next release. Good theory, I didn't check that. But I think for right now I'll overwrite the PDFs on the site with the ones from CVS manually. Thanks, Yoav Shapira This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Are the docs: serverStartup.pdf and requestProcess.pdf broken?
Howdy, Maybe it occurs because I upload the docs using a zip. I'll try to improve this in the next release. Good theory, I didn't check that. But I think for right now I'll overwrite the PDFs on the site with the ones from CVS manually. Thanks, A manual copy seems to work fine. Note size difference, before: -rw-rw-r-- 1 remm jakarta 46121 Feb 14 11:27 serverStartup.pdf after: -rw-rw-r-- 1 remm jakarta 46175 Feb 27 11:40 serverStartup.pdf Yoav Shapira This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Are the docs: serverStartup.pdf and requestProcess.pdf broken?
A manual copy seems to work fine. Note size difference, before: -rw-rw-r-- 1 remm jakarta 46121 Feb 14 11:27 serverStartup.pdf after: -rw-rw-r-- 1 remm jakarta 46175 Feb 27 11:40 serverStartup.pdf Thank you very much! everything is OK now :) Good to see such a beautiful diagrams! :))) best regards, Michal Kostrzewa [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
allowTrace attribute causing problems in the admin application
When I browse to a Coyote Connector in Tomcat's admin in 4.1.30, I get an HTTP 500 error - Error retrieving attribute allowTrace. I know the allowTrace functionality was added about a month ago, and was not a required attribute on the connector. This functionality works in Tomcat 5.0.19, but not 4.1.30 Jeff Tulley ([EMAIL PROTECTED]) (801)861-5322 Novell, Inc., The Leading Provider of Net Business Solutions http://www.novell.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15400] - doTrace implementation cannot handle multiple header names
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=15400. 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=15400 doTrace implementation cannot handle multiple header names [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2004-02-27 20:25 --- The implementation of doTrace() is in javax.servlet.http.HttpServlet and is outside of the control of the tomcat team. The problem is that the implementation uses getHeader() rather than getHeaders () If this is a problem for you, your best bet is to override the doTrace() method in your servlet. As a starter the javax.servlet.http.HttpServlet impementation is available from http://cvs.apache.org/viewcvs.cgi/*checkout*/jakarta-servletapi- 5/jsr154/src/share/javax/servlet/http/HttpServlet.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Are the docs: serverStartup.pdf and requestProcess.pdf broken?
Michal Kostrzewa wrote: Hi, I think the files http://jakarta.apache.org/tomcat/tomcat-5.0-doc/architecture/requestProcess/requestProcess.pdf and http://jakarta.apache.org/tomcat/tomcat-5.0-doc/architecture/startup/serverStartup.pdf are broken. When attempting to open them Acrobat Reader reports a series of errors that are very similar to a recent problem we've had. We could not email valid pdf files at all. They could be created locally and viewed successfully but not emailed. After investigations, trials and tribulations the short story is: A local windowsxp machine had been infected with a viral spam-mailer. The installed and active virus scanner had not caught it, and from our best guesses had missed it for over a week. A better virus scanner (pick your favorite, YMMV) found 100 infected files. However, the problem still persisted. We then removed and replaced our email program. which resolved the problem. I would include a better picture of what happened by including the file list/log from the virus scanner but the affected machine is now off-line and being replaced. Our thoughts seem to make sense in that the viral spam-mailer has to work by affecting those part of a system responsible for adding attachments. In the case of attaching pdf files, it would corrupt the file in the process. By now, you have already uploaded good copies to the CVS and resolved the immediate issue. But I thought I might mention this little episode in light of not only the corrupt pdf files but also the spurious email that that the list has been receiving (re : Mladen Turk). regards, Kevin I've tested in under linux with gs and under Windows with Acrobat Reader 5 and received the same errors. I've checked the sources of tomcat5 out and the files there are corrupted too... Somebody forgot to add -kb cvs sticky tag? :) But seriously - can somebody open this file successfully? best regards, Michal Kostrzewa [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
Bill Barker wrote: - Original Message - From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Friday, February 27, 2004 1:07 AM Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c hgomez 2004/02/27 01:07:23 Modified:jk/native2/common jk_worker_ajp13.c Log: Fix BR27281, when user stop its browser return 206 instead of 500 Revision ChangesPath 1.60 +4 -0 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c Index: jk_worker_ajp13.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- jk_worker_ajp13.c 24 Feb 2004 08:44:40 - 1.59 +++ jk_worker_ajp13.c 27 Feb 2004 09:07:23 - 1.60 @@ -444,6 +444,10 @@ s-is_recoverable_error = JK_FALSE; env-l-jkLog(env, env-l, JK_LOG_ERROR, ajp13.service() Error receiving initial post %d %d %d\n, err, errno, attempt); + +/* BR #27281 : Should we return HTTP 500 since its the user who stop the sending ? */ +/* may be not, so return another HTTP code - use PARTIAL CONTENT, 206 instead */ +s-status = 206; return JK_ERR; } IMHO, mod_jk2 shouldn't touch the status code in this case (since it can't possibly be sent back to the client). It should leave the status code as whatever Tomcat set it to. The problem is that we're not sure that Tomcat send something since user stop the upload - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_worker.h
Good morning All.
From my source, a 302 code is Found - the requested resource lies
temporarily under a different URI, which doesn't seem to match very closely
the text of the default noWorkerMsg.
Speaking of which, the word 'temporary' in the #define noWorkerMsg should be
'temporarily'.
Norm
hgomez 2004/02/27 00:34:18
Modified:jk/native2/server/apache2 mod_jk2.c
jk/native2/common jk_worker_lb.c
jk/native2/include jk_worker.h
Log:
Fix problem with ErrorDocument and Apache 2.0.
By default now, WE DON'T touch the headers
Revision ChangesPath
1.68 +12 -5
jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mod_jk2.c 24 Feb 2004 08:44:42 - 1.67
+++ mod_jk2.c 27 Feb 2004 08:34:18 - 1.68
@@ -22,7 +22,7 @@
***/
/*
- * mod_jk: keeps all servlet/jakarta related ramblings together.
+ * mod_jk2: keeps all servlet/jakarta related ramblings together.
*/
@@ -697,7 +697,7 @@
env-l-jkLog(env, env-l, JK_LOG_ERROR,
mod_jk.handle() No worker for %s\n, r-uri);
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return 500;
+return HTTP_INTERNAL_SERVER_ERROR;
}
if( uriEnv-mbean-debug 0 )
@@ -752,9 +752,16 @@
}
env-l-jkLog(env, env-l, JK_LOG_ERROR,
- mod_jk.handler() Error connecting to tomcat %d\n,
rc);
+ mod_jk.handler() Error connecting to tomcat %d,
status %d\n, rc, s-status);
+
workerEnv-globalEnv-releaseEnv( workerEnv-globalEnv, env );
-return 500;
+
+/* In case of error, if service() set a status code, send it back
*/
+/* Else fallback to HTTP_INTERNAL_SERVER_ERROR (500). */
+if (s-status != 0)
+return s-status;
+else
+return HTTP_INTERNAL_SERVER_ERROR;
}
/** Use the internal mod_jk mappings to find if this is a request for
1.37 +24 -16
jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c
Index: jk_worker_lb.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_lb.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_worker_lb.c 24 Feb 2004 08:44:40 - 1.36
+++ jk_worker_lb.c 27 Feb 2004 08:34:18 - 1.37
@@ -326,7 +326,7 @@
}
/* Initialize here the recovery POST buffer */
- s-reco_buf = jk2_msg_ajp_create( env, s-pool, 0);
+s-reco_buf = jk2_msg_ajp_create( env, s-pool, 0);
s-reco_status = RECO_INITED;
while(1) {
@@ -356,17 +356,21 @@
s-status=lb-noWorkerCode; /* SERVICE_UNAVAILABLE is
the default */
}
-if( s-status == 302 ) {
-s-headers_out-put(env, s-headers_out,
-Location, lb-noWorkerMsg, NULL);
-s-head(env, s );
-} else {
-s-headers_out-put(env, s-headers_out,
-Content-Type, text/html, NULL);
-s-head(env, s );
-s-jkprintf(env, s, lb-noWorkerMsg );
-}
-
+/* Don't touch headers if noErrorHeader set to TRUE, ie
ErrorDocument in Apache via mod_alias */
+if (! lb-noErrorHeader) {
+/* XXX: I didn't understand the 302, since s-status is
lb-hwBalanceErr or lb-noWorkerCode */
+/* Both could be set in workers2.properties so . */
+if( s-status == 302 ) {
+s-headers_out-put(env, s-headers_out,
+Location, lb-noWorkerMsg,
NULL);
+s-head(env, s );
+} else {
+s-headers_out-put(env, s-headers_out,
+Content-Type, text/html,
NULL);
+s-head(env, s );
+s-jkprintf(env, s, lb-noWorkerMsg );
+}
+}
s-afterRequest( env, s);
lb_priv-error_time = time(NULL);
return JK_ERR;
@@ -473,10 +477,10 @@
static char *jk2_worker_lb_multiValueInfo[]={worker, NULL };
static char *jk2_worker_lb_setAttributeInfo[]={attempts,
stickySession, recovery, timeout,
- hwBalanceErr,
noWorkerMsg, noWorkerCode, worker, NULL };
+
Re: allowTrace attribute causing problems in the admin application
Actually, if I am not mistaken, the attached txt file patches the
problem. An IntrospectionHelper.setProperty was needed for allowTrace.
On 5.0.x this was done automatically by setting a property in the
setAllowTrace setter. Then the properties were set into
IntrospectionHelper en masse later.
This patch works for me, at least.
Attached: patch.txt
[EMAIL PROTECTED] 2/27/04 1:13:02 PM
When I browse to a Coyote Connector in Tomcat's admin in 4.1.30, I get
an HTTP 500 error - Error retrieving attribute allowTrace. I know
the
allowTrace functionality was added about a month ago, and was not a
required attribute on the connector.
This functionality works in Tomcat 5.0.19, but not 4.1.30
Jeff Tulley ([EMAIL PROTECTED])
(801)861-5322
Novell, Inc., The Leading Provider of Net Business Solutions
http://www.novell.com
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Jeff Tulley ([EMAIL PROTECTED])
(801)861-5322
Novell, Inc., The Leading Provider of Net Business Solutions
http://www.novell.com
Index: org/apache/coyote/tomcat4/CoyoteConnector.java
===
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
retrieving revision 1.34
diff -u -r1.34 CoyoteConnector.java
--- org/apache/coyote/tomcat4/CoyoteConnector.java 24 Feb 2004 08:54:29 -
1.34
+++ org/apache/coyote/tomcat4/CoyoteConnector.java 27 Feb 2004 20:45:01 -
@@ -1198,6 +1198,8 @@
+ tomcatAuthentication);
IntrospectionUtils.setProperty(protocolHandler, compression,
compression);
+IntrospectionUtils.setProperty(protocolHandler, allowTrace,
++ allowTrace);
if (address != null) {
IntrospectionUtils.setProperty(protocolHandler, address,
address);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: allowTrace attribute causing problems in the adminapplication
Hi Jeff, I tested this before the 4.1.30 release, and just retested it, and it continues to work for me without your patch. Since the protocolHandler doesn't support the allowTrace property, the setProperty() is unnecessary in Tomcat 5.0.x and shouldn't make a difference in Tomcat 4.1.30. It is safer to keep the setProperty() in Tomcat 5 in case somebody cut pastes the setAllowTrace() method for some new property that does need it. Maybe a restart magically made the problem disappear. Does your 4.1.30 consistently show this problem without your patch? Cheers, Larry -Original Message- From: Jeff Tulley [mailto:[EMAIL PROTECTED] Sent: Friday, February 27, 2004 3:48 PM To: [EMAIL PROTECTED] Subject: Re: allowTrace attribute causing problems in the adminapplication Actually, if I am not mistaken, the attached txt file patches the problem. An IntrospectionHelper.setProperty was needed for allowTrace. On 5.0.x this was done automatically by setting a property in the setAllowTrace setter. Then the properties were set into IntrospectionHelper en masse later. This patch works for me, at least. Attached: patch.txt [EMAIL PROTECTED] 2/27/04 1:13:02 PM When I browse to a Coyote Connector in Tomcat's admin in 4.1.30, I get an HTTP 500 error - Error retrieving attribute allowTrace. I know the allowTrace functionality was added about a month ago, and was not a required attribute on the connector. This functionality works in Tomcat 5.0.19, but not 4.1.30 Jeff Tulley ([EMAIL PROTECTED]) (801)861-5322 Novell, Inc., The Leading Provider of Net Business Solutions http://www.novell.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] Jeff Tulley ([EMAIL PROTECTED]) (801)861-5322 Novell, Inc., The Leading Provider of Net Business Solutions http://www.novell.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm UserDatabaseRealm.java
markt 2004/02/27 14:03:03
Modified:catalina/src/share/org/apache/catalina/realm
UserDatabaseRealm.java
Log:
Provide an implementation for getName() and getPassword(). Found this whilst trying
to use CLIENT-CERT authentication with the Sun web services developement kit.
Revision ChangesPath
1.5 +9 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java
Index: UserDatabaseRealm.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/UserDatabaseRealm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserDatabaseRealm.java27 Feb 2004 14:58:45 - 1.4
+++ UserDatabaseRealm.java27 Feb 2004 22:03:03 - 1.5
@@ -214,7 +214,13 @@
*/
protected String getPassword(String username) {
-return (null);
+User user = database.findUser(username);
+
+if (user == null) {
+return null;
+}
+
+return (user.getPassword());
}
@@ -224,7 +230,7 @@
*/
protected Principal getPrincipal(String username) {
-return (null);
+return (database.findUser(username));
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
