[Bug 55976] New: Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 Bug ID: 55976 Summary: Broken response from NIO connector in Tomcat 7.0.50 Product: Tomcat 7 Version: trunk Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: ognjen.d.blagoje...@gmail.com Tomcat 7.0.50 (proposed for voting at the time of submitting this issue) with Oracle Java 1.7.0_40 on Win7 64-bit, sometimes returns incorrect response when NIO connector is used. Start of the report, and steps to reproduce the problem are in this thread: http://www.mail-archive.com/dev@tomcat.apache.org/msg80175.html -Ognjen -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.50
Violeta and others, On 21.12.2013 23:41, Ognjen Blagojevic wrote: On 21.12.2013 12:30, Violeta Georgieva wrote: Thanks for the testing. I'm still not convinced to stop the voting based on the frequency (1/5000) of the problem. Ok. I'm having hard time creating reproducible test case. As I test more, the frequency of failures is even lower then I initially reported. Sometimes it takes 5k request to create a failure, and sometimes even 500k reqests is not enough. I analyzed the issue during past few days, and I have more info. But since no one else reported any problem, I conclude that it might be something very specific to my configuration. Therefore, I am changing my (non-binding) vote to "+1". I created, however, an issue in Bugzilla [1] to keep the record of the problem, and to publish my findings so far. -Ognjen [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976
Ognjen Blagojevic changed:
What|Removed |Added
OS||All
--- Comment #1 from Ognjen Blagojevic ---
Java client is used for smoke testing Tomcat 7.0.50. Java client fails with
following exception:
Exception in thread "main" java.lang.RuntimeException: java.io.IOException:
Invalid Http response
at webcrawler.WebCrawler.getpage(WebCrawler.java:117)
at webcrawler.WebCrawler.repeat(WebCrawler.java:191)
at webcrawler.WebCrawler.main(WebCrawler.java:30)
Caused by: java.io.IOException: Invalid Http response
at
sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1342)
at java.net.URL.openStream(URL.java:1037)
at webcrawler.WebCrawler.getpage(WebCrawler.java:94)
... 2 more
Relevant lines from sun.net.www.protocol.http.HttURLConnection.getInputStream:
respCode = getResponseCode();
if (respCode == -1) {
disconnectInternal();
throw new IOException ("Invalid Http response");
}
So, getResponseCode returns -1. Relevant part from
sun.net.www.protocol.http.HttURLConnection.getResponseCode():
/*
* Examine the status-line - should be formatted as per
* section 6.1 of RFC 2616 :-
*
* Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase
*
* If status line can't be parsed return -1.
*/
if (statusLine.startsWith("HTTP/1.")) {
int codePos = statusLine.indexOf(' ');
if (codePos > 0) {
int phrasePos = statusLine.indexOf(' ', codePos+1);
if (phrasePos > 0 && phrasePos < statusLine.length()) {
responseMessage = statusLine.substring(phrasePos+1);
}
// deviation from RFC 2616 - don't reject status line
// if SP Reason-Phrase is not included.
if (phrasePos < 0)
phrasePos = statusLine.length();
try {
responseCode = Integer.parseInt
(statusLine.substring(codePos+1, phrasePos));
return responseCode;
} catch (NumberFormatException e) { }
}
}
return -1;
So it seems that response from Tomcat doesn't contain string "HTTP/1." in the
first line.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 --- Comment #3 from Ognjen Blagojevic --- Created attachment 31183 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31183&action=edit Correct request and broken response -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 --- Comment #2 from Ognjen Blagojevic --- Created attachment 31182 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31182&action=edit Correct request and correct response -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1556071 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
On 06/01/2014 23:40, r...@apache.org wrote: > Author: remm > Date: Mon Jan 6 23:40:32 2014 > New Revision: 1556071 > > URL: http://svn.apache.org/r1556071 > Log: > Avoid NPE if the write listener is called once immediately after being set, > even if no data was written (= the app doesn't send any message during the > init of the connection). > I don't think Tomcat does it yet (this doesn't need to be ported to Tomcat 7 > since it is not a Servlet 3.1 impl). Tomcat only does this if the WriteListener is set via the CoyoteOutputStream. It does not do it if HTTP upgrade is used (which uses a lighter-weight ServletOutputStream). That looks like a bug that needs fixing. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 --- Comment #4 from Ognjen Blagojevic --- I took localhost dump using RawCap. The dump contains traffic from the smoke testing. I then opened it with wireshark. In the dump, there is a number of requests for file prelude.jspf.html: "GET /examples/jsp/jsp2/misc/prelude.jspf.html HTTP/1.1" Tomcat generally responds correctly, as seen in attachment 31182. But, in one request, instead of responding with content from "prelude.jspf.html" Tomcat responds with partial content from a different file -- "/docs/architecture/startup/serverStartup.txt". As one can see in attachment 31183, the response also doesn't contain any header. That is the reason why Java client fails. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 --- Comment #5 from Mark Thomas --- Can you provide the source code of the test client you are using so the committers can try and reproduce this? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1556071 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
2014/1/8 Mark Thomas > Tomcat only does this if the WriteListener is set via the > CoyoteOutputStream. It does not do it if HTTP upgrade is used (which > uses a lighter-weight ServletOutputStream). That looks like a bug that > needs fixing. > > Yes, I saw after my commit there was code to do it for HTTP, but upgrade uses the code in the AbstractServletOutputStream which only sets the listener and doesn't do anything with it until there's an actual write. Rémy
[Bug 55978] New: Initial call to onWritePossible() not made by container when using HTTP upgrade
https://issues.apache.org/bugzilla/show_bug.cgi?id=55978 Bug ID: 55978 Summary: Initial call to onWritePossible() not made by container when using HTTP upgrade Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: ma...@apache.org When using a WriteListener and non-blocking IO with the Servlet async API, the container makes the first call to onWritePossible() as per the spec. When using a WriteListener and non-blocking IO with the Servlet HTTP upgrade API the container does not make the initial call to onWritePossible(). When fixing this bug it is worth checking the initial call to onDataAvailable() as well. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 --- Comment #6 from Ognjen Blagojevic --- Created attachment 31184 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31184&action=edit Java test class Here is Java class used for testing. You should call it with one argument - starting URL (e.g. "http://localhost:8080/";) At the first phase, it crawls all pages starting from the root. During the crawl, Java stack traces for 401s and 404s will be printed on the console, and may be ignored. At the second phase, it will repeatedly read all collected URLs, 500 times in a row. In total, it reads around 140k pages. If there is an error during the test, exception will be thrown, e.g: Round: 154 / 500 Round: 155 / 500 Round: 156 / 500 Exception in thread "main" java.lang.RuntimeException: java.io.IOException: Invalid Http response at webcrawler.WebCrawler.getpage(WebCrawler.java:117) at webcrawler.WebCrawler.repeat(WebCrawler.java:191) at webcrawler.WebCrawler.main(WebCrawler.java:30) Caused by: java.io.IOException: Invalid Http response at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1342) at java.net.URL.openStream(URL.java:1037) at webcrawler.WebCrawler.getpage(WebCrawler.java:94) ... 2 more Sometimes exception is thrown after 5k requests, sometimes only after running this test several times. -Ognjen -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.50
Hi Ognjen, 2014/1/8 Ognjen Blagojevic > > Violeta and others, > > > On 21.12.2013 23:41, Ognjen Blagojevic wrote: >> >> On 21.12.2013 12:30, Violeta Georgieva wrote: >>> >>> Thanks for the testing. >>> I'm still not convinced to stop the voting based on the frequency >>> (1/5000) >>> of the problem. >> >> >> Ok. >> >> I'm having hard time creating reproducible test case. As I test more, >> the frequency of failures is even lower then I initially reported. >> Sometimes it takes 5k request to create a failure, and sometimes even >> 500k reqests is not enough. > > > I analyzed the issue during past few days, and I have more info. > > But since no one else reported any problem, I conclude that it might be something very specific to my configuration. Therefore, I am changing my (non-binding) vote to "+1". > > I created, however, an issue in Bugzilla [1] to keep the record of the problem, and to publish my findings so far. > > -Ognjen > > > [1] https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 > Thanks Violeta
Re: [VOTE][RESULT] Release Apache Tomcat 7.0.50
Hi, 2013/12/20 Violeta Georgieva > > The proposed Apache Tomcat 7.0.50 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.50/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-004/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_50/ > > The proposed 7.0.50 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.50 Stable > > Regards > Violeta The votes cast were +1 (binding): rjung, markt, olamy, violetagg, jfarcand, kkolinko +1 (non-binding): Ognjen Blagojevic No other votes were cast. With six binding +1 votes and one non-binding +1 vote this vote passes. I'll upload the release to the mirrors and announce it once the mirrors are OK. Regards Violeta
svn commit: r1556505 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: violetagg Date: Wed Jan 8 11:47:23 2014 New Revision: 1556505 URL: http://svn.apache.org/r1556505 Log: Prep for next version Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1556505&r1=1556504&r2=1556505&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Wed Jan 8 11:47:23 2014 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=50 +version.build=51 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1556505&r1=1556504&r2=1556505&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Wed Jan 8 11:47:23 2014 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.50 +maven.asf.release.deploy.version=7.0.51 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556526 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/compiler/ java/org/apache/jasper/runtime/ test/org/apache/jasper/compiler/ webapps/docs/
Author: markt
Date: Wed Jan 8 13:22:40 2014
New Revision: 1556526
URL: http://svn.apache.org/r1556526
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55198
Correctly escape XML output from tagx files
Added:
tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java
(with props)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1500062,1539157,1539173
Merged /tomcat/tc7.0.x/trunk:r1500065,1539176-1539177
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1556526&r1=1556525&r2=1556526&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 13:22:40 2014
@@ -32,14 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55198
- Correctly escape XML output from tagx files.
- http://svn.apache.org/r1500065 (excluding tests) - original fix
- http://svn.apache.org/r1539176 (excluding tests) - required for following fix
- http://svn.apache.org/r1539177 (excluding tests) - fixes regression in
original
- +1: markt, schultz, remm, jboynes
- -1:
-
* Fix issue with Manager app and other apps that use i18n in the UI when a
request that specifies an Accept-Language of English ahead of French, Spanish
or Japanese.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1556526&r1=1556525&r2=1556526&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Wed Jan
8 13:22:40 2014
@@ -17,6 +17,12 @@
package org.apache.jasper.compiler;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.compiler.ELNode.ELText;
+import org.apache.jasper.compiler.ELNode.Function;
+import org.apache.jasper.compiler.ELNode.Root;
+import org.apache.jasper.compiler.ELNode.Text;
+
/**
* This class implements a parser for EL expressions.
*
@@ -106,6 +112,7 @@ public class ELParser {
// Output whatever is in buffer
if (buf.length() > 0) {
ELexpr.add(new ELNode.ELText(buf.toString()));
+buf = new StringBuffer();
}
if (!parseFunction()) {
ELexpr.add(new ELNode.ELText(curToken.toString()));
@@ -130,8 +137,8 @@ public class ELParser {
}
String s1 = null; // Function prefix
String s2 = curToken.toString(); // Function name
-int mark = getIndex();
if (hasNext()) {
+int mark = getIndex();
Token t = nextToken();
if (t.toChar() == ':') {
if (hasNext()) {
@@ -149,8 +156,8 @@ public class ELParser {
ELexpr.add(new ELNode.Function(s1, s2));
return true;
}
+setIndex(mark);
}
-setIndex(mark);
return false;
}
@@ -389,4 +396,42 @@ public class ELParser {
public char getType() {
return type;
}
+
+
+protected static class TextBuilder extends ELNode.Visitor {
+
+protected StringBuilder output = new StringBuilder();
+
+public String getText() {
+return output.toString();
+}
+
+@Override
+public void visit(Root n) throws JasperException {
+output.append(n.getType());
+output.append('{');
+n.getExpression().visit(this);
+output.append('}');
+}
+
+@Override
+public void visit(Function n) throws JasperException {
+if (n.getPrefix() != null) {
+output.append(n.getPrefix());
+output.append(':');
+}
+output.append(n.getName());
+output.append('(');
+}
+
+@Override
+public void visit(Text n) throws JasperException {
+output.append(n.getText());
+}
+
+@Override
+public void visit(ELText n) throws JasperException {
+output.append(n.getText());
+}
+}
}
Modified: tomcat/tc6.
[Bug 55198] Quote entity in html element attribute evaluated in tagx if attribute contains EL expression
https://issues.apache.org/bugzilla/show_bug.cgi?id=55198 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #7 from Mark Thomas --- This has been fixed in 6.0.x and will be included in 6.0.38 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556539 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/res/StringManager.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jan 8 14:10:38 2014
New Revision: 1556539
URL: http://svn.apache.org/r1556539
Log:
Fix issue with Manager app and other apps that use i18n in the UI when a
request that specifies an Accept-Language of English ahead of French, Spanish
or Japanese.
Port all the other improvements to the StringManager from trunk as well
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.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=1556539&r1=1556538&r2=1556539&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 14:10:38 2014
@@ -32,15 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix issue with Manager app and other apps that use i18n in the UI when a
- request that specifies an Accept-Language of English ahead of French, Spanish
- or Japanese.
- Port all the other improvements to the StringManager from trunk as well
- http://people.apache.org/~markt/patches/2013-12-17-webapp-locale-tc6.patch
- +1: markt, remm, jboynes
- +1: kkolinko (a typo in changelog: s/associated/associate/)
- -1:
-
* Add support for limiting the size of chunk extensions when using chunked
encoding.
http://people.apache.org/~markt/patches/2013-12-17-chunk-extensions-tc6-v2.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1556539&r1=1556538&r2=1556539&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java Wed
Jan 8 14:10:38 2014
@@ -18,8 +18,11 @@
package org.apache.tomcat.util.res;
import java.text.MessageFormat;
+import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.LinkedHashMap;
import java.util.Locale;
+import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -52,12 +55,16 @@ import java.util.ResourceBundle;
public class StringManager {
+// Locale.ROOT isn't available until Java 6
+private static final Locale LOCALE_ROOT = new Locale("", "", "");
+
+private static int LOCALE_CACHE_SIZE = 10;
+
/**
* The ResourceBundle for this StringManager.
*/
-
-private ResourceBundle bundle;
-private Locale locale;
+private final ResourceBundle bundle;
+private final Locale locale;
/**
* Creates a new StringManager for a given package. This is a
@@ -67,22 +74,36 @@ public class StringManager {
*
* @param packageName Name of package to create StringManager for.
*/
-
-private StringManager(String packageName) {
- this( packageName, Locale.getDefault() );
-}
-
-private StringManager(String packageName, Locale loc) {
+private StringManager(String packageName, Locale locale) {
String bundleName = packageName + ".LocalStrings";
-bundle = ResourceBundle.getBundle(bundleName, loc);
+ResourceBundle bnd = null;
+try {
+bnd = ResourceBundle.getBundle(bundleName, locale);
+} catch( MissingResourceException ex ) {
+// Try from the current loader (that's the case for trusted apps)
+// Should only be required if using a TC5 style classloader
structure
+// where common != shared != server
+ClassLoader cl = Thread.currentThread().getContextClassLoader();
+if( cl != null ) {
+try {
+bnd = ResourceBundle.getBundle(bundleName, locale, cl);
+} catch(MissingResourceException ex2) {
+// Ignore
+}
+}
+}
+bundle = bnd;
// Get the actual locale, which may be different from the requested one
-locale = bundle.getLocale();
-}
-
-private StringManager(ResourceBundle bundle )
-{
- this.bundle=bundle;
-locale = bundle.getLocale();
+if (bundle != null) {
+Locale bundleLocale = bundle.getLocale();
+if (bundleLocale.equals(LOCALE_ROOT)) {
+this.locale = Locale.ENGLISH;
+} else {
+this.locale = bundleLocale;
+}
+} else {
+this.locale = null;
+}
}
/**
@@ -94,7 +115,6 @@ public class StringManager {
bundle or null if not found.
@throws IllegalArgumentException if key is null.
*/
-
public String getString(String
svn commit: r1556540 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/Constants.java java/org/apache/coyote/http11/filters/ChunkedInputFilter.java webapps/docs/changelog.xml webapps/docs/
Author: markt
Date: Wed Jan 8 14:15:57 2014
New Revision: 1556540
URL: http://svn.apache.org/r1556540
Log:
Add support for limiting the size of chunk extensions when using chunked
encoding.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
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=1556540&r1=1556539&r2=1556540&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 14:15:57 2014
@@ -32,12 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Add support for limiting the size of chunk extensions when using chunked
- encoding.
-
http://people.apache.org/~markt/patches/2013-12-17-chunk-extensions-tc6-v2.patch
- +1: markt, kkolinko, remm, jboynes
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55749
Improve the error message when SSLEngine is disabled in AprLifecycleListener
and SSL is configured for an APR/native connector.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/Constants.java?rev=1556540&r1=1556539&r2=1556540&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/Constants.java Wed Jan 8
14:15:57 2014
@@ -76,4 +76,13 @@ public final class Constants {
Integer.parseInt(System.getProperty(
"org.apache.coyote.MAX_TRAILER_SIZE",
"8192"));
+
+/**
+ * Limit on the total length of the extension data in
+ * a chunked HTTP request.
+ */
+public static final int MAX_EXTENSION_SIZE =
+Integer.parseInt(System.getProperty(
+"org.apache.coyote.MAX_EXTENSION_SIZE",
+"8192"));
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1556540&r1=1556539&r2=1556540&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Wed Jan 8 14:15:57 2014
@@ -114,6 +114,12 @@ public class ChunkedInputFilter implemen
/**
+ * Size of extensions processed for this request.
+ */
+private long extensionSize;
+
+
+/**
* Flag set to true if the next call to doRead() must parse a CRLF pair
* before doing anything else.
*/
@@ -248,6 +254,10 @@ public class ChunkedInputFilter implemen
endChunk = false;
needCRLFParse = false;
trailingHeaders.recycle();
+if (org.apache.coyote.Constants.MAX_TRAILER_SIZE > 0) {
+
trailingHeaders.setLimit(org.apache.coyote.Constants.MAX_TRAILER_SIZE);
+}
+extensionSize = 0;
}
@@ -294,7 +304,7 @@ public class ChunkedInputFilter implemen
int result = 0;
boolean eol = false;
boolean readDigit = false;
-boolean trailer = false;
+boolean extension = false;
while (!eol) {
@@ -306,9 +316,13 @@ public class ChunkedInputFilter implemen
if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
parseCRLF(false);
eol = true;
-} else if (buf[pos] == Constants.SEMI_COLON) {
-trailer = true;
-} else if (!trailer) {
+} else if (buf[pos] == Constants.SEMI_COLON && !extension) {
+// First semi-colon marks the start of the extension. Further
+// semi-colons may appear to separate multiple
chunk-extensions.
+// These need to be processed as part of parsing the
extensions.
+extension = true;
+extensionSize++;
+} else if (!extension) {
//don't read data after the trailer
int charValue = HexUtils.getDec(buf[pos]);
if (charValue != -1) {
@@ -320,6 +334,15 @@ public class ChunkedInputFilter implemen
//in the chunked header
return false;
}
+} else {
+// Extension 'parsing'
+// Note that the chunk-extension is neither parsed nor
+// val
svn commit: r1556541 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/res/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Wed Jan 8 14:18:39 2014
New Revision: 1556541
URL: http://svn.apache.org/r1556541
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55749
Improve the error message when SSLEngine is disabled in AprLifecycleListener
and SSL is configured for an APR/native connector.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
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=1556541&r1=1556540&r2=1556541&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 14:18:39 2014
@@ -32,13 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55749
- Improve the error message when SSLEngine is disabled in AprLifecycleListener
- and SSL is configured for an APR/native connector.
- http://people.apache.org/~markt/patches/2013-11-12-bug55749-tc6.patch
- +1: markt, kkolinko, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759
Update the Eclipse compiler to 4.3.1
http://svn.apache.org/viewvc?view=revision&revision=1539953
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1556541&r1=1556540&r2=1556541&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed
Jan 8 14:18:39 2014
@@ -633,6 +633,12 @@ public class AprEndpoint extends Abstrac
if (initialized)
return;
+if (rootPool != 0) {
+// A previous init() call failed
+throw new IllegalStateException(
+sm.getString("endpoint.apr.previousInitFailed"));
+}
+
// Create the root APR memory pool
rootPool = Pool.create(0);
// Create the pool for the server socket
@@ -776,7 +782,15 @@ public class AprEndpoint extends Abstrac
}
// Create SSL Context
-sslContext = SSLContext.make(rootPool, value, SSL.SSL_MODE_SERVER);
+try {
+sslContext = SSLContext.make(rootPool, value,
SSL.SSL_MODE_SERVER);
+} catch (Exception e) {
+// If the sslEngine is disabled on the AprLifecycleListener
+// there will be an Exception here but there is no way to check
+// the AprLifecycleListener settings from here
+throw new Exception(
+sm.getString("endpoint.apr.failSslContextMake"), e);
+}
// Set cipher order: client (default) or server
if (SSLHonorCipherOrder) {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1556541&r1=1556540&r2=1556541&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Wed Jan 8 14:18:39 2014
@@ -48,4 +48,6 @@ endpoint.warn.noHonorCipherOrder='Honor
endpoint.debug.channelCloseFail=Failed to close channel
endpoint.debug.socketCloseFail=Failed to close socket
endpoint.apr.noSslCertFile=Connector attribute SSLCertificateFile must be
defined when using SSL with APR
+endpoint.apr.failSslContextMake=Unable to create SSLContext. Check that
SSLEngine is enabled in the AprLifecycleListener, the AprLifecycleListener has
initialised correctly and that a valid SSLProtocol has been specified
endpoint.apr.invalidSslProtocol=An invalid value [{0}] was provided for the
SSLProtocol attribute
+endpoint.apr.previousInitFailed=Unable to initialise endpoint. A previous call
to init() failed. See previous log messages for details.
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=1556541&r1=1556540&r2=1556541&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 8 14:18:39 2014
@@ -112,6 +112,11 @@
Add support for limiting the size of chunk extensi
[Bug 55749] Disabling SSLEngine in AprLifecycleListener leads to misleading error message at startup when SSL Connector is delcared
https://issues.apache.org/bugzilla/show_bug.cgi?id=55749 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Fixed in 6.0.x and will be included in 6.0.38 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556557 - in /tomcat/tc6.0.x/trunk: ./ java/javax/servlet/resources/ res/ res/META-INF/ res/maven/ webapps/docs/
Author: markt Date: Wed Jan 8 15:06:22 2014 New Revision: 1556557 URL: http://svn.apache.org/r1556557 Log: Add missing J2EE 5 resources Added: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd - copied unchanged from r1553650, tomcat/tc7.0.x/trunk/java/javax/servlet/resources/javaee_5.xsd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd - copied unchanged from r1553650, tomcat/tc7.0.x/trunk/java/javax/servlet/resources/javaee_web_services_1_2.xsd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd - copied unchanged from r1553650, tomcat/tc7.0.x/trunk/java/javax/servlet/resources/javaee_web_services_client_1_2.xsd tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.license - copied, changed from r1553650, tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.license tomcat/tc6.0.x/trunk/res/META-INF/servlet-api.jar.notice - copied, changed from r1553650, tomcat/tc7.0.x/trunk/res/META-INF/servlet-api.jar.notice Modified: tomcat/tc6.0.x/trunk/LICENSE tomcat/tc6.0.x/trunk/NOTICE tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/res/INSTALLLICENSE tomcat/tc6.0.x/trunk/res/maven/servlet-api.pom tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/LICENSE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/LICENSE?rev=1556557&r1=1556556&r2=1556557&view=diff == --- tomcat/tc6.0.x/trunk/LICENSE (original) +++ tomcat/tc6.0.x/trunk/LICENSE Wed Jan 8 15:06:22 2014 @@ -704,4 +704,339 @@ by name) to the files from the LZMA comp subjecting your linked code to the terms of the Common Public license version 1.0. Any modifications or additions to files from the LZMA compression module for NSIS, however, are subject to the terms of the Common Public License version -1.0. \ No newline at end of file +1.0. + + +For the following XML Schemas for Java EE Deployment Descriptors: + - javaee_5.xsd + - javaee_web_services_1_2.xsd + - javaee_web_services_client_1_2.xsd + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + + 1.1. Contributor. means each individual or entity that creates or contributes +to the creation of Modifications. + + 1.2. Contributor Version. means the combination of the Original Software, +prior Modifications used by a Contributor (if any), and the +Modifications made by that particular Contributor. + + 1.3. Covered Software. means (a) the Original Software, or (b) Modifications, +or (c) the combination of files containing Original Software with files +containing Modifications, in each case including portions thereof. + + 1.4. Executable. means the Covered Software in any form other than Source +Code. + + 1.5. Initial Developer. means the individual or entity that first makes +Original Software available under this License. + + 1.6. Larger Work. means a work which combines Covered Software or portions +thereof with code not governed by the terms of this License. + + 1.7. License. means this document. + + 1.8. Licensable. means having the right to grant, to the maximum extent +possible, whether at the time of the initial grant or subsequently +acquired, any and all of the rights conveyed herein. + + 1.9. Modifications. means the Source Code and Executable form of any of the +following: + +A. Any file that results from an addition to, deletion from or + modification of the contents of a file containing Original Software + or previous Modifications; + +B. Any new file that contains any part of the Original Software or + previous Modification; or + +C. Any new file that is contributed or otherwise made available under + the terms of this License. + + 1.10. Original Software. means the Source Code and Executable form of + computer software code that is originally released under this License. + + 1.11. Patent Claims. means any patent claim(s), now owned or hereafter + acquired, including without limitation, method, process, and apparatus + claims, in any patent Licensable by grantor. + + 1.12. Source Code. means (a) the common form of computer software code in + which modifications are made and (b) associated documentation included + in or with such code. + + 1.13. You. (or .Your.) means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License. For + legal entities, .You. includes any entity which controls, is controlled + by, or is under common control with You. For purposes of this + definition, .control. means (a) the power, direct or indirect, to cause + the direction
svn commit: r1556558 - in /tomcat/tc6.0.x/trunk: LICENSE res/INSTALLLICENSE
Author: markt Date: Wed Jan 8 15:14:01 2014 New Revision: 1556558 URL: http://svn.apache.org/r1556558 Log: Remove trailing whitespace Modified: tomcat/tc6.0.x/trunk/LICENSE tomcat/tc6.0.x/trunk/res/INSTALLLICENSE Modified: tomcat/tc6.0.x/trunk/LICENSE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/LICENSE?rev=1556558&r1=1556557&r2=1556558&view=diff == --- tomcat/tc6.0.x/trunk/LICENSE (original) +++ tomcat/tc6.0.x/trunk/LICENSE Wed Jan 8 15:14:01 2014 @@ -704,7 +704,7 @@ by name) to the files from the LZMA comp subjecting your linked code to the terms of the Common Public license version 1.0. Any modifications or additions to files from the LZMA compression module for NSIS, however, are subject to the terms of the Common Public License version -1.0. +1.0. For the following XML Schemas for Java EE Deployment Descriptors: Modified: tomcat/tc6.0.x/trunk/res/INSTALLLICENSE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/INSTALLLICENSE?rev=1556558&r1=1556557&r2=1556558&view=diff == --- tomcat/tc6.0.x/trunk/res/INSTALLLICENSE (original) +++ tomcat/tc6.0.x/trunk/res/INSTALLLICENSE Wed Jan 8 15:14:01 2014 @@ -704,7 +704,7 @@ by name) to the files from the LZMA comp subjecting your linked code to the terms of the Common Public license version 1.0. Any modifications or additions to files from the LZMA compression module for NSIS, however, are subject to the terms of the Common Public License version -1.0. +1.0. For the following XML Schemas for Java EE Deployment Descriptors: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 --- Comment #7 from Konstantin Preißer --- Created attachment 31185 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31185&action=edit TCP data log (In reply to Ognjen Blagojevic from comment #6) > Created attachment 31184 [details] > Java test class Hi, I can reproduce the problem with your test class with Tomcat 7.0.50, Tomcat 7.0.47 and Tomcat 8.0.0-RC10 on Windows 8.1 x64 with Java 1.7.0_45. To provide an additional example of a broken HTTP response, I used a self-written tool to intercept the TCP connections from the Java client to Tomcat and log all data of each TCP connection channel to a file and I attached a Zip file containing the logs of the last few TCP connections. The logs of connections 262-267 look normal (each HTTP request is replied to with an HTTP response), but if you look at 268 (where a single HTTP request was sent), Tomcat did not start the reply with an HTTP response, but with some random data chunks that seem to belong to different responses, and later sent the actual HTTP response for the request. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55976] Broken response from NIO connector in Tomcat 7.0.50
https://issues.apache.org/bugzilla/show_bug.cgi?id=55976 --- Comment #8 from Jess Holle --- (In reply to Konstantin Preißer from comment #7) > I can reproduce the problem with your test class with Tomcat 7.0.50, Tomcat > 7.0.47 and Tomcat 8.0.0-RC10 on Windows 8.1 x64 with Java 1.7.0_45. So that's critical information -- this isn't a regression since 7.0.47, i.e. in the 7.0.50 release. It might be a regression in 7.0.47, but that was already released as stable. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-238) Parameter staticContextDocbase cant be used
[ https://issues.apache.org/jira/browse/MTOMCAT-238?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13865635#comment-13865635 ] Maciej Nyczka commented on MTOMCAT-238: --- The same thing here. Affects also 2.2 version > Parameter staticContextDocbase cant be used > --- > > Key: MTOMCAT-238 > URL: https://issues.apache.org/jira/browse/MTOMCAT-238 > Project: Apache Tomcat Maven Plugin > Issue Type: Bug > Components: tomcat6, tomcat7 >Affects Versions: 2.0-beta-1, 2.1 >Reporter: Michal Franc >Assignee: Olivier Lamy (*$^¨%`£) > Fix For: moreinfo > > > Attribute staticContextDocbase leads to IllegalArgumentException > org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo#createStaticContext > is context created from container and at the and added again to server which > leads to java.lang.IllegalArgumentException: addChild: Child name '/' is not > unique -- This message was sent by Atlassian JIRA (v6.1.5#6160) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556585 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/jasper/ java/org/apache/jasper/compiler/
Author: markt Date: Wed Jan 8 17:49:03 2014 New Revision: 1556585 URL: http://svn.apache.org/r1556585 Log: Back-port some XML processing improvements (part 1) The patch could have been smaller but I opted to align some of the code with Tomcat 7 (which meant re-ordering methods in places) to make it easier to compare 6.0.x code with 7.0.x code. This covers: - always process TLDS with a namespace aware parser - enable validation with STRICT_SERVLET_COMPLIANCE (Servlet 2.5, SRV.14.4.3) Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/Constants.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/context.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=1556585&r1=1556584&r2=1556585&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 17:49:03 2014 @@ -40,32 +40,6 @@ PATCHES PROPOSED TO BACKPORT: exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932. -1: -* Back-port some XML processing improvements (part 1) - The patch could have been smaller but I opted to align some of the code with - Tomcat 7 (which meant re-ordering methods in places) to make it easier to - compare 6.0.x code with 7.0.x code. - http://people.apache.org/~markt/patches/2013-12-20-xml-prep-part1-tc6-v2.patch - +1: markt, remm, jboynes - +1: kkolinko: - I do not like that you change the values of validation flags when - STRICT_SERVLET_COMPLIANCE is set. This was a feature required for - Servlet 3.0, but I do not remember the same requirement for Servlet - 2.5. - I expect that with this change the bug #351040 in Eclipse IDE will - become visible with Tomcat 6, while it is currently observed with - Tomcat 7 only. It is not our policy to provide workarounds for 3rd - party bugs, so this is not a veto. -https://bugs.eclipse.org/bugs/show_bug.cgi?id=351040 - The rest of the patch is OK. - markt: - Servlet 2.5, SRV.14.4.3 requires validation for a J2EE compliant - implementation. The Eclipse bug is annoying but easy to workaround and - only present when using STRICT_SERVLET_COMPLIANCE. - kkolinko: - Thank you for the chapter number. I am changing my vote to +1. It'd - be better to mention the chapter number in the changelog. - -1: - * Back-port some XML processing improvements (part 2) JspC passes configuration with ServletContext init params so a real implementation is required. This is essentially a back-port of Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java?rev=1556585&r1=1556584&r2=1556585&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Context.java Wed Jan 8 17:49:03 2014 @@ -542,6 +542,82 @@ public interface Context extends Contain public void setWrapperClass(String wrapperClass); +/** + * Will the parsing of the web.xml file for this Context be performed by a + * namespace aware parser? + * + * @return true if namespace awareness is enabled. + */ +public boolean getXmlNamespaceAware(); + + +/** + * Controls whether the parsing of the web.xml file for this Context will be + * perfor
svn commit: r1556589 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/servlet/JspCServletContext.java
Author: markt
Date: Wed Jan 8 17:51:48 2014
New Revision: 1556589
URL: http://svn.apache.org/r1556589
Log:
Back-port some XML processing improvements (part 2)
JspC passes configuration with ServletContext init params so a real
implementation is required. This is essentially a back-port of
http://svn.apache.org/r1552306
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1556589&r1=1556588&r2=1556589&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 17:51:48 2014
@@ -40,14 +40,6 @@ PATCHES PROPOSED TO BACKPORT:
exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932.
-1:
-* Back-port some XML processing improvements (part 2)
- JspC passes configuration with ServletContext init params so a real
- implementation is required. This is essentially a back-port of
- http://svn.apache.org/r1552306
-
http://people.apache.org/~markt/patches/2013-12-19-xml-prep-part2-tc6-v1.patch
- +1: markt, kkolinko, remm, jboynes
- -1:
-
* Back-port some XML processing improvements (part 3)
Add the new descriptor package
Note I am generating the patches using git so the patch shows whole new files
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1556589&r1=1556588&r2=1556589&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Wed Jan 8 17:51:48 2014
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -28,6 +28,7 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
@@ -55,6 +56,12 @@ public class JspCServletContext implemen
/**
+ * Servlet context initialization parameters.
+ */
+private final ConcurrentHashMap myParameters;
+
+
+/**
* The log writer we will write log messages to.
*/
protected PrintWriter myLogWriter;
@@ -78,6 +85,7 @@ public class JspCServletContext implemen
public JspCServletContext(PrintWriter aLogWriter, URL aResourceBaseURL) {
myAttributes = new Hashtable();
+myParameters = new ConcurrentHashMap();
myLogWriter = aLogWriter;
myResourceBaseURL = aResourceBaseURL;
@@ -137,9 +145,7 @@ public class JspCServletContext implemen
* @param name Name of the requested parameter
*/
public String getInitParameter(String name) {
-
-return (null);
-
+return myParameters.get(name);
}
@@ -148,9 +154,7 @@ public class JspCServletContext implemen
* parameters.
*/
public Enumeration getInitParameterNames() {
-
-return (new Vector().elements());
-
+return myParameters.keys();
}
@@ -218,8 +222,8 @@ public class JspCServletContext implemen
}
}
-
-
+
+
/**
* Return a request dispatcher for the specified context-relative path.
*
@@ -438,6 +442,6 @@ public class JspCServletContext implemen
public boolean setInitParameter(String name, String value) {
-return false;
+return myParameters.putIfAbsent(name, value) == null;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556591 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/coyote/Response.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jan 8 18:01:14 2014
New Revision: 1556591
URL: http://svn.apache.org/r1556591
Log:
Avoid possible NPE when a content type with no charset is specified
(Followup to r1548971)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Response.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1552804
Merged /tomcat/tc7.0.x/trunk:r1552805
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1556591&r1=1556590&r2=1556591&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 18:01:14 2014
@@ -72,12 +72,6 @@ PATCHES PROPOSED TO BACKPORT:
requires Ant >= 1.8.0).
-1:
-* Avoid possible NPE when a content type with no charset is specified
- (Followup to r1548971)
- http://svn.apache.org/r1552805
- +1: markt, kkolinko, remm, jboynes
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973
Fix processing of XML schemas when validation is enabled in Jasper
http://svn.apache.org/r1556377
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/Response.java?rev=1556591&r1=1556590&r2=1556591&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/Response.java Wed Jan 8
18:01:14 2014
@@ -478,11 +478,14 @@ public final class Response {
this.contentType = m.toStringNoCharset();
-String charsetValue = m.getCharset().trim();
+String charsetValue = m.getCharset();
-if (charsetValue != null && charsetValue.length() > 0) {
-charsetSet = true;
-this.characterEncoding = charsetValue;
+if (charsetValue != null) {
+charsetValue = charsetValue.trim();
+if (charsetValue.length() > 0) {
+charsetSet = true;
+this.characterEncoding = charsetValue;
+}
}
}
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=1556591&r1=1556590&r2=1556591&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 8 18:01:14 2014
@@ -132,6 +132,10 @@
in the AprLifecycleListener and SSL is configured for an APR/native
connector. (markt)
+
+Avoid possible NPE if a content type is specified without a character
set.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556600 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/tomcat/util/descriptor/
Author: markt
Date: Wed Jan 8 18:27:53 2014
New Revision: 1556600
URL: http://svn.apache.org/r1556600
Log:
Back-port some XML processing improvements (part 3)
Add the new descriptor package
Added:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/
- copied from r1553650,
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1556600&r1=1556599&r2=1556600&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 18:27:53 2014
@@ -40,19 +40,6 @@ PATCHES PROPOSED TO BACKPORT:
exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932.
-1:
-* Back-port some XML processing improvements (part 3)
- Add the new descriptor package
- Note I am generating the patches using git so the patch shows whole new files
- being added. When actually making the commit, they will be copied from 7.0.x
- and amended to retain history.
-
http://people.apache.org/~markt/patches/2013-12-19-xml-prep-part3-tc6-v1.patch
- +1: markt, remm
- +1: kkolinko (Looks OK. I have not tested into what jar the new package
- goes and whether it requires an update to build.xml).
- +1: jboynes (Looks OK, have not verified if schema references work when the
- XSDs are still split between servlet/resources and jsp/resources).
- -1:
-
* Back-port some XML processing improvements (part 4)
Add a unit test for the new descriptor
Note I am generating the patches using git so the patch shows whole new files
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1556600&r1=1553650&r2=1556600&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Wed Jan 8 18:27:53 2014
@@ -80,15 +80,6 @@ public class DigesterFactory {
addSelf(systemIds, "javaee_web_services_1_2.xsd");
addSelf(systemIds, "javaee_web_services_client_1_2.xsd");
-// from JavaEE 6
-systemIds.put(XmlIdentifiers.WEB_30_XSD, idFor("web-app_3_0.xsd"));
-systemIds.put(XmlIdentifiers.WEB_FRAGMENT_30_XSD,
idFor("web-fragment_3_0.xsd"));
-addSelf(systemIds, "web-common_3_0.xsd");
-addSelf(systemIds, "javaee_6.xsd");
-addSelf(systemIds, "jsp_2_2.xsd");
-addSelf(systemIds, "javaee_web_services_1_3.xsd");
-addSelf(systemIds, "javaee_web_services_client_1_3.xsd");
-
SERVLET_API_PUBLIC_IDS = Collections.unmodifiableMap(publicIds);
SERVLET_API_SYSTEM_IDS = Collections.unmodifiableMap(systemIds);
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java?rev=1556600&r1=1553650&r2=1556600&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
Wed Jan 8 18:27:53 2014
@@ -61,14 +61,12 @@ public class LocalResolver implements En
}
-@Override
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException, IOException {
return resolveEntity(null, publicId, null, systemId);
}
-@Override
public InputSource resolveEntity(String name, String publicId,
String base, String systemId) throws SAXException, IOException {
@@ -138,7 +136,6 @@ public class LocalResolver implements En
}
-@Override
public InputSource getExternalSubset(String name, String baseURI)
throws SAXException, IOException {
return null;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/XmlErrorHandler.java?rev=1556600&r1=1553650&r2=1556600&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/a
svn commit: r1556601 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 8 18:35:35 2014 New Revision: 1556601 URL: http://svn.apache.org/r1556601 Log: Vote 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=1556601&r1=1556600&r2=1556601&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 18:35:35 2014 @@ -62,7 +62,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973 Fix processing of XML schemas when validation is enabled in Jasper http://svn.apache.org/r1556377 - +1: kkolinko, jboynes + +1: kkolinko, jboynes, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r4065 - /dev/tomcat/tomcat-7/v7.0.50/ /release/tomcat/tomcat-7/v7.0.50/
Author: violetagg Date: Wed Jan 8 19:10:38 2014 New Revision: 4065 Log: Release 7.0.50 Added: release/tomcat/tomcat-7/v7.0.50/ - copied from r4062, dev/tomcat/tomcat-7/v7.0.50/ Removed: dev/tomcat/tomcat-7/v7.0.50/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r4065 - /dev/tomcat/tomcat-7/v7.0.50/ /release/tomcat/tomcat-7/v7.0.50/
Author: violetagg Date: Wed Jan 8 19:10:38 2014 New Revision: 4065 Log: Release 7.0.50 Added: release/tomcat/tomcat-7/v7.0.50/ - copied from r4062, dev/tomcat/tomcat-7/v7.0.50/ Removed: dev/tomcat/tomcat-7/v7.0.50/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556613 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 8 19:45:12 2014 New Revision: 1556613 URL: http://svn.apache.org/r1556613 Log: Propose next block of XML patches 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=1556613&r1=1556612&r2=1556613&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 19:45:12 2014 @@ -59,6 +59,47 @@ PATCHES PROPOSED TO BACKPORT: requires Ant >= 1.8.0). -1: +* Back-port from XML processing improvements (part 5) + Switch to a per context configuration for the XML digester + http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part5-tc6-v1.patch + +1: markt + -1: + +* Back-port from XML processing improvements (part 6) + Upgrade digester to use DefaultHandler2 and use LexicalHandler to detect + publicId. + Simplify web application version detection in web.xml + Extracted from a patch by Jeremy Boynes. + Essentially, this is a back-port of http://svn.apache.org/r1547931 + Note that the patch contains a number of strictly unnecessary cosmetic changes + that have been included to make it simpler to compare the resulting Tomcat 6 + code with the current Tomcat 7 code to validate the correctness of the + back-port + http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part6-tc6-v1.patch + +1: markt + -1: + +* Back-port from XML processing improvements (part 7) + Switch o.a.catalina classes to use the new ErrorHandler + Back-port of http://svn.apache.org/r1547937 + http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part7-tc6-v1.patch + +1: markt + -1: + +* Back-port from XML processing improvements (part 8) + Switch ParserUtils to use the new ErrorHandler + Back-port of http://svn.apache.org/r1547947 + http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part8-tc6-v1.patch + +1: markt + -1: + +* Back-port from XML processing improvements (part 9) + Switch JspDocumentParser to an DefaultHandler2 + Back-port of http://svn.apache.org/r1547948 + http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part9-tc6-v1.patch + +1: markt + -1: + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973 Fix processing of XML schemas when validation is enabled in Jasper http://svn.apache.org/r1556377 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556614 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 8 19:46:09 2014 New Revision: 1556614 URL: http://svn.apache.org/r1556614 Log: Add a note 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=1556614&r1=1556613&r2=1556614&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 19:46:09 2014 @@ -45,6 +45,8 @@ PATCHES PROPOSED TO BACKPORT: Note I am generating the patches using git so the patch shows whole new files being added. When actually making the commit, they will be copied from 7.0.x and amended to retain history. + Note: Part 5 onwards do not depend on this patch so this could be ignored / +addressed later without impacting the XML changes. http://people.apache.org/~markt/patches/2013-12-19-xml-prep-part4-tc6-v1.patch +1: markt, remm +0: kkolinko: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "Cookies" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Cookies" page has been changed by markt: https://wiki.apache.org/tomcat/Cookies?action=diff&rev1=22&rev2=23 Comment: Review proposed generation changes and make a couple of alternative suggestions === Changes to generation of Set-Cookie header === G1 Use RFC6265 format header for V0 cookies:: :: When version == 0 always generate a RFC6265 header, raising an exception from addCookie if the value is invalid rather than attempting to upgrade to a RFC2109 header to use quoting. Application impact is that they will now fail fast with an error rather than inconsistent data as described in Bug 55920; applications that do not set invalid values will not be impacted. + :: '''Alternative G1a:''' Generate an RFC6265 header if possible but provide an option (disabled by default) to allow switching to an RFC2109 header if a valid RFC6265 header is not possible. G2 Use RFC2109 format header only for V1 cookies:: :: When version == 1 always generate a RFC2109 header, raising an exception from addCookie if the value is invalid. This preserves existing behaviour for applications that use V1 cookies. G3 Stop adding quotes or escaping to values:: :: The value supplied by the application will be validated to the relevant specification and will result in a IAE if it does not conform. The value will never be modified to add quotations or escape characters, Application impact is that an attempt to set an invalid value will result in an early error rather than inconsistent data. + :: '''Alternative G3a:''' Quotes and/or escaping only to be added to RFC2109 headers. API to remain symmetric and quoting/escaping to remain transparent to applicatons. G4 Use UTF-8 encoding for values:: :: The value (which is a UCS-16 Java String) will be encoded using UTF-8 when being added to the header. Application impact is that non-ASCII characters will no longer cause an IAE. For V0 cookies, this is an extension to RFC6265 required to support HTML-5. V1 cookies already allow 8-bit characters if quoted and this is likely to be needed to avoid an IAE as the value would still be validated; it would be the application's responsibility to quote the value. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "Cookies" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Cookies" page has been changed by markt: https://wiki.apache.org/tomcat/Cookies?action=diff&rev1=23&rev2=24 Comment: Review proposed parsing changes and make an alternative suggestion P3 Do not throw IAE from the parser:: :: Invalid syntax will result in a user-data log entry and cookies being dropped rather than throwing of an IAE. Application impact is that requests with an invalid Cookie header will now be dispatched to the application. + :: '''Alternative P3a:''' Ensure that the cookie header is available for the application to parse manually. === Impact of proposal on existing issues === ||<:10%>'''Issue'''||Impact|| - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556634 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 8 20:51:04 2014 New Revision: 1556634 URL: http://svn.apache.org/r1556634 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=1556634&r1=1556633&r2=1556634&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 20:51:04 2014 @@ -108,6 +108,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, jboynes, markt -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55119 + Avoid CVE-2013-1571 when generating Javadoc + http://svn.apache.org/r1495875 + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55956] Regarding Tomcat Manager Application Status
https://issues.apache.org/bugzilla/show_bug.cgi?id=55956 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INVALID --- Comment #2 from Mark Thomas --- This is a configuration issue. As Chris pointed out, you need to configure either http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html#Remote_IP_Valve or http://tomcat.apache.org/tomcat-7.0-doc/config/filter.html#Remote_IP_Filter If you need help doing that, the users list is the place to ask. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556635 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 8 20:59:38 2014 New Revision: 1556635 URL: http://svn.apache.org/r1556635 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=1556635&r1=1556634&r2=1556635&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 8 20:59:38 2014 @@ -114,6 +114,12 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671 + Consistent naming for genStringAsCharArray + http://svn.apache.org/r889966 + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556653 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Wed Jan 8 22:03:39 2014 New Revision: 1556653 URL: http://svn.apache.org/r1556653 Log: tomcat 7.0.50 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1556653&r1=1556652&r2=1556653&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Wed Jan 8 22:03:39 2014 @@ -73,7 +73,7 @@ 2001 2008 -7.0.47 +7.0.50 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556655 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
Author: olamy Date: Wed Jan 8 22:05:47 2014 New Revision: 1556655 URL: http://svn.apache.org/r1556655 Log: doc for last version Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm?rev=1556655&r1=1556654&r2=1556655&view=diff == --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm Wed Jan 8 22:05:47 2014 @@ -35,7 +35,7 @@ Adjust Tomcat Version [...] - 7.0.27 + 7.0.50 [...] [...] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556725 - in /tomcat/trunk/java/org/apache/jasper/resources: LocalStrings.properties LocalStrings_es.properties LocalStrings_ja.properties
Author: kkolinko Date: Thu Jan 9 05:38:12 2014 New Revision: 1556725 URL: http://svn.apache.org/r1556725 Log: Followup to r889966: The genStrAsCharArray init param in Jasper has been renamed to genStringAsCharArray in Tomcat 7. Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1556725&r1=1556724&r2=1556725&view=diff == --- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu Jan 9 05:38:12 2014 @@ -119,7 +119,7 @@ jsp.warning.recompileOnFail=Warning: Inv jsp.warning.development=Warning: Invalid value for the initParam development. Will use the default value of \"true\" jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the default value of \"true\" jsp.warning.dumpSmap=Warning: Invalid value for the initParam dumpSmap. Will use the default value of \"false\" -jsp.warning.genchararray=Warning: Invalid value for the initParam genStrAsCharArray. Will use the default value of \"false\" +jsp.warning.genchararray=Warning: Invalid value for the initParam genStringAsCharArray. Will use the default value of \"false\" jsp.warning.suppressSmap=Warning: Invalid value for the initParam suppressSmap. Will use the default value of \"false\" jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam displaySourceFragment. Will use the default value of \"true\" jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam maxLoadedJsps. Will use the default value of \"-1\" Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1556725&r1=1556724&r2=1556725&view=diff == --- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties (original) +++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Thu Jan 9 05:38:12 2014 @@ -117,7 +117,7 @@ jsp.warning.recompileOnFail = Aviso\: Va jsp.warning.development = Aviso\: valor incorrecto para el initParam development. Se usar\u00E1 el valor por defecto de "true" jsp.warning.fork = Aviso\: valor incorrecto para el initParam fork. Se usar\u00E1 el valor por defecto de "true" jsp.warning.dumpSmap = Aviso\: valor incorrecto para el initParam dumpSmap. Se usar\u00E1 el valor por defecto de "false" -jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStrAsCharArray. Se usar\u00E1 el valor por defecto de "false" +jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStringAsCharArray. Se usar\u00E1 el valor por defecto de "false" jsp.warning.suppressSmap = Aviso\: valor incorrecto para el initParam suppressSmap. Se usar\u00E1 el valor por defecto de "false" jsp.warning.displaySourceFragment = Aviso\: valor incorrecto para el initParam displaySourceFragment. Se usar\u00E1 el valor por defecto de "verdadero" jsp.warning.maxLoadedJsps = Aviso\: Valor inv\u00E1lido para el initParam maxLoadedJsps. Usar\u00E9 el valor por defecto de "-1" Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1556725&r1=1556724&r2=1556725&view=diff == --- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties (original) +++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Thu Jan 9 05:38:12 2014 @@ -104,7 +104,7 @@ jsp.warning.checkInterval=\u8b66\u544a: jsp.warning.development=\u8b66\u544a: initParam development\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.fork=\u8b66\u544a: initParam fork\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.dumpSmap=\u8b66\u544a: initParam dumpSmap\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 -jsp.warning.genchararray=\u8b66\u544a: initParam genStrAsCharArray\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"false\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 +jsp.warning.genchararr
[Bug 55671] Backport genStringAsCharArray patch to Tomcat 6.x branch.
https://issues.apache.org/bugzilla/show_bug.cgi?id=55671 --- Comment #1 from Konstantin Kolinko --- Steps to reproduce = ? Where and how do you configure the JSP compiler? What does not work? The correct init-parameter name in Tomcat 6 is "genStrAsCharArray" and that is documented in http://tomcat.apache.org/tomcat-6.0-doc/jasper-howto.html (Though the second mention of it in "Production Configuration" section says "genStringAsCharArray", a typo.) If you use it with Ant then yes, there is an inconsistency and you would have to use as the setter in JspC.java is setGenStringAsCharArray(...) with no matching getter. I think backporting r889966 as is is wrong. I think EmbeddedServletOptions should ask both the old and the new init-param name, for compatibility. It also needs r1556725 and update to jasper-howto.html. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556730 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jan 9 06:26:16 2014 New Revision: 1556730 URL: http://svn.apache.org/r1556730 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=1556730&r1=1556729&r2=1556730&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 9 06:26:16 2014 @@ -64,8 +64,11 @@ PATCHES PROPOSED TO BACKPORT: * Back-port from XML processing improvements (part 5) Switch to a per context configuration for the XML digester http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part5-tc6-v1.patch - +1: markt + +1: markt, kkolinko -1: + kkolinko: I see no need for the new non-static "createWebXmlDigester(..)" + method to be public. It returns 'void', so it is unlikely for it to be + called from outside. * Back-port from XML processing improvements (part 6) Upgrade digester to use DefaultHandler2 and use LexicalHandler to detect @@ -78,14 +81,16 @@ PATCHES PROPOSED TO BACKPORT: code with the current Tomcat 7 code to validate the correctness of the back-port http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part6-tc6-v1.patch - +1: markt + +1: markt, kkolinko -1: + kkolinko: It would be easier to review without all those trailing + whitespace changes. * Back-port from XML processing improvements (part 7) Switch o.a.catalina classes to use the new ErrorHandler Back-port of http://svn.apache.org/r1547937 http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part7-tc6-v1.patch - +1: markt + +1: markt, kkolinko -1: * Back-port from XML processing improvements (part 8) @@ -93,13 +98,15 @@ PATCHES PROPOSED TO BACKPORT: Back-port of http://svn.apache.org/r1547947 http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part8-tc6-v1.patch +1: markt + +1: kkolinko (would be better with a fix to BZ 55974, so that the first + error is reported like the old code does, not a random one) -1: * Back-port from XML processing improvements (part 9) Switch JspDocumentParser to an DefaultHandler2 Back-port of http://svn.apache.org/r1547948 http://people.apache.org/~markt/patches/2014-01-08-xml-prep-part9-tc6-v1.patch - +1: markt + +1: markt, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55973 @@ -112,12 +119,19 @@ PATCHES PROPOSED TO BACKPORT: Avoid CVE-2013-1571 when generating Javadoc http://svn.apache.org/r1495875 +1: markt + +1: kkolinko (The fix goes into dist.xml) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55671 Consistent naming for genStringAsCharArray http://svn.apache.org/r889966 +1: markt + -0: kkolinko: I think "genStrAsCharArray" is the proper and +documented name for Tomcat 6. If we change the init-param name +for better compatibility with Tomcat 7 (a good thing, +1), +the code should check both the new and the old param names. +It also needs r1556725. +https://issues.apache.org/bugzilla/show_bug.cgi?id=55671#c1 -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556737 - in /tomcat/site/trunk: docs/migration-7.html xdocs/migration-7.xml
Author: kkolinko Date: Thu Jan 9 06:47:06 2014 New Revision: 1556737 URL: http://svn.apache.org/r1556737 Log: Document genStrAsCharArray -> genStringAsCharArray rename in Jasper r889966 Modified: tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/xdocs/migration-7.xml Modified: tomcat/site/trunk/docs/migration-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1556737&r1=1556736&r2=1556737&view=diff == --- tomcat/site/trunk/docs/migration-7.html (original) +++ tomcat/site/trunk/docs/migration-7.html Thu Jan 9 06:47:06 2014 @@ -256,6 +256,9 @@ Internal APIs + +JSP compiler + @@ -928,6 +931,23 @@ of Apache Tomcat. + + +JSP compiler + + + +Initialization parameter of JspServlet that controls + one of performance optimizations has been renamed from + genStrAsCharArray to genStringAsCharArray + and is now consistent with the name of related attribute in Jasper task + for Apache Ant. + + + + + + Upgrading 7.0.x Modified: tomcat/site/trunk/xdocs/migration-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1556737&r1=1556736&r2=1556737&view=diff == --- tomcat/site/trunk/xdocs/migration-7.xml (original) +++ tomcat/site/trunk/xdocs/migration-7.xml Thu Jan 9 06:47:06 2014 @@ -449,6 +449,17 @@ of Apache Tomcat. + + + Initialization parameter of JspServlet that controls + one of performance optimizations has been renamed from + genStrAsCharArray to genStringAsCharArray + and is now consistent with the name of related attribute in Jasper task + for Apache Ant. + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1556741 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/resources/LocalStrings.properties java/org/apache/jasper/resources/LocalStrings_es.properties java/org/apache/jasper/resource
Author: kkolinko Date: Thu Jan 9 06:57:28 2014 New Revision: 1556741 URL: http://svn.apache.org/r1556741 Log: Merged r1556725 from tomcat/trunk: https://issues.apache.org/bugzilla/show_bug.cgi?id=55671 Followup to r889966: Fix a typo in log messages: genStrAsCharArray init param in Jasper has been renamed to genStringAsCharArray in Tomcat 7. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1556725 Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1556741&r1=1556740&r2=1556741&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu Jan 9 06:57:28 2014 @@ -173,7 +173,7 @@ jsp.warning.development=Warning: Invalid jsp.warning.fork=Warning: Invalid value for the initParam fork. Will use the default value of \"true\" jsp.warning.reloading=Warning: Invalid value for the initParam reloading. Will use the default value of \"true\" jsp.warning.dumpSmap=Warning: Invalid value for the initParam dumpSmap. Will use the default value of \"false\" -jsp.warning.genchararray=Warning: Invalid value for the initParam genStrAsCharArray. Will use the default value of \"false\" +jsp.warning.genchararray=Warning: Invalid value for the initParam genStringAsCharArray. Will use the default value of \"false\" jsp.warning.suppressSmap=Warning: Invalid value for the initParam suppressSmap. Will use the default value of \"false\" jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam displaySourceFragment. Will use the default value of \"true\" jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam maxLoadedJsps. Will use the default value of \"-1\" Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1556741&r1=1556740&r2=1556741&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Thu Jan 9 06:57:28 2014 @@ -169,7 +169,7 @@ jsp.warning.development = Aviso\: valor jsp.warning.fork = Aviso\: valor incorrecto para el initParam fork. Se usar\u00E1 el valor por defecto de "true" jsp.warning.reloading = Aviso\: valor incorrecto para el initParam reloading. Se usar\u00E1 el valor por defecto de "true" jsp.warning.dumpSmap = Aviso\: valor incorrecto para el initParam dumpSmap. Se usar\u00E1 el valor por defecto de "false" -jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStrAsCharArray. Se usar\u00E1 el valor por defecto de "false" +jsp.warning.genchararray = Aviso\: valor incorrecto para el initParam genStringAsCharArray. Se usar\u00E1 el valor por defecto de "false" jsp.warning.suppressSmap = Aviso\: valor incorrecto para el initParam suppressSmap. Se usar\u00E1 el valor por defecto de "false" jsp.warning.displaySourceFragment = Aviso\: valor incorrecto para el initParam displaySourceFragment. Se usar\u00E1 el valor por defecto de "verdadero" jsp.warning.maxLoadedJsps = Aviso\: Valor inv\u00E1lido para el initParam maxLoadedJsps. Usar\u00E9 el valor por defecto de "-1" Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1556741&r1=1556740&r2=1556741&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Thu Jan 9 06:57:28 2014 @@ -155,7 +155,7 @@ jsp.warning.development=\u8b66\u544a: in jsp.warning.fork=\u8b66\u544a: initParam fork\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u4f7f\u7528\u3057\u307e\u3059 jsp.warning.reloading=\u8b66\u544a: initParam reloading\u306e\u5024\u304c\u7121\u52b9\u3067\u3059\u3002\"true\"\u306e\u30c7\u30d5\u3
