svn commit: r658132 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Tue May 20 00:34:01 2008
New Revision: 658132
URL: http://svn.apache.org/viewvc?rev=658132&view=rev
Log:
Add some comments to Remy's -1s
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658132&r1=658131&r2=658132&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 00:34:01 2008
@@ -68,6 +68,8 @@
+1: markt
-1: remm (I think it is a good patch, but it throws an error for something
which was working before,
so I would think keeping it for the next release would be better)
+ markt How about making it optional with a system property that can be
used
+to restore the current behaviour is an app depends on it?
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44994
Correct BNF grammar so ${0 lt a ? 1 lt a ? "many": "one": "none"} works
@@ -93,6 +95,10 @@
it may not apply to HTTP/1.1, which may be more strict; passing
full URLs in the
request line is normally an HTTP/1.1 thing, from what I remember,
usable as an alternative
to the mandatory Host header)
+ markt Both the HTTP/1.1 and HTTP/1.0 contain broadly the same text
+regarding tolerant applications. (ie allow multiple SP/HT between
+method-url and url-httpVersion). However, it is optional so we
don't
+have to support it.
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
Use any META-INF/context.xml in a consistent manner and ensure it is used on
@@ -100,3 +106,6 @@
http://svn.apache.org/viewvc?rev=657995&view=rev
+1: markt
-1: remm (would need convincing that this is really well tested, otherwise
delay to next release)
+ markt Exactly what would convince you that this was well tested above and
+beyond the local testing that I have done to convince myself that
+this patch does what I want it to.
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r658139 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt
Date: Tue May 20 00:45:42 2008
New Revision: 658139
URL: http://svn.apache.org/viewvc?rev=658139&view=rev
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44282
Make TRACE level logging work with a security manager.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658139&r1=658138&r2=658139&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 00:45:42 2008
@@ -39,13 +39,6 @@
-1: remm: I believe it would need specific support for certain managers.
Interested users
could use their own extended manager instead.
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44282
- Do call to getClassLoader() in a privileged block.
- http://svn.apache.org/viewvc?rev=616953&view=rev
- +1: markt, fhanik, yoavs
- +0: remm: do we really want to fix these sort of "bugs" ?
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44595
http://svn.apache.org/viewvc?view=rev&revision=645428
+1: jfclere, rjung, fhanik, remm, pero
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=658139&r1=658138&r2=658139&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Tue May 20 00:45:42 2008
@@ -55,6 +55,7 @@
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
+import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
@@ -129,6 +130,23 @@
}
+
+protected final class PrivilegedGetClassLoader
+implements PrivilegedAction {
+
+public Class clazz;
+
+public PrivilegedGetClassLoader(Class clazz){
+this.clazz = clazz;
+}
+
+public ClassLoader run() {
+return clazz.getClassLoader();
+}
+}
+
+
+
// --- Static Variables
@@ -908,8 +926,17 @@
// Return the class we have located
if (log.isTraceEnabled())
log.debug(" Returning class " + clazz);
-if ((log.isTraceEnabled()) && (clazz != null))
-log.debug(" Loaded by " + clazz.getClassLoader());
+
+if ((log.isTraceEnabled()) && (clazz != null)) {
+ClassLoader cl;
+if (Globals.IS_SECURITY_ENABLED){
+cl = AccessController.doPrivileged(
+new PrivilegedGetClassLoader(clazz));
+} else {
+cl = clazz.getClassLoader();
+}
+log.debug(" Loaded by " + cl.toString());
+}
return (clazz);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=658139&r1=658138&r2=658139&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 20 00:45:42 2008
@@ -94,7 +94,11 @@
44021: Add support for using the # character to define
-multi-level contexts in WARs and dirctories in the appBase. (markt)
+multi-level contexts in WARs and directories in the appBase. (markt)
+
+
+44282: Fix TRACE level class loader logging message when a
+security manager is used. (markt)
44337: Dir listing crashes if no readme-file present
(funkman)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44282] WebappClassLoader. findClass calls getClassLoader without privileges
https://issues.apache.org/bugzilla/show_bug.cgi?id=44282 --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-20 00:45:52 PST --- This has been fixed in 6.0.x and will be included in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r658143 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/tomcat.nsi webapps/docs/changelog.xml
Author: markt Date: Tue May 20 00:50:46 2008 New Revision: 658143 URL: http://svn.apache.org/viewvc?rev=658143&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44955 Use correct location for endorsed dir Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/tomcat.nsi tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658143&r1=658142&r2=658143&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 00:50:46 2008 @@ -44,12 +44,6 @@ +1: jfclere, rjung, fhanik, remm, pero -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44955 - Use correct location for endorsed dir - http://svn.apache.org/viewvc?rev=654632&view=rev - +1: markt, remm, yoavs - -1: - * Fix NPE in patch for bug 44986 http://svn.apache.org/viewvc?rev=657149&view=rev +1: markt, remm, yoavs Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=658143&r1=658142&r2=658143&view=diff == --- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Tue May 20 00:50:46 2008 @@ -338,7 +338,7 @@ Section -post nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Classpath "$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm' - nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties" --StdOutput auto --StdError auto' + nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties" --StdOutput auto --StdError auto' WriteUninstaller "$INSTDIR\Uninstall.exe" Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=658143&r1=658142&r2=658143&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue May 20 00:50:46 2008 @@ -321,6 +321,10 @@ Fix build for JavaDoc. Patch provided by Stephen Bannasch. (markt) + +44955: Use correct location for endorsed directory in Windows +installer. (markt) + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44955] Winodws Service endorsed directory
https://issues.apache.org/bugzilla/show_bug.cgi?id=44955 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-20 01:19:46 PST --- Ther patch has been applied to 6.0.x and will be in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r658132 - /tomcat/tc6.0.x/trunk/STATUS.txt
On Tue, 2008-05-20 at 07:34 +, [EMAIL PROTECTED] wrote:
> Author: markt
> Date: Tue May 20 00:34:01 2008
> New Revision: 658132
>
> URL: http://svn.apache.org/viewvc?rev=658132&view=rev
> Log:
> Add some comments to Remy's -1s
>-1: remm (I think it is a good patch, but it throws an error for something
> which was working before,
> so I would think keeping it for the next release would be better)
> + markt How about making it optional with a system property that can be
> used
> +to restore the current behaviour is an app depends on it?
Ok.
> * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44994
>Correct BNF grammar so ${0 lt a ? 1 lt a ? "many": "one": "none"} works
> @@ -93,6 +95,10 @@
> it may not apply to HTTP/1.1, which may be more strict; passing
> full URLs in the
> request line is normally an HTTP/1.1 thing, from what I
> remember, usable as an alternative
> to the mandatory Host header)
> + markt Both the HTTP/1.1 and HTTP/1.0 contain broadly the same text
> +regarding tolerant applications. (ie allow multiple SP/HT between
> +method-url and url-httpVersion). However, it is optional so we
> don't
> +have to support it.
What does httpd do about that BTW ?
> * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
>Use any META-INF/context.xml in a consistent manner and ensure it is used
> on
> @@ -100,3 +106,6 @@
>http://svn.apache.org/viewvc?rev=657995&view=rev
>+1: markt
>-1: remm (would need convincing that this is really well tested, otherwise
> delay to next release)
> + markt Exactly what would convince you that this was well tested above
> and
> +beyond the local testing that I have done to convince myself that
> +this patch does what I want it to.
It's a start.
Rémy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45026] Custom HTTP-Error codes get remapped to 500er codes
https://issues.apache.org/bugzilla/show_bug.cgi?id=45026 --- Comment #5 from Rainer Jung <[EMAIL PROTECTED]> 2008-05-20 06:01:31 PST --- That helped a lot. Indeed it seems httpd 2.x forces a status line to contain a non empty reason phrase, although RFC 2616 seems to allow empty ones. I posted to httpd-dev about that. I would say your patch looks good, because having a trivial one looks better then none and it fixes the problem independent of any httpd fix. Depending on the httpd discussion, I'll see, if we add the same check to mod_jk as well, to fix the problem for older TC and httpd. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45026] Custom HTTP-Error codes get remapped to 500er codes
https://issues.apache.org/bugzilla/show_bug.cgi?id=45026 --- Comment #6 from Rainer Jung <[EMAIL PROTECTED]> 2008-05-20 07:24:30 PST --- See: http://marc.info/?t=12112883072&r=1&w=2 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r658292 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: remm Date: Tue May 20 08:50:05 2008 New Revision: 658292 URL: http://svn.apache.org/viewvc?rev=658292&view=rev Log: - Votes. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658292&r1=658291&r2=658292&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 08:50:05 2008 @@ -77,15 +77,12 @@ Note: This is on the critical path http://svn.apache.org/viewvc?rev=657954&view=rev +1: markt - -1: remm (the library causing this bug cannot possibly have read the little -hidden, optional appendix from the HTTP/1.0 spec, and rely on it, so it is simply broken; -it may not apply to HTTP/1.1, which may be more strict; passing full URLs in the -request line is normally an HTTP/1.1 thing, from what I remember, usable as an alternative -to the mandatory Host header) + -1: markt Both the HTTP/1.1 and HTTP/1.0 contain broadly the same text regarding tolerant applications. (ie allow multiple SP/HT between method-url and url-httpVersion). However, it is optional so we don't have to support it. + remm Apparently httpd does that, so I am changing my vote to "ignore issue" * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747 Use any META-INF/context.xml in a consistent manner and ensure it is used on @@ -95,4 +92,6 @@ -1: remm (would need convincing that this is really well tested, otherwise delay to next release) markt Exactly what would convince you that this was well tested above and beyond the local testing that I have done to convince myself that -this patch does what I want it to. \ No newline at end of file +this patch does what I want it to. + remm I am not sure this was fully tested. For example, the order of redeployResources is + likely significant, and it is changed in deployDirectory \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r658466 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Validator.java
Author: markt
Date: Tue May 20 15:33:19 2008
New Revision: 658466
URL: http://svn.apache.org/viewvc?rev=658466&view=rev
Log:
Fix NPE in patch for bug 44986
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658466&r1=658465&r2=658466&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 15:33:19 2008
@@ -44,11 +44,6 @@
+1: jfclere, rjung, fhanik, remm, pero
-1:
-* Fix NPE in patch for bug 44986
- http://svn.apache.org/viewvc?rev=657149&view=rev
- +1: markt, remm, yoavs
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45015
You can't use an unescaped quote if you quote the value with that character
http://svn.apache.org/viewvc?rev=657231&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=658466&r1=658465&r2=658466&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Tue May
20 15:33:19 2008
@@ -327,7 +327,7 @@
Node.PageDirective pageDir) throws JasperException {
Node.Root root = pageDir.getRoot();
-String configEnc = root.getJspConfigPageEncoding().toUpperCase();
+String configEnc = root.getJspConfigPageEncoding();
String pageDirEnc = thePageDirEnc.toUpperCase();
/*
@@ -337,6 +337,7 @@
* "UTF-16LE" as identical.
*/
if (configEnc != null) {
+configEnc = configEnc.toUpperCase();
if (!pageDirEnc.equals(configEnc)
&& (!pageDirEnc.startsWith("UTF-16") || !configEnc
.startsWith("UTF-16"))) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r658470 [1/2] - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/el/parser/ webapps/docs/
Author: markt
Date: Tue May 20 15:39:42 2008
New Revision: 658470
URL: http://svn.apache.org/viewvc?rev=658470&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44994
Correct BNF grammar so ${0 lt a ? 1 lt a ? "many": "one": "none"} works
Note patch is larger than strictly necessary due to autogenerated code
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParserConstants.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ParseException.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658470&r1=658469&r2=658470&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 15:39:42 2008
@@ -53,13 +53,6 @@
markt How about making it optional with a system property that can be
used
to restore the current behaviour is an app depends on it?
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44994
- Correct BNF grammar so ${0 lt a ? 1 lt a ? "many": "one": "none"} works
- http://svn.apache.org/viewvc?rev=657404&view=rev
- Note patch is larger than strictly necessary due to autogenerated code
- +1: markt, yoavs, remm
- -1:
-
* Additional patch from
https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
Allow configuration of JSSE providers
Based on a patch by Bruno Harbulot
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html?rev=658470&r1=658469&r2=658470&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html Tue May 20
15:39:42 2008
@@ -51,7 +51,7 @@
Choice
::=
-Or (
Or Choice )*
+Or (
Choice Choice )*
Or
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java?rev=658470&r1=658469&r2=658470&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.java Tue May 20
15:39:42 2008
@@ -27,15 +27,6 @@
throw new ELException(pe.getMessage());
}
}
-
- public static void main(String[] argv) throws Exception {
- String[] str = { "${foo()}", "${fn.fn:foo() ? a : b}", "${fn:foo() ?
(fn_af.f:fd() ? a : b) : b}", "${a.b.c ? a : b}" };
- for (int i = 0; i < str.length; i++) {
- SimpleNode sn = (SimpleNode) ELParser.parse(str[i]);
- System.out.println("\n" + str[i]);
- sn.dump("\t");
- }
- }
/*
* CompositeExpression
@@ -216,31 +207,31 @@
break label_2;
}
jj_consume_token(QUESTIONMARK);
- Or();
+ Choice();
jj_consume_token(COLON);
-AstChoice jjtn001 = new
AstChoice(JJTCHOICE);
-boolean jjtc001 = true;
-jjtree.openNodeScope(jjtn001);
+AstChoice jjtn001 = new
AstChoice(JJTCHOICE);
+boolean jjtc001 = true;
+jjtree.openNodeScope(jjtn001);
try {
Choice();
} catch (Throwable jjte001) {
-if (jjtc001) {
- jjtree.clearNodeScope(jjtn001);
- jjtc001 = false;
-} else {
- jjtree.popNode();
-}
-if (jjte001 instanceof
RuntimeException) {
- {if (true) throw
(RuntimeException)jjte001;}
-}
-if (jjte001 instanceof
ParseException) {
- {if (true) throw
(ParseException)jjte001;}
-}
-
DO NOT REPLY [Bug 44994] JSP EL condition expression fails when nested: ${a ? b ? x: y: z}
https://issues.apache.org/bugzilla/show_bug.cgi?id=44994 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-20 15:39:53 PST --- This has been fixed in 6.0.x and will be included in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43094] Allowing non-file based keystore and other providers
https://issues.apache.org/bugzilla/show_bug.cgi?id=43094 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Comment #7 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-20 15:54:16 PST --- The provider part of the patch has now been applied and will be included in 6.0.17 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r658474 - in /tomcat/tc6.0.x/trunk: java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: markt
Date: Tue May 20 15:54:32 2008
New Revision: 658474
URL: http://svn.apache.org/viewvc?rev=658474&view=rev
Log:
Fix remainder of https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
Provide options for selecting keystore providers
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=658474&r1=658473&r2=658474&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Tue May 20 15:54:32 2008
@@ -249,38 +249,39 @@
/*
* Gets the SSL server's keystore.
*/
-protected KeyStore getKeystore(String type, String pass)
+protected KeyStore getKeystore(String type, String provider, String pass)
throws IOException {
String keystoreFile = (String)attributes.get("keystore");
if (keystoreFile == null)
keystoreFile = defaultKeystoreFile;
-return getStore(type, keystoreFile, pass);
+return getStore(type, provider, keystoreFile, pass);
}
/*
* Gets the SSL server's truststore.
*/
-protected KeyStore getTrustStore(String keystoreType) throws IOException {
+protected KeyStore getTrustStore(String keystoreType,
+String keystoreProvider) throws IOException {
KeyStore trustStore = null;
-String trustStoreFile = (String)attributes.get("truststoreFile");
-if(trustStoreFile == null) {
-trustStoreFile = System.getProperty("javax.net.ssl.trustStore");
+String truststoreFile = (String)attributes.get("truststoreFile");
+if(truststoreFile == null) {
+truststoreFile = System.getProperty("javax.net.ssl.trustStore");
}
if(log.isDebugEnabled()) {
-log.debug("Truststore = " + trustStoreFile);
+log.debug("Truststore = " + truststoreFile);
}
-String trustStorePassword = (String)attributes.get("truststorePass");
-if( trustStorePassword == null) {
-trustStorePassword =
System.getProperty("javax.net.ssl.trustStorePassword");
+String truststorePassword = (String)attributes.get("truststorePass");
+if( truststorePassword == null) {
+truststorePassword =
System.getProperty("javax.net.ssl.trustStorePassword");
}
-if( trustStorePassword == null ) {
-trustStorePassword = getKeystorePassword();
+if( truststorePassword == null ) {
+truststorePassword = getKeystorePassword();
}
if(log.isDebugEnabled()) {
-log.debug("TrustPass = " + trustStorePassword);
+log.debug("TrustPass = " + truststorePassword);
}
String truststoreType = (String)attributes.get("truststoreType");
if( truststoreType == null) {
@@ -292,9 +293,22 @@
if(log.isDebugEnabled()) {
log.debug("trustType = " + truststoreType);
}
-if (trustStoreFile != null && trustStorePassword != null){
-trustStore = getStore(truststoreType, trustStoreFile,
- trustStorePassword);
+String truststoreProvider =
+(String)attributes.get("truststoreProvider");
+if( truststoreProvider == null) {
+truststoreProvider =
+System.getProperty("javax.net.ssl.trustStoreProvider");
+}
+if (truststoreProvider == null) {
+truststoreProvider = keystoreProvider;
+}
+if(log.isDebugEnabled()) {
+log.debug("trustProvider = " + truststoreProvider);
+}
+
+if (truststoreFile != null && truststorePassword != null){
+trustStore = getStore(truststoreType, truststoreProvider,
+truststoreFile, truststorePassword);
}
return trustStore;
@@ -303,13 +317,17 @@
/*
* Gets the key- or truststore with the specified type, path, and password.
*/
-private KeyStore getStore(String type, String path, String pass)
-throws IOException {
+private KeyStore getStore(String type, String provider, String path,
+String pass) throws IOException {
KeyStore ks = null;
InputStream istream = null;
try {
-ks = KeyStore.getInstance(type);
+if (provider == null) {
+ks = KeyStore.getInstance(type);
+} else {
+ks = KeyStore.getInstance(type, provider);
+}
svn commit: r658475 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue May 20 15:55:00 2008 New Revision: 658475 URL: http://svn.apache.org/viewvc?rev=658475&view=rev Log: Status update Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=658475&r1=658474&r2=658475&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue May 20 15:55:00 2008 @@ -53,13 +53,6 @@ markt How about making it optional with a system property that can be used to restore the current behaviour is an app depends on it? -* Additional patch from https://issues.apache.org/bugzilla/show_bug.cgi?id=43094 - Allow configuration of JSSE providers - Based on a patch by Bruno Harbulot - http://svn.apache.org/viewvc?rev=657449&view=rev - +1: markt, yoavs, remm - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42750 Make parsing of request line more tolerant of multiple SP and/or HT Note: This is on the critical path - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Potential problem with COMET & sendfile
Hi all
I'm investigating a potential problem that I'm having with tomcat 6.0.x
(head of the svn tree).
I have written a fileserver servlet. This servlet works mostly fine with
the NIO connector, except for problems with Sun's DirectBuffer
implementation but that's another story.
The issue I'm having is with the APR connector. Firstly I'll describe
the sequence of events from my client and servlet perspective:
client requests file
servlet gets COMET begin event, parses the request and sets the sendfile
attributes on the request. It also sets the status to 200 and sets
content length, mime type. Then it returns.
client receives file (hopefully ;-)
This works fine in the small. Here's what I'm seeing inside the tomcat
code. I was clued into this by not being able to find my socket (being
kept alive) because all of the pollers were on a "wait" call, rather
than on a "poll" call.
It appears that once the sendfile thread is done it hands the socket off
to a worker, presumably to check if there is another request that has
been received on that socket and can immediately be acted upon. The
issue that I'm having is in Http11AprProcessor line 810. There is a call :
if (!inputBuffer.parseRequestLine(keptAlive)) {
// This means that no data is available right now
// (long keepalive), so that the processor should be
recycled
// and the method should return true
openSocket = true;
// Add the socket to the poller
endpoint.getPoller().add(socket);
break;
}
request.setStartTime(System.currentTimeMillis());
keptAlive = true;
Unfortunately at this time keptAlive is false and this call to
inputBuffer blocks awaiting the next request from the client. I think
that something else is needed here but I'm still learning about the
intent of the code. My suspicion at this point is to ensure that
parseRequestLine is passed true if this worker was handed a socket
following a sendfile request. In this way if there's a following request
that we already have we can work on it, otherwise it goes back to the
poller, where it belongs. Currently if I have 50 clients all having
received a file using sendfile I now have 50 worker threads all blocking
on this line which kind of defeats the purpose of using sendfile.
Is anyone on the list familiar with this area of the code? Does my
reading of this problem seem sound?
Thanks
Alex.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r658470 [2/2] - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/el/parser/ webapps/docs/
Filip Hanik - Dev Lists wrote:
is this really the diff?
Yep. The joys of using code generation tools.
basically impossible to tell what changed
The bits that matter are:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt?rev=658470&r1=658469&r2=658470&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt Tue May 20
15:39:42 2008
@@ -104,7 +104,7 @@
*/
void Choice() : {}
{
- Or() ( Or() Choice() #Choice(3))*
+ Or() ( Choice() Choice() #Choice(3))*
}
/*
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html?rev=658470&r1=658469&r2=658470&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html Tue May 20
15:39:42 2008
@@ -51,7 +51,7 @@
Choice
::=
-Or (
Or HREF="#prod6">Choice )*
+Or (
Choice HREF="#prod6">Choice )*
Or
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r658292 - /tomcat/tc6.0.x/trunk/STATUS.txt
[EMAIL PROTECTED] wrote: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747 Use any META-INF/context.xml in a consistent manner and ensure it is used on @@ -95,4 +92,6 @@ -1: remm (would need convincing that this is really well tested, otherwise delay to next release) markt Exactly what would convince you that this was well tested above and beyond the local testing that I have done to convince myself that -this patch does what I want it to. \ No newline at end of file +this patch does what I want it to. + remm I am not sure this was fully tested. For example, the order of redeployResources is + likely significant, and it is changed in deployDirectory \ No newline at end of file You'd think the order mattered since someone went to the bother of specifying a LinkedHashMap but I didn't see anything in checkResources() - the only place the data is read - that depended on order. Do you see something I don't? Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r658132 - /tomcat/tc6.0.x/trunk/STATUS.txt
Remy Maucherat wrote: On Tue, 2008-05-20 at 07:34 +, [EMAIL PROTECTED] wrote: Author: markt Date: Tue May 20 00:34:01 2008 New Revision: 658132 URL: http://svn.apache.org/viewvc?rev=658132&view=rev Log: Add some comments to Remy's -1s -1: remm (I think it is a good patch, but it throws an error for something which was working before, so I would think keeping it for the next release would be better) + markt How about making it optional with a system property that can be used +to restore the current behaviour is an app depends on it? Ok. I'll get that done in the next couple of days and update the patch. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 37822] WebappClassLoader interfering with Catalina core classes
https://issues.apache.org/bugzilla/show_bug.cgi?id=37822 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #8 from Mark Thomas <[EMAIL PROTECTED]> 2008-05-20 16:29:08 PST --- As far as I can tell, all of these issues are fixed in the current source. If you find a new source of a memory leak, please open a new bug rather than adding to this one. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
