[Bug 55821] parallel deployment should deploy latest version of webapp on startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=55821 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #2 from Mark Thomas ma...@apache.org --- Having thought about this some more there are quite a few possible variations of the use case for this and the options for handling them would add complexity to the deployment process. Therefore I am closing this as won't fix. -- 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: r1549522 - /tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Author: markt
Date: Mon Dec 9 09:45:16 2013
New Revision: 1549522
URL: http://svn.apache.org/r1549522
Log:
Improve parsing of trailing headers
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1549522r1=1549521r2=1549522view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Mon Dec 9 09:45:16 2013
@@ -126,6 +126,11 @@ public class ChunkedInputFilter implemen
/**
+ * Limit for trailer size.
+ */
+private int maxTrailerSize;
+
+/**
* Size of extensions processed for this request.
*/
private long extensionSize;
@@ -135,6 +140,7 @@ public class ChunkedInputFilter implemen
public ChunkedInputFilter(int maxTrailerSize, int maxExtensionSize) {
this.trailingHeaders.setLimit(maxTrailerSize);
this.maxExtensionSize = maxExtensionSize;
+this.maxTrailerSize = maxTrailerSize;
}
// InputBuffer Methods
@@ -264,6 +270,7 @@ public class ChunkedInputFilter implemen
endChunk = false;
needCRLFParse = false;
trailingHeaders.recycle();
+trailingHeaders.setLimit(maxTrailerSize);
extensionSize = 0;
}
@@ -326,7 +333,10 @@ public class ChunkedInputFilter implemen
if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
parseCRLF(false);
eol = true;
-} else if (buf[pos] == Constants.SEMI_COLON) {
+} 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) {
@@ -342,7 +352,9 @@ public class ChunkedInputFilter implemen
return false;
}
} else {
-// extension
+// Extension 'parsing'
+// Note that the chunk-extension is neither parsed nor
+// validated. Currently it is simply ignored.
extensionSize++;
if (maxExtensionSize -1 extensionSize maxExtensionSize)
{
throw new IOException(maxExtensionSize exceeded);
@@ -501,6 +513,13 @@ public class ChunkedInputFilter implemen
chr = buf[pos];
if ((chr == Constants.SP) || (chr == Constants.HT)) {
pos++;
+// If we swallow whitespace, make sure it counts towards
the
+// limit placed on trailing header size
+int newlimit = trailingHeaders.getLimit() -1;
+if (trailingHeaders.getEnd() newlimit) {
+throw new IOException(Exceeded maxTrailerSize);
+}
+trailingHeaders.setLimit(newlimit);
} else {
space = false;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549523 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Author: markt
Date: Mon Dec 9 09:46:58 2013
New Revision: 1549523
URL: http://svn.apache.org/r1549523
Log:
Improve parsing of trailing headers
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1549522
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1549523r1=1549522r2=1549523view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Mon Dec 9 09:46:58 2013
@@ -126,6 +126,11 @@ public class ChunkedInputFilter implemen
/**
+ * Limit for trailer size.
+ */
+private int maxTrailerSize;
+
+/**
* Size of extensions processed for this request.
*/
private long extensionSize;
@@ -135,6 +140,7 @@ public class ChunkedInputFilter implemen
public ChunkedInputFilter(int maxTrailerSize, int maxExtensionSize) {
this.trailingHeaders.setLimit(maxTrailerSize);
this.maxExtensionSize = maxExtensionSize;
+this.maxTrailerSize = maxTrailerSize;
}
// InputBuffer Methods
@@ -264,6 +270,7 @@ public class ChunkedInputFilter implemen
endChunk = false;
needCRLFParse = false;
trailingHeaders.recycle();
+trailingHeaders.setLimit(maxTrailerSize);
extensionSize = 0;
}
@@ -326,7 +333,10 @@ public class ChunkedInputFilter implemen
if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
parseCRLF(false);
eol = true;
-} else if (buf[pos] == Constants.SEMI_COLON) {
+} 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) {
@@ -342,7 +352,9 @@ public class ChunkedInputFilter implemen
return false;
}
} else {
-// extension
+// Extension 'parsing'
+// Note that the chunk-extension is neither parsed nor
+// validated. Currently it is simply ignored.
extensionSize++;
if (maxExtensionSize -1 extensionSize maxExtensionSize)
{
throw new IOException(maxExtensionSize exceeded);
@@ -511,6 +523,13 @@ public class ChunkedInputFilter implemen
chr = buf[pos];
if ((chr == Constants.SP) || (chr == Constants.HT)) {
pos++;
+// If we swallow whitespace, make sure it counts towards
the
+// limit placed on trailing header size
+int newlimit = trailingHeaders.getLimit() -1;
+if (trailingHeaders.getEnd() newlimit) {
+throw new IOException(Exceeded maxTrailerSize);
+}
+trailingHeaders.setLimit(newlimit);
} else {
space = false;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549524 - in /tomcat/trunk: java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/config/filter.xml webapps/docs/config/valv
Author: markt
Date: Mon Dec 9 09:48:42 2013
New Revision: 1549524
URL: http://svn.apache.org/r1549524
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55820
Include the 172.16/12 range in the default value for internal proxies.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1549524r1=1549523r2=1549524view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Mon Dec
9 09:48:42 2013
@@ -107,9 +107,12 @@ import org.apache.juli.logging.LogFactor
* tdRemoteIPInternalProxy/td
* tdRegular expression (in the syntax supported by
* {@link java.util.regex.Pattern java.util.regex})/td
- *
td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}
br/
- * By default, 10/8, 192.168/16, 169.254/16 and 127/8 are allowed ; 172.16/12
has not been enabled by default because it is complex to
- * describe with regular expressions/td
+ * td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|
+ * 169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|
+ * 172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}|
+ * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}
+ * br/
+ * By default, 10/8, 192.168/16, 169.254/16, 127/8 and 172.16/12 are
allowed./td
* /tr
* /tr
* tr
@@ -695,7 +698,10 @@ public class RemoteIpFilter implements F
10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
192\\.168\\.\\d{1,3}\\.\\d{1,3}| +
169\\.254\\.\\d{1,3}\\.\\d{1,3}| +
-127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3});
+127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3});
/**
* @see #setProtocolHeader(String)
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1549524r1=1549523r2=1549524view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Mon Dec 9
09:48:42 2013
@@ -88,9 +88,12 @@ import org.apache.juli.logging.LogFactor
* tdRemoteIPInternalProxy/td
* tdRegular expression (in the syntax supported by
* {@link java.util.regex.Pattern java.util.regex})/td
- *
td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}br/
- * By default, 10/8, 192.168/16, 169.254/16 and 127/8 are allowed ; 172.16/12
has not been enabled by default because it is complex to
- * describe with regular expressions/td
+ * td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|
+ * 169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|
+ * 172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}|
+ * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}
+ * br/
+ * By default, 10/8, 192.168/16, 169.254/16, 127/8 and 172.16/12 are
allowed./td
* /tr
* /tr
* tr
@@ -406,7 +409,10 @@ public class RemoteIpValve extends Valve
10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
192\\.168\\.\\d{1,3}\\.\\d{1,3}| +
169\\.254\\.\\d{1,3}\\.\\d{1,3}| +
-127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3});
+127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3});
/**
* @see #setProtocolHeader(String)
Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1549524r1=1549523r2=1549524view=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Mon Dec 9 09:48:42 2013
@@ -1202,7 +1202,7 @@ FINE: Request /docs/config/manager.html
Internal proxies that appear in the strongremoteIpHeader/strong
will
be trusted and will not appear in the strongproxiesHeader/strong
value. If not specified the default value of code
-
[Bug 55820] Add 172.16/12 range to default internal proxies
https://issues.apache.org/bugzilla/show_bug.cgi?id=55820 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- This has been fixed in 8.0.x and will be included in 8.0.0-RC6 onwards. I thought about back-porting it to 7.0.x but in the end opted not to as unexpectedly adding to the list of allowed internal proxies between point releases might create problems for some users. -- 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: r1549525 - /tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Author: markt Date: Mon Dec 9 09:51:18 2013 New Revision: 1549525 URL: http://svn.apache.org/r1549525 Log: New field can be final Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1549525r1=1549524r2=1549525view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Mon Dec 9 09:51:18 2013 @@ -128,7 +128,7 @@ public class ChunkedInputFilter implemen /** * Limit for trailer size. */ -private int maxTrailerSize; +private final int maxTrailerSize; /** * Size of extensions processed for this request. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1549524 - in /tomcat/trunk: java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/config/filter.xml webapps/docs/config/
2013/12/9 ma...@apache.org:
Author: markt
Date: Mon Dec 9 09:48:42 2013
New Revision: 1549524
URL: http://svn.apache.org/r1549524
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55820
Include the 172.16/12 range in the default value for internal proxies.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1549524r1=1549523r2=1549524view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Mon Dec
9 09:48:42 2013
@@ -107,9 +107,12 @@ import org.apache.juli.logging.LogFactor
* tdRemoteIPInternalProxy/td
* tdRegular expression (in the syntax supported by
* {@link java.util.regex.Pattern java.util.regex})/td
- *
td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}
br/
- * By default, 10/8, 192.168/16, 169.254/16 and 127/8 are allowed ;
172.16/12 has not been enabled by default because it is complex to
- * describe with regular expressions/td
+ * td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|
+ * 169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|
+ * 172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}|
+ * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}
I think the {1} above is superfluous, as that is the default
cardinality. It may need a test, though.
+ * br/
+ * By default, 10/8, 192.168/16, 169.254/16, 127/8 and 172.16/12 are
allowed./td
* /tr
* /tr
* tr
@@ -695,7 +698,10 @@ public class RemoteIpFilter implements F
10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
192\\.168\\.\\d{1,3}\\.\\d{1,3}| +
169\\.254\\.\\d{1,3}\\.\\d{1,3}| +
-127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3});
+127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3});
/**
* @see #setProtocolHeader(String)
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1549524r1=1549523r2=1549524view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Mon Dec
9 09:48:42 2013
@@ -88,9 +88,12 @@ import org.apache.juli.logging.LogFactor
* tdRemoteIPInternalProxy/td
* tdRegular expression (in the syntax supported by
* {@link java.util.regex.Pattern java.util.regex})/td
- *
td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}br/
- * By default, 10/8, 192.168/16, 169.254/16 and 127/8 are allowed ;
172.16/12 has not been enabled by default because it is complex to
- * describe with regular expressions/td
+ * td10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|
+ * 169\.254\.\d{1,3}\.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3}|
+ * 172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}|
+ * 172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}
+ * br/
+ * By default, 10/8, 192.168/16, 169.254/16, 127/8 and 172.16/12 are
allowed./td
* /tr
* /tr
* tr
@@ -406,7 +409,10 @@ public class RemoteIpValve extends Valve
10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
192\\.168\\.\\d{1,3}\\.\\d{1,3}| +
169\\.254\\.\\d{1,3}\\.\\d{1,3}| +
-127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3});
+127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}| +
+172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3});
/**
* @see #setProtocolHeader(String)
Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1549524r1=1549523r2=1549524view=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Mon Dec 9 09:48:42 2013
@@ -1202,7 +1202,7 @@ FINE: Request /docs/config/manager.html
Internal proxies that appear in the strongremoteIpHeader/strong
will
be trusted
svn commit: r1549526 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/filters/ChunkedInputFilter.java webapps/docs/changelog.xml
Author: markt Date: Mon Dec 9 09:53:05 2013 New Revision: 1549526 URL: http://svn.apache.org/r1549526 Log: New field can be final Add changelog entry Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1549525 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1549526r1=1549525r2=1549526view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Mon Dec 9 09:53:05 2013 @@ -128,7 +128,7 @@ public class ChunkedInputFilter implemen /** * Limit for trailer size. */ -private int maxTrailerSize; +private final int maxTrailerSize; /** * Size of extensions processed for this request. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1549526r1=1549525r2=1549526view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Dec 9 09:53:05 2013 @@ -251,6 +251,9 @@ protects against misbehaving clients that may not sent the request body in that case and send the next request instead. (markt) /add + fix +Improve the parsing of trailing headers in HTTP requests. (markt) + /fix /changelog /subsection subsection name=Jasper - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549528 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ant/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/jasper/ java/org/apach
Author: markt
Date: Mon Dec 9 10:01:16 2013
New Revision: 1549528
URL: http://svn.apache.org/r1549528
Log:
Add an option to the Context to control the blocking of XML external entities
when parsing XML configuration files and enable this blocking by default. The
block is implemented via a custom resolver to enable the logging of any blocked
entities.
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/Globals.java
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/trunk/java/org/apache/jasper/compiler/TldCache.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
tomcat/trunk/test/javax/servlet/resources/TestSchemaValidation.java
tomcat/trunk/test/org/apache/catalina/core/TesterContext.java
tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/TestLocalResolver.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/security-howto.xml
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1549528r1=1549527r2=1549528view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Mon Dec 9 10:01:16 2013
@@ -617,6 +617,25 @@ public interface Context extends Contain
/**
+ * Will the parsing of web.xml, web-fragment.xml, *.tld, *.jspx, *.tagx and
+ * tagplugin.xml files for this Context block the use of external entities?
+ *
+ * @return true if access to external entities is blocked
+ */
+public boolean getXmlBlockExternal();
+
+
+/**
+ * Controls whether the parsing of web.xml, web-fragment.xml, *.tld,
*.jspx,
+ * *.tagx and tagplugin.xml files for this Context will block the use of
+ * external entities.
+ *
+ * @param xmlBlockExternal true to block external entities
+ */
+public void setXmlBlockExternal(boolean xmlBlockExternal);
+
+
+/**
* Will the parsing of *.tld files for this Context be performed by a
* validating parser?
*
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1549528r1=1549527r2=1549528view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Mon Dec 9 10:01:16 2013
@@ -279,4 +279,15 @@ public final class Globals {
*/
public static final String JASPER_XML_VALIDATION_TLD_INIT_PARAM =
org.apache.jasper.XML_VALIDATE_TLD;
+
+
+/**
+ * Name of the ServletContext init-param that determines if the JSP engine
+ * will block external entities from being used in *.tld, *.jspx, *.tagx
and
+ * tagplugin.xml files.
+ * p
+ * This must be kept in sync with org.apache.jasper.Constants
+ */
+public static final String JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM =
+org.apache.jasper.XML_BLOCK_EXTERNAL;
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1549528r1=1549527r2=1549528view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++
svn commit: r1549529 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/ant/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/jasper/ jav
Author: markt
Date: Mon Dec 9 10:05:56 2013
New Revision: 1549529
URL: http://svn.apache.org/r1549529
Log:
Add an option to the Context to control the blocking of XML external entities
when parsing XML configuration files and enable this blocking by default when a
security manager is used. The block is implemented via a custom resolver to
enable the logging of any blocked entities.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings.properties
tomcat/tc7.0.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/descriptor/TestLocalResolver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1549528
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java?rev=1549529r1=1549528r2=1549529view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java Mon Dec 9
10:05:56 2013
@@ -675,6 +675,25 @@ public interface Context extends Contain
/**
+ * Will the parsing of web.xml, web-fragment.xml, *.tld, *.jspx, *.tagx and
+ * tagplugin.xml files for this Context block the use of external entities?
+ *
+ * @return true if access to external entities is blocked
+ */
+public boolean getXmlBlockExternal();
+
+
+/**
+ * Controls whether the parsing of web.xml, web-fragment.xml, *.tld,
*.jspx,
+ * *.tagx and tagplugin.xml files for this Context will block the use of
+ * external entities.
+ *
+ * @param xmlBlockExternal true to block external entities
+ */
+public void setXmlBlockExternal(boolean xmlBlockExternal);
+
+
+/**
* Will the parsing of *.tld files for this Context be performed by a
* validating parser?
*
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1549529r1=1549528r2=1549529view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Mon Dec 9
10:05:56 2013
@@ -316,4 +316,15 @@ public final class Globals {
*/
public static final String JASPER_XML_VALIDATION_TLD_INIT_PARAM =
org.apache.jasper.XML_VALIDATE_TLD;
+
+
+/**
+ * Name of the ServletContext init-param that determines if the JSP engine
+ * will block external entities from being used in *.tld, *.jspx, *.tagx
and
+ * tagplugin.xml files.
+ * p
+ * This must be kept in sync with org.apache.jasper.Constants
+ */
+public static final String JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM =
+org.apache.jasper.XML_BLOCK_EXTERNAL;
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL:
Time for 8.0.0-RC6
It has been a while (again much longer than I really wanted) since 8.0.0-RC5 so I think it is time for RC6. I'm running the unit tests now and (if they all pass) I plan to tag RC6 later today. I am expecting that this will be the last RC. All the planned major refactorings are complete. The outstanding items are: - explore the possibility of refactoring the data formatting - look again at the remaining circular dependencies with Structure 101 - DBCP 2.0 - enhancements I don't expect any of these to require major changes so assuming no major problems are reported with RC6, I plan to produce 8.0.0 (hopefully a beta, might still be alpha) shortly after RC6. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549534 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/XmlErrorHandler.java
Author: markt
Date: Mon Dec 9 10:37:25 2013
New Revision: 1549534
URL: http://svn.apache.org/r1549534
Log:
Fix Javadoc
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/XmlErrorHandler.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/XmlErrorHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/XmlErrorHandler.java?rev=1549534r1=1549533r2=1549534view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/XmlErrorHandler.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/XmlErrorHandler.java
Mon Dec 9 10:37:25 2013
@@ -26,7 +26,7 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
/**
- * @deprecated Use {@link import
org.apache.tomcat.util.descriptor.XmlErrorHandler}
+ * @deprecated Use {@link org.apache.tomcat.util.descriptor.XmlErrorHandler}
*/
@Deprecated
public class XmlErrorHandler implements ErrorHandler {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549535 - /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Author: markt
Date: Mon Dec 9 10:42:13 2013
New Revision: 1549535
URL: http://svn.apache.org/r1549535
Log:
Fix Javadoc warning
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1549535r1=1549534r2=1549535view=diff
==
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Mon Dec 9 10:42:13 2013
@@ -365,7 +365,6 @@ public class PooledConnection {
* Returns true if the connection pool is configured
* to do validation for a certain action.
* @param action
- * @return
*/
private boolean doValidate(int action) {
if (action == PooledConnection.VALIDATE_BORROW
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 7.0.48
Hi, 2013/11/16 Violeta Georgieva violet...@apache.org Hi, I'm planning to prepare 7.0.48 for voting. Please reply here if you would like to include something in that release. I'll tag 7.0.48 in the afternoon. Regards Violeta
svn commit: r1549536 - /tomcat/trunk/TOMCAT-NEXT.txt
Author: markt Date: Mon Dec 9 10:42:35 2013 New Revision: 1549536 URL: http://svn.apache.org/r1549536 Log: Update Modified: tomcat/trunk/TOMCAT-NEXT.txt Modified: tomcat/trunk/TOMCAT-NEXT.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1549536r1=1549535r2=1549536view=diff == --- tomcat/trunk/TOMCAT-NEXT.txt (original) +++ tomcat/trunk/TOMCAT-NEXT.txt Mon Dec 9 10:42:35 2013 @@ -25,8 +25,7 @@ but possibly 7.1.x). 2. Refactor the XML parsing (org.apache.tomcat.util.xml ?) to remove duplicate XML parsing code in Catalina and Jasper such as the entity resolvers used for validation. -- Partial. -- More sharing possible? +- Complete 3. TLDs may have a many to many relationship between URIs and TLD files. This can result in the same TLD file being parsed many times. Refactor the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549547 - /tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
Author: markt
Date: Mon Dec 9 11:22:01 2013
New Revision: 1549547
URL: http://svn.apache.org/r1549547
Log:
Fix failing tests. TldParser needs a RuleSet.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java?rev=1549547r1=1549546r2=1549547view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
Mon Dec 9 11:22:01 2013
@@ -36,7 +36,7 @@ public class TestTldParser {
@Before
public void init() {
-parser = new TldParser(true, true, null, true);
+parser = new TldParser(true, true, new TldRuleSet(), true);
}
@Test
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55851] Tomcat SPNEGO authenticator incompatible with IBM JDK: Accept Security Context needs to be wrapped around a Privileged Action in order for server side authentication
https://issues.apache.org/bugzilla/show_bug.cgi?id=55851 --- Comment #2 from Arunav Sanyal arunav.sanya...@gmail.com --- Thanks I tried searching for recent changes to SpnegoAuthenticator and I cant seem to find the bug report in which this issue was first reported. Can you please point me to the bug report in which this fix is made? Or is this a change which is not tracked by ASF bugzilla? Yours sincerely Arunav Sanyal -- 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 55851] Tomcat SPNEGO authenticator incompatible with IBM JDK: Accept Security Context needs to be wrapped around a Privileged Action in order for server side authentication
https://issues.apache.org/bugzilla/show_bug.cgi?id=55851 --- Comment #3 from Mark Thomas ma...@apache.org --- (In reply to Arunav Sanyal from comment #2) Thanks I tried searching for recent changes to SpnegoAuthenticator and I cant seem to find the bug report in which this issue was first reported. Huh? This is the bug report in which this issue was first reported. Can you please point me to the bug report in which this fix is made? Or is this a change which is not tracked by ASF bugzilla? Huh? Bugzilla is not a source code control system. It doesn't track source code changes? Are you looking for a link to the svn revisions where this issue was fixed? -- 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
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5309 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1549525 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: Time for 7.0.48
Given the regression in startup speed due to the web socket scanning, it would be /really/ nice if this release included clear notes on how one can best disable this. On 12/9/2013 4:41 AM, Violeta Georgieva wrote: Hi, 2013/11/16 Violeta Georgieva violet...@apache.org Hi, I'm planning to prepare 7.0.48 for voting. Please reply here if you would like to include something in that release. I'll tag 7.0.48 in the afternoon. Regards Violeta
[Bug 54691] Rename HTTPS BIO/NIO connector attribute protocols to sslEnabledProtocols and document it.
https://issues.apache.org/bugzilla/show_bug.cgi?id=54691 Ognjen Blagojevic ognjen.d.blagoje...@gmail.com changed: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #3 from Ognjen Blagojevic ognjen.d.blagoje...@gmail.com --- Thank you. -- 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
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1623 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1549535 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1549569 - /tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
Author: markt
Date: Mon Dec 9 13:38:58 2013
New Revision: 1549569
URL: http://svn.apache.org/r1549569
Log:
Fix Windows specific issue when converting a file system path to a web
application path ('\' - '/')
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1549569r1=1549568r2=1549569view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Mon Dec 9
13:38:58 2013
@@ -326,8 +326,13 @@ public class TldScanner {
return FileVisitResult.CONTINUE;
}
-String resourcePath = webappPath + / +
-file.subpath(filePath.getNameCount(),
file.getNameCount());
+String subPath = file.subpath(
+filePath.getNameCount(),
file.getNameCount()).toString();
+if ('/' != File.separatorChar) {
+subPath = subPath.replace(File.separatorChar, '/');
+}
+String resourcePath = webappPath + / + subPath;
+
try {
URL url = file.toUri().toURL();
TldResourcePath path = new TldResourcePath(url,
resourcePath);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot retry in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5310 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1549547 Blamelist: markt BUILD FAILED: build successful exception slave lost sincerely, -The Buildbot
Re: buildbot failure in ASF Buildbot on tomcat-7-trunk
Hi, 2013/12/9 build...@apache.org The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1623 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1549535 Blamelist: markt BUILD FAILED: failed compile_1 Tested on Windows 7 x64 and Mac OS X 10.7.5 but this test org.apache.tomcat.websocket.TestWsWebSocketContainer is passing sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5311 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1549547 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1549621 - in /tomcat/tags/TOMCAT_8_0_0_RC6: ./ build.properties.default res/maven/mvn.properties.default
Author: markt Date: Mon Dec 9 17:21:16 2013 New Revision: 1549621 URL: http://svn.apache.org/r1549621 Log: Tag 8.0.0-RC6 Added: tomcat/tags/TOMCAT_8_0_0_RC6/ - copied from r1549619, tomcat/trunk/ Modified: tomcat/tags/TOMCAT_8_0_0_RC6/build.properties.default tomcat/tags/TOMCAT_8_0_0_RC6/res/maven/mvn.properties.default Modified: tomcat/tags/TOMCAT_8_0_0_RC6/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC6/build.properties.default?rev=1549621r1=1549619r2=1549621view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC6/build.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC6/build.properties.default Mon Dec 9 17:21:16 2013 @@ -29,7 +29,7 @@ version.major=8 version.minor=0 version.build=0 version.patch=0 -version.suffix=-dev +version.suffix=-RC6 # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed Modified: tomcat/tags/TOMCAT_8_0_0_RC6/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_8_0_0_RC6/res/maven/mvn.properties.default?rev=1549621r1=1549619r2=1549621view=diff == --- tomcat/tags/TOMCAT_8_0_0_RC6/res/maven/mvn.properties.default (original) +++ tomcat/tags/TOMCAT_8_0_0_RC6/res/maven/mvn.properties.default Mon Dec 9 17:21:16 2013 @@ -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=8.0.0 +maven.asf.release.deploy.version=8.0.0-RC6 #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: r1549643 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_48: ./ build.properties.default
Author: violetagg Date: Mon Dec 9 19:00:49 2013 New Revision: 1549643 URL: http://svn.apache.org/r1549643 Log: Tag 7.0.48 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ (props changed) - copied from r1549642, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- --- bugtraq:message (added) +++ bugtraq:message Mon Dec 9 19:00:49 2013 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- --- svn:ignore (added) +++ svn:ignore Mon Dec 9 19:00:49 2013 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Dec 9 19:00:49 2013 @@ -0,0 +1 @@ +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1352661,1
svn commit: r3860 [2/2] - in /dev/tomcat/tomcat-8/v8.0.0-RC6: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.asc Mon Dec 9 20:06:13 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSph0BAAoJEBDAHFovYFnnhr4P/2fJKght5LQ8WoHo8/hRichI +4Zq7tbe2pVsWauJZYMok0RigbHM4+W1LM/HJUQnb+fzYh0EiodhrwtyHIK4eMwpX +yDqvL5yJ4bZVPrO7NdE9c0phTGgljwRXq2DpG57nDKSHYcUkmnreJtwcFBrnbupR +J/meLjPTmwS6Cet9B4HD0rTA4MRGItidHC8vPL9GOqErIdzBqp+WTU6fQQBc4ahW +6sMZgW433l4Hgk0ciagJIx/wqVq4s/UP0W8+5T7dNC/A8P3taut6Yi0l5HR92EY+ +GTk91xLpJysdq49rklu/aS3Up+0X+xE+uWJQCI65yIiJ7+jjhYk6sgustenjSxVi +UhirrrJuGgxjKWEPK2nfoRj5MaX+9TE8/e1aIchPXgIxjQhL7Yo30Nfrwcv4hq4O +Juqa3nSiG+qcWDbMn13hkclxGiTV/TF2ceVbEE/uqhQa45/G6fmwSjT/WDXryeGt +PoNiCh9Q1W1Tcrk4J2y/Nb5AlHcJxguc4eRvRBec9Nrmd+FWbyIIymf/Pwmga7Rq +Z+8AACQZPgE7DOyD31fPLwUupQ1uJZpU819hxktGsua8TB4Uj3HXGXjRsd/aVKNb +OT1xKNY1i01m/RT2PpNFDLLlyHCt1d5q+QKLDEFCXUDbTPExx3YolR8OlYA8Xw2K +PS1Ef/j/NjVSR/5AzSmz +=CcJW +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.md5 Mon Dec 9 20:06:13 2013 @@ -0,0 +1 @@ +c9f9c7af9d6f3b0806fca96eedbbf164 *apache-tomcat-8.0.0-RC6-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.asc Mon Dec 9 20:06:13 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSphztAAoJEBDAHFovYFnnQp4QANSdqjE48hZ/9f34mQJKgdUG +bZptx+KgJ80rZRsYqlioWXwZrrWlUpa1I7t2BvduT3a2XX4AgoPN23/I7LvY5kYX +JQEqG9vEPUI/uvaKQyp0NNXlnjfGI/84EK57ZrCD2j06+XclqewURZUySfg72LiA +MqoVnQYK3PX54VwKTkQR/yUrxvQiVP2XiAG5d+ZYMEJkkur0YUlfC5RW6VTZyIYO +6sU6H0oWxJwdHQCvyK1PVIoqVZq8V1XXfWSlcw4c0XIio9Uad7XMBViQQxU1w3bk +wKrTl2aA+OKmAzreIQshBci1qnEupkOkP1+903aqFmshxXI4ib6GO99EpWR6Mj5G +247XA+baYKECKFpIy21OSNW19hIbhDzzY7g4i7CFCrAOPYSgAbIjbl/zE6wgpj86 +G+LtIicowyTMTx8VUfppRylvnZ1Tnns1qE2AtrO85o4zKma/jstNt3r3ZUMV4bao +px+pdj7TaY/iO4rNxNsxTrDR8yas+784HXStWFNN5K9C1SkHlKw9kF3Sy3SHTrMD +qAtiLF96S+b9t1W3arNZ7saMpPbBvXaqtdGWGqLhib5dASDzxHRH0P1qFHb75o51 +D9wEXFYBO5Rjjue7kkYiMVLrmZYunLhOP5IED3FiUZY9JsCprw1WPhzixbjEiT3j +4n8qzfcmlTExbL9rYWvR +=Pmif +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.md5 Mon Dec 9 20:06:13 2013 @@ -0,0 +1 @@ +32a91506ef6524ec0155bd7066e9db25 *apache-tomcat-8.0.0-RC6-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3860 [2/2] - in /dev/tomcat/tomcat-8/v8.0.0-RC6: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.asc Mon Dec 9 20:06:13 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSph0BAAoJEBDAHFovYFnnhr4P/2fJKght5LQ8WoHo8/hRichI +4Zq7tbe2pVsWauJZYMok0RigbHM4+W1LM/HJUQnb+fzYh0EiodhrwtyHIK4eMwpX +yDqvL5yJ4bZVPrO7NdE9c0phTGgljwRXq2DpG57nDKSHYcUkmnreJtwcFBrnbupR +J/meLjPTmwS6Cet9B4HD0rTA4MRGItidHC8vPL9GOqErIdzBqp+WTU6fQQBc4ahW +6sMZgW433l4Hgk0ciagJIx/wqVq4s/UP0W8+5T7dNC/A8P3taut6Yi0l5HR92EY+ +GTk91xLpJysdq49rklu/aS3Up+0X+xE+uWJQCI65yIiJ7+jjhYk6sgustenjSxVi +UhirrrJuGgxjKWEPK2nfoRj5MaX+9TE8/e1aIchPXgIxjQhL7Yo30Nfrwcv4hq4O +Juqa3nSiG+qcWDbMn13hkclxGiTV/TF2ceVbEE/uqhQa45/G6fmwSjT/WDXryeGt +PoNiCh9Q1W1Tcrk4J2y/Nb5AlHcJxguc4eRvRBec9Nrmd+FWbyIIymf/Pwmga7Rq +Z+8AACQZPgE7DOyD31fPLwUupQ1uJZpU819hxktGsua8TB4Uj3HXGXjRsd/aVKNb +OT1xKNY1i01m/RT2PpNFDLLlyHCt1d5q+QKLDEFCXUDbTPExx3YolR8OlYA8Xw2K +PS1Ef/j/NjVSR/5AzSmz +=CcJW +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.tar.gz.md5 Mon Dec 9 20:06:13 2013 @@ -0,0 +1 @@ +c9f9c7af9d6f3b0806fca96eedbbf164 *apache-tomcat-8.0.0-RC6-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.asc == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.asc Mon Dec 9 20:06:13 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJSphztAAoJEBDAHFovYFnnQp4QANSdqjE48hZ/9f34mQJKgdUG +bZptx+KgJ80rZRsYqlioWXwZrrWlUpa1I7t2BvduT3a2XX4AgoPN23/I7LvY5kYX +JQEqG9vEPUI/uvaKQyp0NNXlnjfGI/84EK57ZrCD2j06+XclqewURZUySfg72LiA +MqoVnQYK3PX54VwKTkQR/yUrxvQiVP2XiAG5d+ZYMEJkkur0YUlfC5RW6VTZyIYO +6sU6H0oWxJwdHQCvyK1PVIoqVZq8V1XXfWSlcw4c0XIio9Uad7XMBViQQxU1w3bk +wKrTl2aA+OKmAzreIQshBci1qnEupkOkP1+903aqFmshxXI4ib6GO99EpWR6Mj5G +247XA+baYKECKFpIy21OSNW19hIbhDzzY7g4i7CFCrAOPYSgAbIjbl/zE6wgpj86 +G+LtIicowyTMTx8VUfppRylvnZ1Tnns1qE2AtrO85o4zKma/jstNt3r3ZUMV4bao +px+pdj7TaY/iO4rNxNsxTrDR8yas+784HXStWFNN5K9C1SkHlKw9kF3Sy3SHTrMD +qAtiLF96S+b9t1W3arNZ7saMpPbBvXaqtdGWGqLhib5dASDzxHRH0P1qFHb75o51 +D9wEXFYBO5Rjjue7kkYiMVLrmZYunLhOP5IED3FiUZY9JsCprw1WPhzixbjEiT3j +4n8qzfcmlTExbL9rYWvR +=Pmif +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.0-RC6/src/apache-tomcat-8.0.0-RC6-src.zip.md5 Mon Dec 9 20:06:13 2013 @@ -0,0 +1 @@ +32a91506ef6524ec0155bd7066e9db25 *apache-tomcat-8.0.0-RC6-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549664 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: violetagg Date: Mon Dec 9 20:15:53 2013 New Revision: 1549664 URL: http://svn.apache.org/r1549664 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=1549664r1=1549663r2=1549664view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Mon Dec 9 20:15:53 2013 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=48 +version.build=49 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=1549664r1=1549663r2=1549664view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Mon Dec 9 20:15:53 2013 @@ -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.48 +maven.asf.release.deploy.version=7.0.49 #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
[VOTE] Release Apache Tomcat 8.0.0-RC6
The proposed Apache Tomcat 8.0.0 release candidate 6 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC5 are: - Better handling of generic types in the WebSocket 1.0 implementation - Refactor resource handling for the class loader - Add Cobertura support to the unit tests - Remove anti-Jar locking feature and replace it with open stream tracking - Update to Commons Pool 2.0 release - Complete refactoring of TLD handling including caching of parsed TLDs - More consistent handling of XML validation options - Numerous bug fixes It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC6/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-029/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC6/ The proposed 8.0.0-RC6 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC6 alpha Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.0-RC6
On 09/12/2013 20:18, Mark Thomas wrote: The proposed Apache Tomcat 8.0.0 release candidate 6 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC5 are: - Better handling of generic types in the WebSocket 1.0 implementation - Refactor resource handling for the class loader - Add Cobertura support to the unit tests - Remove anti-Jar locking feature and replace it with open stream tracking - Update to Commons Pool 2.0 release - Complete refactoring of TLD handling including caching of parsed TLDs - More consistent handling of XML validation options - Numerous bug fixes It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC6/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-029/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC6/ The proposed 8.0.0-RC6 release is: [ ] Broken - do not release [X] Alpha - go ahead and release as 8.0.0-RC6 alpha Unit tests pass win 64-bit Java 7 on Windows, Linux and OSX. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1624 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1549664 Blamelist: violetagg Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r3861 [2/2] - in /dev/tomcat/tomcat-7/v7.0.48: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.asc == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.asc Mon Dec 9 21:16:58 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJSphj+AAoJECCLCrHWMBHH2HIP/2+XH6W2VJ7uGhjkgE3O29ID +p5RAryLLogWqLpTwY+NcUW3r5y4MQsg2Ztkoh8y1P9MlPrOpXf7LDyipkWcgmPOh +XPYNbmAZB94psfU88iTZA+v+p7EVFimstyMejy0h12ffEGSQe1BMAnGMLOsfH11n +HuxEmu/vltloZC7N9iN8HWdE5wlrwdJEeLr2eiA/UG6CLBCfOup8Qa6Zb7LaQYTH +hOygWHROm6C0fgmN6Zv2ccd5JYgfNYp570D6Gi2bejY6QwX5SYUolZpotBlUBDRM +GBYS8cnU2mVnwb6aZZb8+XPTUlAbIXa7U+pgh3WboRDnqL59Pey5HTCkAzCkpSwy +qEUCzdMVZ1U4nDUcBDiOdnYVR11WUBFCZaZumYmr+nUdZq5kMLDT1Uadaq1tTTlT +KEllcPXE7UchPUg2aAaba6jYYfXeQ53JzD3B3qlQ1jVlcCcf/Gn7f5BOL7ZmwQXr +xIBJMxCKvsrrw7uhb+x0AIlloMkmoaJLHfsDnVrrhDwahPeE1HDF0WQr9eaHxqoE +jqrnEl5jitdSjapyZ2FfMFLTBT0VL8/LQPueyfhedVEfjn0thEZygkcn3+sAs3ck +y0GEJREa9qtghj4UeRDEFrCLh7nmJXuBT/86LdlPROpUADubWxvPyUdHcG75zHlK +qyk2plB5eC5grLl98Mqf +=G0Kp +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.md5 Mon Dec 9 21:16:58 2013 @@ -0,0 +1 @@ +6cd992f67945691fb27b5757cc52f242 *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.asc Mon Dec 9 21:16:58 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJSphj9AAoJECCLCrHWMBHHFb4QAPrv3uGWKAwiO3sWSTtaXgYh +xhs/7DQ3Wb3GcBUk88oXsjuuLrwADvFeZ+gqYe+kRAuGTH72uO2GzjjnzXXbrE3n +MDVyez81tNImyFEzk+3mtnWixU6zdSA59Gd1WZ7Cs6sxIOgYUnQ9BWUQBpa5KXvQ +PS6hEPhaoItPe29LxSlT6XHhpGVr7l0K7j/s1TxKQzSvD7bsF29D1eYeweG1uFpN +/XNPA2UGwe0JuwmWbkbqCp6qu/UBzdnJpp4WiR8VUw/6ohTaHJg2RJvnSgnwCVrD +h/BxhRTloBudrad9qoxwU35ymjdUkSNXGgT7WdOS4Efblva9j2Iyv0q1nFHFYH1p +NE7y4oNTHkDlC08L7sEn++HHeQr1jEZWMg9wZStR3kVBiMB8Wbn5oXFVrI2H5GKQ +se1Ftn94bb3sIeimaVjnVr50xLcHtq4kQIZ6aV02BC9W8kG4kvcDg85496/QHcfW +Fb50S4iEhPzZ2aMpo9gREe0md6UVv8Bt+1fdU4QBQfj1byOYjzQH+q4/+iWrjU3x +EhIn8joYLCMM7YNBhKELRSaY6FbxzZjazrmIekdD5GBxxufYUyUfAIPqQ2koGcgU +/NKn085TbK1Hi5Og9bPAkE0sUZm+IXFqSmpTIw+5gqaaf8t5CxAKPloKeJBwtSaG +yb7EQRiArmg98Dwl4DYQ +=Z24k +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.md5 Mon Dec 9 21:16:58 2013 @@ -0,0 +1 @@ +b2c0a0b543346dbf784160b46d0c860c *tomcat-juli.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz -- svn:mime-type = application/x-gzip Added: dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz.asc == --- dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz.asc Mon Dec 9 21:16:58 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJSphvXAAoJECCLCrHWMBHH+iEP/0SFzfNJLQYX/0Cj1sHS4PdI +lmaZyAL+O7wg9Ztek7PQxvgustRegRR3EANGR8HdxHI07hxoD3GmJ9UxlPSux5mO +SJf3S2F4kXKBJUeXjf2614w56GRJG03mvO97cgl07TogxXoIJOkJe1Bx/TgJZoar +uJEBS//YGReQAm9igjoebV7jOzaSUl4j9kwKL27Gm1rVVdHjxj+GN+EAw3tptA/q +wCxRAE8jLP8ZhpKrLg3+uYXJ+ux7gmSQ+AzZpFmcNLfEmTXkHkRHlY6kAUz6EXN2 +ubtojTGU3dQw4rFqJVuYeGwTG8Tp1jFAXnbT5K28kDrAvcUErHSuYuvnNJglCNZ9 +Tvl193tL9HaePTC0VpLWj8AHfZ2pjn4CFM23poM/hlhefEh1ubpgsfTB4TzFFcQ2 +QWC5NYXyzN8uyhRVLlw2pmf9hMVRrRpt8k6pWZJU3KZYgaCPhiN3jks2m96mH1/5 +EzwmbRElq3USUjeAxV7Kr1KfGCgypCNPf5Sp0ci7KYA1nJ/gCb7UCF6to9I2KDBn
svn commit: r3861 [2/2] - in /dev/tomcat/tomcat-7/v7.0.48: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.asc == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.asc Mon Dec 9 21:16:58 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJSphj+AAoJECCLCrHWMBHH2HIP/2+XH6W2VJ7uGhjkgE3O29ID +p5RAryLLogWqLpTwY+NcUW3r5y4MQsg2Ztkoh8y1P9MlPrOpXf7LDyipkWcgmPOh +XPYNbmAZB94psfU88iTZA+v+p7EVFimstyMejy0h12ffEGSQe1BMAnGMLOsfH11n +HuxEmu/vltloZC7N9iN8HWdE5wlrwdJEeLr2eiA/UG6CLBCfOup8Qa6Zb7LaQYTH +hOygWHROm6C0fgmN6Zv2ccd5JYgfNYp570D6Gi2bejY6QwX5SYUolZpotBlUBDRM +GBYS8cnU2mVnwb6aZZb8+XPTUlAbIXa7U+pgh3WboRDnqL59Pey5HTCkAzCkpSwy +qEUCzdMVZ1U4nDUcBDiOdnYVR11WUBFCZaZumYmr+nUdZq5kMLDT1Uadaq1tTTlT +KEllcPXE7UchPUg2aAaba6jYYfXeQ53JzD3B3qlQ1jVlcCcf/Gn7f5BOL7ZmwQXr +xIBJMxCKvsrrw7uhb+x0AIlloMkmoaJLHfsDnVrrhDwahPeE1HDF0WQr9eaHxqoE +jqrnEl5jitdSjapyZ2FfMFLTBT0VL8/LQPueyfhedVEfjn0thEZygkcn3+sAs3ck +y0GEJREa9qtghj4UeRDEFrCLh7nmJXuBT/86LdlPROpUADubWxvPyUdHcG75zHlK +qyk2plB5eC5grLl98Mqf +=G0Kp +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli-adapters.jar.md5 Mon Dec 9 21:16:58 2013 @@ -0,0 +1 @@ +6cd992f67945691fb27b5757cc52f242 *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.asc Mon Dec 9 21:16:58 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJSphj9AAoJECCLCrHWMBHHFb4QAPrv3uGWKAwiO3sWSTtaXgYh +xhs/7DQ3Wb3GcBUk88oXsjuuLrwADvFeZ+gqYe+kRAuGTH72uO2GzjjnzXXbrE3n +MDVyez81tNImyFEzk+3mtnWixU6zdSA59Gd1WZ7Cs6sxIOgYUnQ9BWUQBpa5KXvQ +PS6hEPhaoItPe29LxSlT6XHhpGVr7l0K7j/s1TxKQzSvD7bsF29D1eYeweG1uFpN +/XNPA2UGwe0JuwmWbkbqCp6qu/UBzdnJpp4WiR8VUw/6ohTaHJg2RJvnSgnwCVrD +h/BxhRTloBudrad9qoxwU35ymjdUkSNXGgT7WdOS4Efblva9j2Iyv0q1nFHFYH1p +NE7y4oNTHkDlC08L7sEn++HHeQr1jEZWMg9wZStR3kVBiMB8Wbn5oXFVrI2H5GKQ +se1Ftn94bb3sIeimaVjnVr50xLcHtq4kQIZ6aV02BC9W8kG4kvcDg85496/QHcfW +Fb50S4iEhPzZ2aMpo9gREe0md6UVv8Bt+1fdU4QBQfj1byOYjzQH+q4/+iWrjU3x +EhIn8joYLCMM7YNBhKELRSaY6FbxzZjazrmIekdD5GBxxufYUyUfAIPqQ2koGcgU +/NKn085TbK1Hi5Og9bPAkE0sUZm+IXFqSmpTIw+5gqaaf8t5CxAKPloKeJBwtSaG +yb7EQRiArmg98Dwl4DYQ +=Z24k +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.48/bin/extras/tomcat-juli.jar.md5 Mon Dec 9 21:16:58 2013 @@ -0,0 +1 @@ +b2c0a0b543346dbf784160b46d0c860c *tomcat-juli.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz -- svn:mime-type = application/x-gzip Added: dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz.asc == --- dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-7/v7.0.48/src/apache-tomcat-7.0.48-src.tar.gz.asc Mon Dec 9 21:16:58 2013 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.21 (MingW32) + +iQIcBAABCgAGBQJSphvXAAoJECCLCrHWMBHH+iEP/0SFzfNJLQYX/0Cj1sHS4PdI +lmaZyAL+O7wg9Ztek7PQxvgustRegRR3EANGR8HdxHI07hxoD3GmJ9UxlPSux5mO +SJf3S2F4kXKBJUeXjf2614w56GRJG03mvO97cgl07TogxXoIJOkJe1Bx/TgJZoar +uJEBS//YGReQAm9igjoebV7jOzaSUl4j9kwKL27Gm1rVVdHjxj+GN+EAw3tptA/q +wCxRAE8jLP8ZhpKrLg3+uYXJ+ux7gmSQ+AzZpFmcNLfEmTXkHkRHlY6kAUz6EXN2 +ubtojTGU3dQw4rFqJVuYeGwTG8Tp1jFAXnbT5K28kDrAvcUErHSuYuvnNJglCNZ9 +Tvl193tL9HaePTC0VpLWj8AHfZ2pjn4CFM23poM/hlhefEh1ubpgsfTB4TzFFcQ2 +QWC5NYXyzN8uyhRVLlw2pmf9hMVRrRpt8k6pWZJU3KZYgaCPhiN3jks2m96mH1/5 +EzwmbRElq3USUjeAxV7Kr1KfGCgypCNPf5Sp0ci7KYA1nJ/gCb7UCF6to9I2KDBn
[VOTE] Release Apache Tomcat 7.0.48
The proposed Apache Tomcat 7.0.48 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.48/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-030/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_48/ The proposed 7.0.48 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.48 Stable Regards Violeta
RE: [VOTE] Release Apache Tomcat 8.0.0-RC6
Hi Mark, -Original Message- From: Mark Thomas [mailto:ma...@apache.org] Sent: Monday, December 9, 2013 9:19 PM To: Tomcat Developers List Subject: [VOTE] Release Apache Tomcat 8.0.0-RC6 The proposed Apache Tomcat 8.0.0 release candidate 6 is now available for voting. Given this is a release candidate I am working on the basis that it is equivalent to an alpha. The main changes since RC5 are: - Better handling of generic types in the WebSocket 1.0 implementation - Refactor resource handling for the class loader - Add Cobertura support to the unit tests - Remove anti-Jar locking feature and replace it with open stream tracking - Update to Commons Pool 2.0 release - Complete refactoring of TLD handling including caching of parsed TLDs - More consistent handling of XML validation options - Numerous bug fixes It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.0-RC6/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-029/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0_RC6/ The proposed 8.0.0-RC6 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 8.0.0-RC6 alpha With Tomcat 8.0.0-RC6, I seem to have problems serving large static files in one of my webapps. I've run it on a Windows Server 2012 R2 system with Java 1.7.0_45 (64-Bit) and the NIO HTTP connector. The webapp contains a large static file with a size of 4,582,875,812 bytes. When I try to download that file in the browser, I get the following exception: 09-Dec-2013 22:21:22.511 SEVERE [http-nio-8006-exec-2] org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for servlet [default] in context with path [] threw exception java.lang.ArrayIndexOutOfBoundsException: Unable to return [/temp/file.bin] as a byte array since the resource is [4,582,875,812] bytes in size which is larger than the maximum size of a byte array at org.apache.catalina.webresources.FileResource.getContent(FileResource.java:143) at org.apache.catalina.webresources.CachedResource.getContent(CachedResource.java:235) at org.apache.catalina.servlets.DefaultServlet.copy(DefaultServlet.java:1793) at org.apache.catalina.servlets.DefaultServlet.serveResource(DefaultServlet.java:919) at org.apache.catalina.servlets.DefaultServlet.doGet(DefaultServlet.java:400) at javax.servlet.http.HttpServlet.service(HttpServlet.java:621) at javax.servlet.http.HttpServlet.service(HttpServlet.java:728) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:303) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208) at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:241) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208) at org.tuckey.web.filters.urlrewrite.RuleChain.handleRewrite(RuleChain.java:176) at org.tuckey.web.filters.urlrewrite.RuleChain.doRules(RuleChain.java:145) at org.tuckey.web.filters.urlrewrite.UrlRewriter.processRequest(UrlRewriter.java:92) at org.tuckey.web.filters.urlrewrite.UrlRewriteFilter.doFilter(UrlRewriteFilter.java:394) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:241) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208) at common.XUaCompatibleHeaderFilter.doFilter(XUaCompatibleHeaderFilter.java:27) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:241) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:221) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:107) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:155) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:76) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:90) at org.apache.catalina.valves.CrawlerSessionManagerValve.invoke(CrawlerSessionManagerValve.java:180) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:522) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1015) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:646) at org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:223) at
svn commit: r1549688 - /tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Author: rjung
Date: Mon Dec 9 21:40:52 2013
New Revision: 1549688
URL: http://svn.apache.org/r1549688
Log:
Unused method initialize() was removed in r1542957.
Remove orphaned references from javadoc.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1549688r1=1549687r2=1549688view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Dec 9
21:40:52 2013
@@ -1813,9 +1813,6 @@ public class Digester extends DefaultHan
*
* p
* strongNote/strong This method may be called more than once.
- * Once only initialization code should be placed in {@link #initialize}
- * or the code should take responsibility by checking and setting the
- * {@link #configured} flag.
* /p
*/
protected void configure() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549690 - /tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
Author: rjung
Date: Mon Dec 9 21:43:35 2013
New Revision: 1549690
URL: http://svn.apache.org/r1549690
Log:
Fix Javadoc.
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1549690r1=1549689r2=1549690view=diff
==
--- tomcat/trunk/java/org/apache/catalina/WebResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceSet.java Mon Dec 9
21:43:35 2013
@@ -96,9 +96,9 @@ public interface WebResourceSet extends
* Are resources provided by this resource set only intended for use by
* calls to {@link WebResourceRoot#getClassLoaderResource(String)}.
*
- * @return @true if these resources should only be used for calls to
+ * @return true if these resources should only be used for calls to
* {@link WebResourceRoot#getClassLoaderResource(String)},
otherwise
- * @false
+ * false
*/
boolean getClassLoaderOnly();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55820] Add 172.16/12 range to default internal proxies
https://issues.apache.org/bugzilla/show_bug.cgi?id=55820 --- Comment #2 from Christopher Schultz ch...@christopherschultz.net --- How about a note in the users guide mentioning that it's been changed in 8.0.0 and users might want to be mindful of the differences? -- 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 8.0.0-RC6
Konstantin, On 12/9/13, 4:40 PM, Konstantin Preißer wrote: The webapp contains a large static file with a size of 4,582,875,812 bytes. I believe that static file is better-described as huge, enormous, [bleeping] gigantic. Anything bigger than 2^32 bytes deserves a proper adjective. :) -chris signature.asc Description: OpenPGP digital signature
svn commit: r1549700 - /tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Author: markt
Date: Mon Dec 9 22:52:03 2013
New Revision: 1549700
URL: http://svn.apache.org/r1549700
Log:
Methods need to be public for digester to be able to use them.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1549700r1=1549699r2=1549700view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Mon Dec 9 22:52:03 2013
@@ -57,7 +57,7 @@ public abstract class AbstractResourceSe
return internalPath;
}
-protected final void setInternalPath(String internalPath) {
+public final void setInternalPath(String internalPath) {
checkPath(internalPath);
// Optimise internal processing
if (internalPath.equals(/)) {
@@ -67,7 +67,7 @@ public abstract class AbstractResourceSe
}
}
-protected final void setWebAppMount(String webAppMount) {
+public final void setWebAppMount(String webAppMount) {
checkPath(webAppMount);
// Optimise internal processing
if (webAppMount.equals(/)) {
@@ -81,7 +81,7 @@ public abstract class AbstractResourceSe
return webAppMount;
}
-protected final void setBase(String base) {
+public final void setBase(String base) {
this.base = base;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549704 - in /tomcat/trunk/java/org/apache/catalina/webresources: Cache.java CachedResource.java
Author: markt
Date: Mon Dec 9 23:09:18 2013
New Revision: 1549704
URL: http://svn.apache.org/r1549704
Log:
If a file is too big to be cached, return the original resource not the
CacheResource instance else the resource content will still be cached.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1549704r1=1549703r2=1549704view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Mon Dec 9
23:09:18 2013
@@ -78,10 +78,12 @@ public class Cache {
// newCacheEntry was inserted into the cache - validate it
cacheEntry = newCacheEntry;
cacheEntry.validate(useClassLoaderResources);
-if (newCacheEntry.getContentLength() getMaxSizeBytes()) {
+if (cacheEntry.getContentLength() getMaxSizeBytes()) {
// Cache size has not been updated at this point
removeCacheEntry(path, false);
-return newCacheEntry;
+// Return the original resource not the one wrapped in the
+// cache otherwise content will be cached any way.
+return cacheEntry.getWebResource();
}
// Assume that the cache entry will include the content.
Modified: tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java?rev=1549704r1=1549703r2=1549704view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java Mon
Dec 9 23:09:18 2013
@@ -262,4 +262,8 @@ public class CachedResource implements W
public WebResourceRoot getWebResourceRoot() {
return webResource.getWebResourceRoot();
}
+
+WebResource getWebResource() {
+return webResource;
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549706 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/webresources/ test/org/apache/catalina/webresources/
Author: markt
Date: Mon Dec 9 23:34:25 2013
New Revision: 1549706
URL: http://svn.apache.org/r1549706
Log:
Use an int for the maximum object size to be cached in bytes since it is cached
using a byte array and that is limited to Integer.MAX_VALUE.
Test objects to be cached against the maximum object size, not the maximum
cache size.
Modified:
tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/test/org/apache/catalina/webresources/TesterWebResourceRoot.java
Modified: tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java?rev=1549706r1=1549705r2=1549706view=diff
==
--- tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java (original)
+++ tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java Mon Dec 9
23:34:25 2013
@@ -346,19 +346,21 @@ public interface WebResourceRoot extends
long getCacheMaxSize();
/**
- * Set the maximum permitted size for a single object in the cache.
+ * Set the maximum permitted size for a single object in the cache. Note
+ * that the maximum size in bytes may not exceed {@link Integer#MAX_VALUE}.
*
* @param cacheMaxObjectSizeMaximum size for a single cached object in
* kilobytes
*/
-void setCacheMaxObjectSize(long cacheMaxObjectSize);
+void setCacheMaxObjectSize(int cacheMaxObjectSize);
/**
- * Get the maximum permitted size for a single object in the cache.
+ * Get the maximum permitted size for a single object in the cache. Note
+ * that the maximum size in bytes may not exceed {@link Integer#MAX_VALUE}.
*
* @return Maximum size for a single cached object in kilobytes
*/
-long getCacheMaxObjectSize();
+int getCacheMaxObjectSize();
/**
* Controls whether the trace locked files feature is enabled. If enabled,
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1549706r1=1549705r2=1549706view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Mon Dec 9
23:34:25 2013
@@ -46,7 +46,8 @@ public class Cache {
private long ttl = 5000;
private long maxSize = 10 * 1024 * 1024;
-private long maxObjectSize = maxSize / 20;
+private int maxObjectSize =
+(int) (maxSize / 20 Integer.MAX_VALUE ? Integer.MAX_VALUE :
maxSize / 20);
private final ConcurrentMapString,CachedResource resourceCache =
new ConcurrentHashMap();
@@ -78,7 +79,7 @@ public class Cache {
// newCacheEntry was inserted into the cache - validate it
cacheEntry = newCacheEntry;
cacheEntry.validate(useClassLoaderResources);
-if (cacheEntry.getContentLength() getMaxSizeBytes()) {
+if (cacheEntry.getContentLength() getMaxObjectSizeBytes()) {
// Cache size has not been updated at this point
removeCacheEntry(path, false);
// Return the original resource not the one wrapped in the
@@ -199,27 +200,32 @@ public class Cache {
return maxSize / 1024;
}
-public long getMaxSizeBytes() {
-// Internally bytes, externally kilobytes
-return maxSize;
-}
-
public void setMaxSize(long maxSize) {
// Internally bytes, externally kilobytes
this.maxSize = maxSize * 1024;
}
-public void setMaxObjectSize(long maxObjectSize) {
+public void setMaxObjectSize(int maxObjectSize) {
+if (maxObjectSize * 1024L Integer.MAX_VALUE) {
+log.warn(sm.getString(cache.maxObjectSizeTooBig,
+Integer.valueOf(maxObjectSize)));
+this.maxObjectSize = Integer.MAX_VALUE;
+}
// Internally bytes, externally kilobytes
this.maxObjectSize = maxObjectSize * 1024;
}
-public long getMaxObjectSize() {
+public int getMaxObjectSize() {
// Internally bytes, externally kilobytes
return maxObjectSize / 1024;
}
+public long getMaxObjectSizeBytes() {
+// Internally bytes, externally kilobytes
+return maxObjectSize;
+}
+
public void clear() {
resourceCache.clear();
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
URL:
svn commit: r1549711 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Author: markt
Date: Mon Dec 9 23:43:15 2013
New Revision: 1549711
URL: http://svn.apache.org/r1549711
Log:
Simplify assuming that the resources implementation will generate an
InputStream from the cached byte array if one is available.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1549711r1=1549710r2=1549711view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Dec
9 23:43:15 2013
@@ -899,15 +899,15 @@ public class DefaultServlet
}
InputStream renderResult = null;
-if (resource.isDirectory()) {
-if (serveContent) {
+if (serveContent) {
+if (resource.isDirectory()) {
// Serve the directory browser
renderResult = render(getPathPrefix(request), resource);
+} else {
+renderResult = resource.getInputStream();
}
-}
-// Copy the input stream to our output stream (if requested)
-if (serveContent) {
+// Copy the input stream to our output stream
try {
response.setBufferSize(output);
} catch (IllegalStateException e) {
@@ -1785,23 +1785,7 @@ public class DefaultServlet
throws IOException {
IOException exception = null;
-InputStream resourceInputStream = null;
-
-// Optimization: If the binary content has already been loaded, send
-// it directly
-if (resource.isFile()) {
-byte buffer[] = resource.getContent();
-if (buffer != null) {
-ostream.write(buffer, 0, buffer.length);
-return;
-}
-resourceInputStream = resource.getInputStream();
-} else {
-resourceInputStream = is;
-}
-
-InputStream istream = new BufferedInputStream
-(resourceInputStream, input);
+InputStream istream = new BufferedInputStream(is, input);
// Copy the input stream to the output stream
exception = copyRange(istream, ostream);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1549717 - in /tomcat/trunk/java/org/apache/catalina/webresources: Cache.java CachedResource.java
Author: markt
Date: Tue Dec 10 00:16:45 2013
New Revision: 1549717
URL: http://svn.apache.org/r1549717
Log:
Change the caching approach slightly.
Previously, resources were only cached if they were smaller than
maxObjectSizeBytes. Now they are always cached (so the metadata is cached) but
the content is only cached if they are smaller than maxObjectSizeBytes.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1549717r1=1549716r2=1549717view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Tue Dec 10
00:16:45 2013
@@ -34,10 +34,6 @@ public class Cache {
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
-// Estimate (on high side to be safe) of average size excluding content
-// based on profiler data.
-private static final long CACHE_ENTRY_SIZE = 500;
-
private static final long TARGET_FREE_PERCENT_GET = 5;
private static final long TARGET_FREE_PERCENT_BACKGROUND = 10;
@@ -70,7 +66,11 @@ public class Cache {
}
if (cacheEntry == null) {
-CachedResource newCacheEntry = new CachedResource(root, path, ttl);
+// Local copy to ensure consistency
+int maxObjectSizeBytes = getMaxObjectSizeBytes();
+CachedResource newCacheEntry =
+new CachedResource(root, path, getTtl(),
maxObjectSizeBytes);
+
// Concurrent callers will end up with the same CachedResource
// instance
cacheEntry = resourceCache.putIfAbsent(path, newCacheEntry);
@@ -79,19 +79,11 @@ public class Cache {
// newCacheEntry was inserted into the cache - validate it
cacheEntry = newCacheEntry;
cacheEntry.validate(useClassLoaderResources);
-if (cacheEntry.getContentLength() getMaxObjectSizeBytes()) {
-// Cache size has not been updated at this point
-removeCacheEntry(path, false);
-// Return the original resource not the one wrapped in the
-// cache otherwise content will be cached any way.
-return cacheEntry.getWebResource();
-}
-// Assume that the cache entry will include the content.
-// This isn't always the case but it makes tracking the
-// current cache size easier.
-long delta = CACHE_ENTRY_SIZE;
-delta += cacheEntry.getContentLength();
+// Even if the resource content larger than maxObjectSizeBytes
+// there is still benefit in caching the resource metadata
+
+long delta = cacheEntry.getSize();
size.addAndGet(delta);
if (size.get() maxSize) {
@@ -181,9 +173,8 @@ public class Cache {
// once and the cache size is only updated (if required) once.
CachedResource cachedResource = resourceCache.remove(path);
if (cachedResource != null updateSize) {
-long delta =
-0 - CACHE_ENTRY_SIZE - cachedResource.getContentLength();
-size.addAndGet(delta);
+long delta = cachedResource.getSize();
+size.addAndGet(-delta);
}
}
@@ -221,8 +212,7 @@ public class Cache {
return maxObjectSize / 1024;
}
-public long getMaxObjectSizeBytes() {
-// Internally bytes, externally kilobytes
+public int getMaxObjectSizeBytes() {
return maxObjectSize;
}
Modified: tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java?rev=1549717r1=1549716r2=1549717view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java Tue
Dec 10 00:16:45 2013
@@ -32,9 +32,14 @@ import org.apache.catalina.WebResourceRo
*/
public class CachedResource implements WebResource {
+// Estimate (on high side to be safe) of average size excluding content
+// based on profiler data.
+private static final long CACHE_ENTRY_SIZE = 500;
+
private final StandardRoot root;
private final String webAppPath;
private final long ttl;
+private final int maxObjectSizeBytes;
private volatile WebResource webResource;
private
Re: [VOTE] Release Apache Tomcat 8.0.0-RC6
On 09/12/2013 21:40, Konstantin Preißer wrote: With Tomcat 8.0.0-RC6, I seem to have problems serving large static files in one of my webapps. I've run it on a Windows Server 2012 R2 system with Java 1.7.0_45 (64-Bit) and the NIO HTTP connector. The webapp contains a large static file with a size of 4,582,875,812 bytes. When I try to download that file in the browser, I get the following exception: 09-Dec-2013 22:21:22.511 SEVERE [http-nio-8006-exec-2] org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for servlet [default] in context with path [] threw exception java.lang.ArrayIndexOutOfBoundsException: Unable to return [/temp/file.bin] as a byte array since the resource is [4,582,875,812] bytes in size which is larger than the maximum size of a byte array snip/ However, I am unable to reproduce this exception when placing the file in Tomcat's default ROOT webapp. I suspect that the filters could have some effect. I think I did not get such errors with the same webapp and Tomcat 7.0.42. I have not yet tested other Tomcat versions. The XUaCompatibleHeaderFilter in the stacktrace just appends an X-UA-Compatible: IE=Edge header to the response, then invokes chain.doFilter(request, response). The Tuckey UrlRewriteFilter is configured to rewrite some URLs that start with a capital letter (but not the URL which requests the static file). Any idea what is going on there? Why would Tomcat create such a big byte array for a static file? Lots of things going on here. 1. The content of resources was still being cached on access even if it was bigger than the maximum object size. 2. The test of object size was checking against the total limit for the cache rather than the single object limit. 3. The DefaultServlet was working on assumptions that were true in the 7.0.x resources implementation but not true in the new 8.0.x implementation. All of the above - and few additional issues spotted along the way - have been fixed in trunk. Thanks for the report. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
