Re: more cookie fun
Filip Hanik - Dev Lists wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45272 turns out that IE doesn't like Path="/" but it does like Path=/ Do you mean that it also doesn't like Path=/myapp or does it like it? Cheers Jean-Frederic so, IE, doesn't really do RFC-2109, I would suggest quoting Path based on tspecials2 minus the "/" thoughts? Filip - 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: Re: How to deploy the tomcat4.1.x into eclipse?
Thanks a lot quintin, you've supplied a brand new way to build a project, I had never tried that way, in another words I hope you can explain that in a more specific way, or may you supply me a url of that tutorial. If I can manage that project, I intend to summarize the details of the building process and subscribe it to the open source(If they need). Best wishes Thanks a lot Quintin Beukes <[EMAIL PROTECTED]> 写道： Hey Chang, I figure the best way to do this would be to NOT have eclipse build the project, but use "External build tools". If you right-click the project, and click properties. Goto the Builders page, and disable the Java builder. Then click New button, and add an Ant builder. From those pages you can define which tasks need to be run for separate build steps (like compile, clean, automatic build, etc.) >From here you can run tomcat, but adding an "External Tool". Click the run menu, goto External tools, then open the External Tools Dialog. >From here you can add another task that runs the "bin/catalina.sh start" script. Q On 6/26/08, changxiangzhong wrote: > > Hello, everybody! > I wonder how to do that? Because when tc at version 4.1.x there are four > sub-projects, I have tried with the eclipse import the jars, and > successfully killed all the compiling errors, but when I started it there > was some exceptions which has no meanings, I guess it is the resources(such > as server.xml, *.icons) that which damaged the whole projects. So I hope > there would be someone to help me run that project. > > It would be appreciated if you can offer me a link to download a > eclipse-format project. > > Or maybe I should have done with the build.properties? build each of the > sub-projects? > > Thanks a lot. > > -- > View this message in context: > http://www.nabble.com/How-to-deploy-the-tomcat4.1.x-into-eclipse--tp18124290p18124290.html > Sent from the Tomcat - Dev mailing list archive at Nabble.com. > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- Quintin Beukes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - 雅虎邮箱，您的终生邮箱！
Re: more cookie fun
jean-frederic clere wrote: Filip Hanik - Dev Lists wrote: https://issues.apache.org/bugzilla/show_bug.cgi?id=45272 turns out that IE doesn't like Path="/" but it does like Path=/ Do you mean that it also doesn't like Path=/myapp or does it like it? it likes Path=/myapp but not Path="/myapp" essentially, it doesn't want the value quoted Filip Cheers Jean-Frederic so, IE, doesn't really do RFC-2109, I would suggest quoting Path based on tspecials2 minus the "/" thoughts? Filip - 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] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 42565] jsp / expression language ternary expression without space before colon stopped working
https://issues.apache.org/bugzilla/show_bug.cgi?id=42565 --- Comment #12 from Thomas Wiesel <[EMAIL PROTECTED]> 2008-06-26 07:22:17 PST --- (In reply to comment #11) > So can the patch be checked in? Would like to move to tc6... > the patch works fine for us, please check in, thanks a lot! -- 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 45283] Allow multiple authenticators to be added to pipeline
https://issues.apache.org/bugzilla/show_bug.cgi?id=45283 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Severity|normal |enhancement Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-06-26 07:57:01 PST --- The enhancement as described is not possible since the servlet spec only allows a single authenticator to be configured per web-app. What would be possible would be a realm that uses one method by default and falls back to a second if the first fails. -- 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 45261] Concurrent node failure leads to inconsistent views.
https://issues.apache.org/bugzilla/show_bug.cgi?id=45261 Filip Hanik <[EMAIL PROTECTED]> changed: What|Removed |Added AssignedTo|tomcat- |[EMAIL PROTECTED] |[EMAIL PROTECTED] | --- Comment #2 from Filip Hanik <[EMAIL PROTECTED]> 2008-06-26 08:05:07 PST --- hi Rob, the non blocking coordinator is still work in progress. Its one piece of code that got a bit over complicated once I started developing it, and I think it can be greatly simplified I will take a look at this beginning of next week Filip -- 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: DBCP Deadlock
I have submitted a patch for this to commons https://issues.apache.org/jira/browse/DBCP-270 Filip Metta wrote: I'm running TC 6.0.16 on 64Bit RH Linux 5.1 We're seeing a deadlock in the tomcat-dbcp - looks like it's to do with the abandoned connection checking. I thought 6.0.16 used the commons-dbcp-1.2.2 release which supposedly fixes this issue? = "Timer-3": waiting to lock monitor 0x53b40548 (object 0x2aaabf3210f0, a org.apache.tomcat.dbcp.dbcp.PoolableConnection), which is held by "TP-Processor27" "TP-Processor27": waiting to lock monitor 0x53b404d0 (object 0x2aaab9fa8b08, a org.apache.tomcat.dbcp.pool.impl.GenericObjectPool), which is held by "Timer-3" Java stack information for the threads listed above: === "Timer-3": at org.apache.tomcat.dbcp.dbcp.AbandonedTrace.addTrace(AbandonedTrace.java:175) - waiting to lock <0x2aaabf3210f0> (a org.apache.tomcat.dbcp.dbcp.PoolableConnection) at org.apache.tomcat.dbcp.dbcp.AbandonedTrace.init(AbandonedTrace.java:92) at org.apache.tomcat.dbcp.dbcp.AbandonedTrace.(AbandonedTrace.java:82) at org.apache.tomcat.dbcp.dbcp.DelegatingStatement.(DelegatingStatement.java:61) at org.apache.tomcat.dbcp.dbcp.DelegatingConnection.createStatement(DelegatingConnection.java:224) at org.apache.tomcat.dbcp.dbcp.PoolableConnectionFactory.validateConnection(PoolableConnectionFactory.java:331) at org.apache.tomcat.dbcp.dbcp.PoolableConnectionFactory.validateObject(PoolableConnectionFactory.java:312) at org.apache.tomcat.dbcp.pool.impl.GenericObjectPool.evict(GenericObjectPool.java:1217) - locked <0x2aaab9fa8b08> (a org.apache.tomcat.dbcp.pool.impl.GenericObjectPool) at org.apache.tomcat.dbcp.pool.impl.GenericObjectPool$Evictor.run(GenericObjectPool.java:1341) at java.util.TimerThread.mainLoop(Timer.java:512) at java.util.TimerThread.run(Timer.java:462) "TP-Processor27": at org.apache.tomcat.dbcp.pool.impl.GenericObjectPool.addObjectToPool(GenericObjectPool.java:1136) - waiting to lock <0x2aaab9fa8b08> (a org.apache.tomcat.dbcp.pool.impl.GenericObjectPool) at org.apache.tomcat.dbcp.pool.impl.GenericObjectPool.returnObject(GenericObjectPool.java:1076) at org.apache.tomcat.dbcp.dbcp.PoolableConnection.close(PoolableConnection.java:87) - locked <0x2aaabf3210f0> (a org.apache.tomcat.dbcp.dbcp.PoolableConnection) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r671973 - /tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
Author: fhanik
Date: Thu Jun 26 11:24:18 2008
New Revision: 671973
URL: http://svn.apache.org/viewvc?rev=671973&view=rev
Log:
work around for IE not being RFC compliant, IE doesn't like quotes around the
path value, even though a slash is considered a header delimiter and must be
quoted, fix for bug https://issues.apache.org/bugzilla/show_bug.cgi?id=45272
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?rev=671973&r1=671972&r2=671973&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Thu Jun 26
11:24:18 2008
@@ -135,6 +135,7 @@
private static final String tspecials = ",; ";
private static final String tspecials2 = "()<>@,;:\\\"/[]?={} \t";
+private static final String tspecials2NoSlash = "()<>@,;:\\\"[]?={} \t";
/*
* Tests a string and returns true if the string counts as a
@@ -146,6 +147,11 @@
* token; false if it is not
*/
public static boolean isToken(String value) {
+return isToken(value,null);
+}
+
+public static boolean isToken(String value, String literals) {
+String tspecials = (literals==null?ServerCookie.tspecials:literals);
if( value==null) return true;
int len = value.length();
@@ -172,8 +178,12 @@
return false;
}
-
public static boolean isToken2(String value) {
+return isToken2(value,null);
+}
+
+public static boolean isToken2(String value, String literals) {
+String tspecials2 = (literals==null?ServerCookie.tspecials2:literals);
if( value==null) return true;
int len = value.length();
@@ -299,7 +309,11 @@
// Path=path
if (path!=null) {
buf.append ("; Path=");
-maybeQuote2(version, buf, path);
+if (version==0) {
+maybeQuote2(version, buf, path);
+} else {
+maybeQuote2(version, buf, path,
ServerCookie.tspecials2NoSlash, false);
+}
}
// Secure
@@ -341,6 +355,10 @@
}
public static int maybeQuote2 (int version, StringBuffer buf, String
value, boolean allowVersionSwitch) {
+return maybeQuote2(version,buf,value,null,allowVersionSwitch);
+}
+
+public static int maybeQuote2 (int version, StringBuffer buf, String
value, String literals, boolean allowVersionSwitch) {
if (value==null || value.length()==0) {
buf.append("\"\"");
}else if (containsCTL(value,version))
@@ -349,16 +367,16 @@
buf.append('"');
buf.append(escapeDoubleQuotes(value,1,value.length()-1));
buf.append('"');
-} else if (allowVersionSwitch && (!STRICT_SERVLET_COMPLIANCE) &&
version==0 && !isToken2(value)) {
+} else if (allowVersionSwitch && (!STRICT_SERVLET_COMPLIANCE) &&
version==0 && !isToken2(value, literals)) {
buf.append('"');
buf.append(escapeDoubleQuotes(value,0,value.length()));
buf.append('"');
version = 1;
-} else if (version==0 && !isToken(value)) {
+} else if (version==0 && !isToken(value,literals)) {
buf.append('"');
buf.append(escapeDoubleQuotes(value,0,value.length()));
buf.append('"');
-} else if (version==1 && !isToken2(value)) {
+} else if (version==1 && !isToken2(value,literals)) {
buf.append('"');
buf.append(escapeDoubleQuotes(value,0,value.length()));
buf.append('"');
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r671975 - /tomcat/trunk/webapps/docs/changelog.xml
Author: fhanik Date: Thu Jun 26 11:25:30 2008 New Revision: 671975 URL: http://svn.apache.org/viewvc?rev=671975&view=rev Log: doco update for fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45272 Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=671975&r1=671974&r2=671975&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 26 11:25:30 2008 @@ -57,6 +57,9 @@ + 67197345272 + Workaround for IE cookie behavior + 666232 Prevent NPE stacktrace, and lost log message when logger has been shutdown. Instead log the error, with the message (fhanik) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45272] Version 1 cookie not persisted in IE
https://issues.apache.org/bugzilla/show_bug.cgi?id=45272 --- Comment #7 from Filip Hanik <[EMAIL PROTECTED]> 2008-06-26 11:26:26 PST --- Created an attachment (id=22180) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=22180) Patch for IE cookie behavior Patch checked into trunk, proposed for backport to 6.0 -- 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: r671978 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Thu Jun 26 11:27:29 2008 New Revision: 671978 URL: http://svn.apache.org/viewvc?rev=671978&view=rev Log: proposal 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=671978&r1=671977&r2=671978&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 26 11:27:29 2008 @@ -67,4 +67,9 @@ http://svn.apache.org/viewvc?rev=671650&view=rev +1: fhanik -1: + +* Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45272 + Patch attached in bugzilla issue + +1: fhanik + -1: \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r672011 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/connector/MapperListener.java
Author: fhanik
Date: Thu Jun 26 12:45:29 2008
New Revision: 672011
URL: http://svn.apache.org/viewvc?rev=672011&view=rev
Log:
apply patch
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=672011&r1=672010&r2=672011&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 26 12:45:29 2008
@@ -49,13 +49,6 @@
+1: markt, remm, fhanik
-1:
-* Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
- JMX re-registration was causing the context to briefly disappear from the
- mapper during reload causing 404s
- http://svn.apache.org/viewvc?rev=667644&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
Map.entrySet() should return entries, not values
http://svn.apache.org/viewvc?rev=668849&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=672011&r1=672010&r2=672011&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
Thu Jun 26 12:45:29 2008
@@ -26,11 +26,14 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
+import org.apache.catalina.core.StandardContext;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.mapper.Mapper;
+import org.apache.tomcat.util.http.mapper.MappingData;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -430,6 +433,19 @@
if (contextName.equals("/")) {
contextName = "";
}
+
+// Don't un-map a context that is paused
+MessageBytes hostMB = MessageBytes.newInstance();
+hostMB.setString(hostName);
+MessageBytes contextMB = MessageBytes.newInstance();
+contextMB.setString(contextName);
+MappingData mappingData = new MappingData();
+mapper.map(hostMB, contextMB, mappingData);
+if (mappingData.context instanceof StandardContext &&
+((StandardContext)mappingData.context).getPaused()) {
+return;
+}
+
if(log.isDebugEnabled())
log.debug(sm.getString
("mapperListener.unregisterContext", contextName));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r672012 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml
Author: fhanik
Date: Thu Jun 26 12:48:30 2008
New Revision: 672012
URL: http://svn.apache.org/viewvc?rev=672012&view=rev
Log:
fix 45195
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.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=672012&r1=672011&r2=672012&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 26 12:48:30 2008
@@ -41,14 +41,6 @@
+1: markt, remm, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45195
- NPE when calling getAttribute(null). The spec is unclear but this
- is a regression from 5.0.x. Also avoid NPE on remove.
- http://svn.apache.org/viewvc?rev=667604&view=rev
- http://svn.apache.org/viewvc?rev=668854&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
Map.entrySet() should return entries, not values
http://svn.apache.org/viewvc?rev=668849&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=672012&r1=672011&r2=672012&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
Thu Jun 26 12:48:30 2008
@@ -1032,6 +1032,8 @@
throw new IllegalStateException
(sm.getString("standardSession.getAttribute.ise"));
+if (name == null) return null;
+
return (attributes.get(name));
}
@@ -1634,6 +1636,9 @@
*/
protected void removeAttributeInternal(String name, boolean notify) {
+// Avoid NPE
+if (name == null) return;
+
// Remove this attribute from our collection
Object value = attributes.remove(name);
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=672012&r1=672011&r2=672012&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jun 26 12:48:30 2008
@@ -35,6 +35,9 @@
+ 45195
+Passing in null into setAttribute or removeAttribute cause NPE
+
APR connector now adds connection to poller after using send file
(remm)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r672014 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Parser.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/
Author: fhanik
Date: Thu Jun 26 12:52:52 2008
New Revision: 672014
URL: http://svn.apache.org/viewvc?rev=672014&view=rev
Log:
apply patches
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=672014&r1=672013&r2=672014&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 26 12:52:52 2008
@@ -32,15 +32,6 @@
[ New proposals should be added at the end of the list ]
-* 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
- The second svn commit provides an option to disable the error raised
- by the first.
- http://svn.apache.org/viewvc?rev=657231&view=rev
- http://svn.apache.org/viewvc?rev=670074&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
Map.entrySet() should return entries, not values
http://svn.apache.org/viewvc?rev=668849&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=672014&r1=672013&r2=672014&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Thu Jun 26
12:52:52 2008
@@ -75,6 +75,11 @@
private static final String JAVAX_BODY_CONTENT_TEMPLATE_TEXT =
"JAVAX_BODY_CONTENT_TEMPLATE_TEXT";
+private static final boolean STRICT_QUOTE_ESCAPING = Boolean.valueOf(
+System.getProperty(
+"org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
+"true")).booleanValue();
+
/**
* The constructor
*/
@@ -242,7 +247,8 @@
err.jspError(start, "jsp.error.attribute.unterminated", watch);
}
-String ret = parseQuoted(reader.getText(start, stop));
+String ret = parseQuoted(start, reader.getText(start, stop),
+watch.charAt(watch.length() - 1));
if (watch.length() == 1) // quote
return ret;
@@ -255,7 +261,8 @@
* QuotedChar ::= ''' | '"' | '\\' | '\"' | "\'" | '\>' | '\$' |
* Char
*/
-private String parseQuoted(String tx) {
+private String parseQuoted(Mark start, String tx, char quote)
+throws JasperException {
StringBuffer buf = new StringBuffer();
int size = tx.length();
int i = 0;
@@ -289,6 +296,10 @@
buf.append('\\');
++i;
}
+} else if (ch == quote && STRICT_QUOTE_ESCAPING) {
+// Unescaped quote character
+err.jspError(start, "jsp.error.attribute.noescape", tx,
+"" + quote);
} else {
buf.append(ch);
++i;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=672014&r1=672013&r2=672014&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Thu Jun 26 12:52:52 2008
@@ -341,6 +341,7 @@
jsp.error.attribute.noequal=equal symbol expected
jsp.error.attribute.noquote=quote symbol expected
jsp.error.attribute.unterminated=attribute for {0} is not properly terminated
+jsp.error.attribute.noescape=Attribute value {0} is quoted with {1} which must
be escaped when used within the value
jsp.error.missing.tagInfo=TagInfo object for {0} is missing from TLD
jsp.error.deferredmethodsignaturewithoutdeferredmethod=Cannot specify a method
signature if 'deferredMethod' is not 'true'
jsp.error.deferredvaluetypewithoutdeferredvalue=Cannot specify a value type if
'deferredValue' is not 'true'
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=672014&r1=672013&r2=672014&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jun 26 12:52:52 2008
@@ -273,6 +273,10 @@
DO NOT REPLY [Bug 45015] Quoting in attributes
https://issues.apache.org/bugzilla/show_bug.cgi?id=45015 --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-06-26 12:54:27 PST --- This has been fixed in 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]
DO NOT REPLY [Bug 43683] Accessing Servlet while Reloading context gives 404 error
https://issues.apache.org/bugzilla/show_bug.cgi?id=43683 --- Comment #20 from Mark Thomas <[EMAIL PROTECTED]> 2008-06-26 12:57:53 PST --- The patch for test case 2 has been applied to 6.0.x and will be in 6.0.17 onwards. I'm still looking at test case 3. -- 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: r672018 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: markt
Date: Thu Jun 26 13:16:43 2008
New Revision: 672018
URL: http://svn.apache.org/viewvc?rev=672018&view=rev
Log:
Clean up 6.0.17 change log. Put bugs in order, add missing punctuation, add
missing attributions, reduce some line lengths.
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
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=672018&r1=672017&r2=672018&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jun 26 13:16:43 2008
@@ -35,34 +35,30 @@
- 45195
-Passing in null into setAttribute or removeAttribute cause NPE
-
-APR connector now adds connection to poller after using send file
(remm)
-
- 42750
-request line should be tolerant of multiple whitespaces.
+APR connector now adds connection to poller after using send file.
+(remm)
-Add ManagerBase session getLastAccessedTimestamp and
getCreationTimestamp for better
-remote JMX access. (pero)
+Add ManagerBase session getLastAccessedTimestamp and
+getCreationTimestamp for better remote JMX access. (pero)
- 44595
-Add possibility to request the QueueSize of an executor via JMX.
(jfclere)
-
- expose alwaysSend flag for message dispatch interceptor
- 44833
-correctly override StandardSession methods from DeltaSession
-
- 42662
-properly resolve reflection proxies during session replication
-
+
+Expose alwaysSend flag for message dispatch interceptor. (fhanik)
+
29936: Create digesters and parsers earlier so we aren't
using the webapp class loader when we create them. (markt)
+42662: Properly resolve reflection proxies during session
+replication. (fhanik)
+
+
+42750: Request line should be tolerant of multiple
+whitespaces. (markt/fhanik)
+
+
42934: Change the order of events on context start so
contextInitialized() event is fired before
sessionDidActivate(). The spec isn't 100% clear on the
@@ -116,11 +112,12 @@
43683: Fix 404 that could occur if a Servlet is accessed
while the context is reloading. (markt)
- ExtendedAccessLogValve cs-uri not print empty querystring (pero)
+ ExtendedAccessLogValve cs-uri not print empty querystring. (pero)
-ServletContext.getResource("noslash/resource") only requires forward
slash if STRICT_SERVLET_COMPLIANCE
-flag is set to true. This mimics the behavior of 6.0.15 and earlier.
(fhanik)
+ServletContext.getResource("noslash/resource") only requires forward
+slash if STRICT_SERVLET_COMPLIANCE flag is set to true. This mimics the
+behavior of 6.0.15 and earlier. (fhanik)
44021: Add support for using the # character to define
@@ -131,7 +128,8 @@
security manager is used. (markt)
-44337: Dir listing crashes if no readme-file present
(funkman)
+44337: Dir listing crashes if no readme-file present.
+(funkman)
If listener declared in web.xml, only add it once. (funkman)
@@ -144,6 +142,10 @@
Florent Benoit. (markt)
+44389: Fix memory leak that occurred if using a
+RequestDispatcher. Patch provided by Arto Huusko. (markt)
+
+
44529: Correct handling of resource constraints so no roles
(deny all) overrides no aoth-constraint (allow all). (markt)
@@ -152,6 +154,10 @@
David Jencks. (markt)
+44595: Add possibility to request the QueueSize of an
+executor via JMX. (jfclere)
+
+
Fix CGI Servlet so it correctly reads the environment variables on
Vista. (markt)
@@ -184,11 +190,11 @@
Update web.xml to reflect packaging of SSI and CGI. (markt)
-44389: Fix memory leak that occurred if using a
-RequestDispatcher. Patch provided by Arto Huusko. (markt)
+Add missing access check for ThreadWithAttributes. (markt)
-Add missing access check for ThreadWithAttributes. (markt)
+44833: Correctly override StandardSession methods from
+DeltaSession. (fhanik)
44943: Use the same engine name in server.xml comments to
@@ -208,19 +214,25 @@
that forces MS clients connecting to the WebDAV Servlet on port 80 to
use a client that works rather than the default broken one. (markt)
+
+45195: Passing in null into setAttribute or removeAttribute
DO NOT REPLY [Bug 45195] Possible regression issue with HttpSession. getAtttribute()
https://issues.apache.org/bugzilla/show_bug.cgi?id=45195 --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-06-26 13:17:41 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: r672020 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jun 26 13:30:40 2008 New Revision: 672020 URL: http://svn.apache.org/viewvc?rev=672020&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=672020&r1=672019&r2=672020&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 26 13:30:40 2008 @@ -41,11 +41,11 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45279 Properly close multicast socket http://svn.apache.org/viewvc?rev=671650&view=rev - +1: fhanik + +1: fhanik, markt -1: * Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45272 Patch attached in bugzilla issue - +1: fhanik + +1: fhanik, markt -1: \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45283] Allow multiple authenticators to be added to pipeline
https://issues.apache.org/bugzilla/show_bug.cgi?id=45283 Seetharama Durbha <[EMAIL PROTECTED]> changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #2 from Seetharama Durbha <[EMAIL PROTECTED]> 2008-06-26 13:55:10 PST --- (In reply to comment #1) > The enhancement as described is not possible since the servlet spec only > allows > a single authenticator to be configured per web-app. > > What would be possible would be a realm that uses one method by default and > falls back to a second if the first fails. > I am not sure if you are referring to the login-config entries in a web-app, or to the way we add valves (which at the same time can be implemntors of Authenticator). Either way, I do not see Servlet spec having any constraint. Though the actual result is implementation specific, I noticed that the Schema itself does not prevent a web-app from having multiple login-config entries. Please clarify. -- 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 45283] Allow multiple authenticators to be added to pipeline
https://issues.apache.org/bugzilla/show_bug.cgi?id=45283 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-06-26 14:12:47 PST --- SRV.13.2. states that more than one login-config is an error. -- 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 45293] New: catalina.policy prevents tomcat 5.5. 26 from start
https://issues.apache.org/bugzilla/show_bug.cgi?id=45293
Summary: catalina.policy prevents tomcat 5.5.26 from start
Product: Tomcat 5
Version: 5.5.26
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: normal
Priority: P3
Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
I'm trying to setup tomcat 5.5.26 with security manager on windows XP and Java
5.
I found wrong entry for commons-logging in catalina.policy which prevents
tomcat from start:
grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar"
This should be replaced by
grant codeBase "file:${catalina.home}/bin/commons-logging-api-1.1.1.jar"
otherwise Tomcat dies with java.lang.reflect.InvocationTargetException caused
by security exception in org.apache.commons.logging.LogConfigurationException
--
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 45293] catalina.policy prevents tomcat 5.5.26 from start
https://issues.apache.org/bugzilla/show_bug.cgi?id=45293 --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-06-26 15:02:17 PST --- There is already a fix proposed for this. -- 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: r672037 - /tomcat/current/tc5.5.x/STATUS.txt
Author: markt Date: Thu Jun 26 15:02:57 2008 New Revision: 672037 URL: http://svn.apache.org/viewvc?rev=672037&view=rev Log: Add a bug ref Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=672037&r1=672036&r2=672037&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Jun 26 15:02:57 2008 @@ -106,7 +106,8 @@ 0: fhanik - silently swallow an error, and default to the default config file -1: -* Additional permission required to read JDK logging config +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45293 + Additional permission required to read JDK logging config http://svn.apache.org/viewvc?rev=646550&view=rev +1: markt, fhanik -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 45293] catalina.policy prevents tomcat 5.5.26 from start
https://issues.apache.org/bugzilla/show_bug.cgi?id=45293 --- Comment #2 from Grzegorz Turski <[EMAIL PROTECTED]> 2008-06-26 15:10:51 PST --- Thanks for reply. -- 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 43683] Accessing Servlet while Reloading context gives 404 error
https://issues.apache.org/bugzilla/show_bug.cgi?id=43683 --- Comment #21 from Mark Thomas <[EMAIL PROTECTED]> 2008-06-26 15:48:59 PST --- The good news is I can now repeat test case 3 and have found the root cause. There is a synchronisation issue with StandardWrapper. In short, one thread can enter allocate() and before countAllocated is incremented, another thread can enter unload(). The bad news is that I suspect the fix might not be pleasant. allocate() is on the critical path so just synchronising allocate() would likely be bad from a performance point of view. I haven't really thought about this much yet, so I am hoping there is a better fix to be found. I'll have a think about a solution for this over the next few days. Hopefully I'll have something next week. In the meantime, any suggestions are welcome. -- 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]
