svn commit: r1667677 - in /tomcat/native/branches/1.1.x: native/srclib/VERSIONS xdocs/miscellaneous/changelog.xml
Author: markt Date: Thu Mar 19 08:17:40 2015 New Revision: 1667677 URL: http://svn.apache.org/r1667677 Log: Prep for update to OpenSSL 1.0.1m Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1667677&r1=1667676&r2=1667677&view=diff == --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Thu Mar 19 08:17:40 2015 @@ -1,4 +1,4 @@ Use the following version of the libraries - APR 1.5.1, http://apr.apache.org -- OpenSSL 1.0.1l, http://www.openssl.org +- OpenSSL 1.0.1m, http://www.openssl.org Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1667677&r1=1667676&r2=1667677&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Mar 19 08:17:40 2015 @@ -58,7 +58,7 @@ Enable building with OpenSSL 1.0.2 onwards. (billbarker) - Use OpenSSL 1.0.1l with Windows binaries. (markt) + Use OpenSSL 1.0.1m with Windows binaries. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot slave changes
All, I have just moved trunk, tomcat-8 and tomcat-6 (tomcat-7 was there already) buildbot builds to a new slave. There main aim is to get faster builds. A combination of a physical machine rather than an overstretched VM and not being on the same slave as the resource intensive sling builds should result is a significant speed up. I imagine I broke a bunch of stuff with the move. Apologies in advance and I'll get it fixed as quickly as I can. At the same time I fixed the issues that meant the tomcat-7 builds weren't building the Windows installer and weren't running RAT. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667688 - /tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Author: markt
Date: Thu Mar 19 10:13:55 2015
New Revision: 1667688
URL: http://svn.apache.org/r1667688
Log:
Trivial Javadoc fix
(mainly to test CI system)
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=1667688&r1=1667687&r2=1667688&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Thu Mar 19 10:13:55 2015
@@ -257,12 +257,12 @@ public class CompressionFilter implement
}
/**
- * Return filter config
* Required by Weblogic 6.1
+ *
+ * @return the FilterConfig that was used to initialise this filter.
*/
public FilterConfig getFilterConfig() {
return config;
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667697 - in /tomcat/trunk/java/org/apache: catalina/connector/CoyoteAdapter.java coyote/http11/Http11InputBuffer.java tomcat/util/net/AbstractEndpoint.java tomcat/util/net/SocketWrapperB
Author: markt
Date: Thu Mar 19 10:50:14 2015
New Revision: 1667697
URL: http://svn.apache.org/r1667697
Log:
Fix Javadoc errors reported by Buildbot
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1667697&r1=1667696&r2=1667697&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Mar
19 10:50:14 2015
@@ -1145,7 +1145,7 @@ public class CoyoteAdapter implements Ad
*
* @param uriMB URI to be normalized
*
- * @return false if normalizing this URI would require going
+ * @return false if normalizing this URI would require going
* above the root, or if the URI contains a null byte, otherwise
* true
*/
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1667697&r1=1667696&r2=1667697&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Thu Mar
19 10:50:14 2015
@@ -33,8 +33,6 @@ import org.apache.tomcat.util.res.String
/**
* InputBuffer for HTTP that provides request header parsing as well as
transfer
* encoding.
- *
- * The type of socket used by the underlying I/O implementation
*/
public class Http11InputBuffer implements InputBuffer {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1667697&r1=1667696&r2=1667697&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Mar
19 10:50:14 2015
@@ -499,9 +499,7 @@ public abstract class AbstractEndpoint attributes = new HashMap<>();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1667697&r1=1667696&r2=1667697&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Thu Mar
19 10:50:14 2015
@@ -368,7 +368,7 @@ public abstract class SocketWrapperBase<
* Writes the provided data to the socket, buffering any remaining data if
* used in non-blocking mode.
*
- * @param block true if a blocking write should be used,
+ * @param block true if a blocking write should be used,
* otherwise a non-blocking write will be used
* @param buf The byte array containing the data to be written
* @param off The offset within the byte array of the data to be written
@@ -469,7 +469,7 @@ public abstract class SocketWrapperBase<
/**
* Writes as much data as possible from any that remains in the buffers.
*
- * @param block true if a blocking write should be used,
+ * @param block true if a blocking write should be used,
* otherwise a non-blocking write will be used
*
* @return true if data remains to be flushed after this
method
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Can't set context to "/" in Tomcat 8.0.20
Hi, I'm in the process of migrating to a embedded tomcat 7.0.59 application to tomcat 8.0.20. In the application i'm setting the context as "*/*" This works fine in tomcat 7 But in Tomcat 8 when I set the context as "*/*", internally it is set as "". Is this a bug in Tomcat 8? Thanks Best Regards /Thusitha -- Thusitha Dayaratne Software Engineer WSO2 Inc. - lean . enterprise . middleware | wso2.com Mobile +94712756809 Blog alokayasoya.blogspot.com Abouthttp://about.me/thusithathilina
Re: Can't set context to "/" in Tomcat 8.0.20
On 19/03/2015 10:55, Thusitha Thilina Dayaratne wrote: > Hi, > > I'm in the process of migrating to a embedded tomcat 7.0.59 application to > tomcat 8.0.20. In the application i'm setting the context as "*/*" This > works fine in tomcat 7 > > But in Tomcat 8 when I set the context as "*/*", internally it is set as "". > > Is this a bug in Tomcat 8? No. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Can't set context to "/" in Tomcat 8.0.20
Hi Thanks for quick response. > Hi, > > I'm in the process of migrating to a embedded tomcat 7.0.59 application to > tomcat 8.0.20. In the application i'm setting the context as "*/*" This > works fine in tomcat 7 > > But in Tomcat 8 when I set the context as "*/*", internally it is set as "". > > Is this a bug in Tomcat 8? >>No. Why it it is not allowing to set Context as "/" in tomcat 8? Thanks Regards /Thusitha On Thu, Mar 19, 2015 at 4:26 PM, Mark Thomas wrote: > On 19/03/2015 10:55, Thusitha Thilina Dayaratne wrote: > > Hi, > > > > I'm in the process of migrating to a embedded tomcat 7.0.59 application > to > > tomcat 8.0.20. In the application i'm setting the context as "*/*" This > > works fine in tomcat 7 > > > > But in Tomcat 8 when I set the context as "*/*", internally it is set as > "". > > > > Is this a bug in Tomcat 8? > > No. > > Mark > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Thusitha Dayaratne Software Engineer WSO2 Inc. - lean . enterprise . middleware | wso2.com Mobile +94712756809 Blog alokayasoya.blogspot.com Abouthttp://about.me/thusithathilina
Re: Can't set context to "/" in Tomcat 8.0.20
Hi All,
Prior to Tomcat 7.0.58, we are able to set the context as "/". In the code
it will go to else part and set the context without any issues.
public void setPath(String path) {
if (path == null || (!path.equals("") && !path.startsWith("/"))) {
this.path = "/" + path;
log.warn(sm.getString(
"standardContext.pathInvalid", path, this.path));
} else {
this.path = path;
}
encodedPath = urlEncoder.encode(this.path);
if (getName() == null) {
setName(this.path);
}
}
But from 7.0.58, when we trying to set context as "/", it will matches
the first of condition as make the path an empty string("").
public void setPath(String path) {
boolean invalid = false;
if (path == null || path.equals("/")) {
invalid = true;
this.path = "";
} else if ("".equals(path) || path.startsWith("/")) {
this.path = path;
} else {
invalid = true;
this.path = "/" + path;
}
if (this.path.endsWith("/")) {
invalid = true;
this.path = this.path.substring(0, this.path.length() - 1);
}
if (invalid) {
log.warn(sm.getString(
"standardContext.pathInvalid", path, this.path));
}
encodedPath = urlEncoder.encode(this.path);
if (getName() == null) {
setName(this.path);
}
}
Is there a any specific reason for this change?
Why it is not allowing to set the context path as "/"
Thanks
Best Regards
/Thusitha
On Thu, Mar 19, 2015 at 4:35 PM, Thusitha Thilina Dayaratne <
thusit...@wso2.com> wrote:
> Hi
>
> Thanks for quick response.
> > Hi,
> >
> > I'm in the process of migrating to a embedded tomcat 7.0.59 application
> to
> > tomcat 8.0.20. In the application i'm setting the context as "*/*" This
> > works fine in tomcat 7
> >
> > But in Tomcat 8 when I set the context as "*/*", internally it is set as
> "".
> >
> > Is this a bug in Tomcat 8?
>
> >>No.
> Why it it is not allowing to set Context as "/" in tomcat 8?
>
> Thanks
> Regards
> /Thusitha
>
>
> On Thu, Mar 19, 2015 at 4:26 PM, Mark Thomas wrote:
>
>> On 19/03/2015 10:55, Thusitha Thilina Dayaratne wrote:
>> > Hi,
>> >
>> > I'm in the process of migrating to a embedded tomcat 7.0.59 application
>> to
>> > tomcat 8.0.20. In the application i'm setting the context as "*/*" This
>> > works fine in tomcat 7
>> >
>> > But in Tomcat 8 when I set the context as "*/*", internally it is set
>> as "".
>> >
>> > Is this a bug in Tomcat 8?
>>
>> No.
>>
>> Mark
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>
>
> --
> Thusitha Dayaratne
> Software Engineer
> WSO2 Inc. - lean . enterprise . middleware | wso2.com
>
> Mobile +94712756809
> Blog alokayasoya.blogspot.com
> Abouthttp://about.me/thusithathilina
>
>
--
Thusitha Dayaratne
Software Engineer
WSO2 Inc. - lean . enterprise . middleware | wso2.com
Mobile +94712756809
Blog alokayasoya.blogspot.com
Abouthttp://about.me/thusithathilina
Re: Can't set context to "/" in Tomcat 8.0.20
Do NOT cross-post questions to the users list and the dev list. All this does is annoy the very people you are relying on to take time out of whatever else they are doing to help you. If you aren't sure where to ask, user the users list. On 19/03/2015 11:50, Thusitha Thilina Dayaratne wrote: > Hi All, > > Prior to Tomcat 7.0.58, we are able to set the context as "/". There are lots of things you can set configuration values to and Tomcat will still start. That doesn't mean that they are sensible settings or even valid ones. While Tomcat will usually catch obviously broken settings, users are expected to RTFM before they start changing things. "/" has never been a valid value for the context path as has been made clear in the Servlet specification and the Tomcat docs for as long as I can remember (10+ years). > Is there a any specific reason for this change? > Why it is not allowing to set the context path as "/" There is no change. That has never been valid. That it worked in some subset of previous Tomcat versions is nothing more than luck. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667744 - /tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Author: markt
Date: Thu Mar 19 13:36:40 2015
New Revision: 1667744
URL: http://svn.apache.org/r1667744
Log:
More Javadoc fixes
(mainly to test CI system)
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java?rev=1667744&r1=1667743&r2=1667744&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
Thu Mar 19 13:36:40 2015
@@ -110,7 +110,10 @@ public class CompressionResponseStream e
// - Public Methods
/**
- * Set debug level
+ * Set debug level.
+ *
+ * @param debug The higher the number, the more detail shown. Currently the
+ * range 0 (none) to 3 (everything) is used.
*/
public void setDebugLevel(int debug) {
this.debug = debug;
@@ -139,7 +142,9 @@ public class CompressionResponseStream e
}
/**
- * Set supported mime types
+ * Set supported mime types.
+ *
+ * @param compressionMimeTypes The mimetypes that will be compressed.
*/
public void setCompressionMimeTypes(String[] compressionMimeTypes) {
this.compressionMimeTypes = compressionMimeTypes;
@@ -401,16 +406,16 @@ public class CompressionResponseStream e
// Package Methods
-
/**
* Has this response stream been closed?
+ *
+ * @return true if the stream has been closed, otherwise
false.
*/
public boolean closed() {
-
-return (this.closed);
-
+return closed;
}
+
/**
* Checks if any entry in the string array starts with the specified value
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667747 - in /tomcat/tc8.0.x/trunk: ./ webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Author: markt Date: Thu Mar 19 13:39:49 2015 New Revision: 1667747 URL: http://svn.apache.org/r1667747 Log: Trivial Javadoc fix (mainly to test CI system) Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 13:39:49 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304
svn commit: r1667748 - /tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Author: markt
Date: Thu Mar 19 13:42:29 2015
New Revision: 1667748
URL: http://svn.apache.org/r1667748
Log:
CTR: Trivial Javadoc fix
(mainly to test CI system)
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Modified:
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=1667748&r1=1667747&r2=1667748&view=diff
==
---
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Thu Mar 19 13:42:29 2015
@@ -206,8 +206,9 @@ public class CompressionFilter implement
}
/**
- * Return filter config
* Required by Weblogic 6.1
+ *
+ * @return the FilterConfig that was used to initialise this filter.
*/
public FilterConfig getFilterConfig() {
return config;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667749 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Author: markt Date: Thu Mar 19 13:43:34 2015 New Revision: 1667749 URL: http://svn.apache.org/r1667749 Log: Trivial Javadoc fix (mainly to test CI system) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 13:43:34 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637 -/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-1222329,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,1346365,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,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,136444
Re: Buildbot slave changes
On 19/03/2015 10:11, Mark Thomas wrote: > All, > > I have just moved trunk, tomcat-8 and tomcat-6 (tomcat-7 was there > already) buildbot builds to a new slave. There main aim is to get faster > builds. A combination of a physical machine rather than an overstretched > VM and not being on the same slave as the resource intensive sling > builds should result is a significant speed up. > > I imagine I broke a bunch of stuff with the move. Apologies in advance > and I'll get it fixed as quickly as I can. > > At the same time I fixed the issues that meant the tomcat-7 builds > weren't building the Windows installer and weren't running RAT. Current status: tomcat-trunk: probably ok A couple of test failures (UTF-8) caused by building with on old JDK version. I've updated to the latest Java 8 JDK and am re-running the build. tomcat-8-trunk: testing I've just triggered a build so we'll see what happens. tomcat-7-trunk: testing I've just triggered a build so we'll see what happens. tomcat-6-trunk: testing I've just triggered a build so we'll see what happens. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Buildbot slave changes
2015-03-19 14:43 GMT+01:00 Mark Thomas : > tomcat-trunk: probably ok > A couple of test failures (UTF-8) caused by building with on old JDK > version. I've updated to the latest Java 8 JDK and am re-running the build. > > Twice as fast ? Not bad ! Rémy
Re: Tomcat native 1.1.33 release
Am 16.03.2015 um 21:26 schrieb Mark Thomas: On 16/03/2015 20:17, Rainer Jung wrote: Am 13.03.2015 um 12:17 schrieb Mark Thomas: On 12/03/2015 19:09, Christopher Schultz wrote: Konstantin, On 3/12/15 2:22 PM, Konstantin Kolinko wrote: 2015-03-12 18:59 GMT+03:00 Rainer Jung : Am 12.03.2015 um 14:04 schrieb Mark Thomas: Given bug 57653 [1], the next 8.0.x release (which is already over due from when I wanted to get it out) is going to need a new Tomcat native release. This would also be an opportunity to update the OpenSSl dependency in the Windows binaries. One question is whether Tomcat native should switch to the 1.0.2 branch or stick with 1.0.1. Thoughts? A related question: when moving forward it would be easier if we could require 0.9.8 as the minimum supported version so we could try to (partially) stay in sync with mod_ssl. I'd say 0.9.8 (min) is fine, people able to build tcnative themselves should be in a position to use a still maintained version of OpenSSL and not rely on 0.9.7 (our current minimum version). Note that their January security announcement [1] mentions that OpenSSL 0.9.8 and 1.0.0 are both approaching an EOL: [1] https://www.openssl.org/news/secadv_20150108.txt [quote] As per our previous announcements and our Release Strategy (https://www.openssl.org/about/releasestrat.html), support for OpenSSL versions 1.0.0 and 0.9.8 will cease on 31st December 2015. No security updates for these releases will be provided after that date. Users of these releases are advised to upgrade. [/quote] Perhaps we should add a warning to tcnative if it detects an OpenSSL less than 1.0.1. Just a warning, at least for now. When 0.9.8 and 1.0.0 both go EOL, we can bump-up the required version in tcnative to 1.0.1 (at least). 1.0.2 would be better if it provides some additional ciphers, for better security options. I agree that we would better wait a bit for 1.0.2a, b, or c. We should definitely /support/ 1.0.2 (which I believe we do), but OpenSSL is the kind of library that we probably want to let others beta test first :) So... Stick with building with 1.0.1 for now. No takers for doing the release - I'll start this today. Just for information: the OpenSSL project has published an announcement this evening: == 8>< Forthcoming OpenSSL releases The OpenSSL project team would like to announce the forthcoming release of OpenSSL versions 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf. These releases will be made available on 19th March. They will fix a number of security defects. The highest severity defect fixed by these releases is classified as "high" severity. == 8>< So that means 1.0.1l will be outdated in 4 days. We don't know yet, whether the security issues apply to tcnative, so I don't have a strong suggestion whether to better proceed and get this tcnative release done or wait another 3 days for 1.0.1m. But I wanted to let you know, that a new OpenSSL release is expected. I think we have to wait. I'll finish my various local checks but not go as far as uploading the RC for voting. I'll drop the 1.1.33 tag at some point as well. The OpenSSL release is public now - though their web server is very busy right now. Most of the security issues (but not all) are in 1.0.2. So I think it is fine we stay on 1.0.1 a little while. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667764 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Author: markt
Date: Thu Mar 19 14:17:32 2015
New Revision: 1667764
URL: http://svn.apache.org/r1667764
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57723
Clean-up.
Use clearer parameter names that are consistent with the docs.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1667764&r1=1667763&r2=1667764&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Mar 19
14:17:32 2015
@@ -202,10 +202,8 @@ public class Tomcat {
*
* @throws ServletException
*/
-public Context addWebapp(String contextPath, String baseDir)
-throws ServletException {
-
-return addWebapp(getHost(), contextPath, baseDir);
+public Context addWebapp(String contextPath, String docBase) throws
ServletException {
+return addWebapp(getHost(), contextPath, docBase);
}
@@ -241,12 +239,11 @@ public class Tomcat {
* TODO: add the rest
*
* @param contextPath "" for root context.
- * @param baseDir base dir for the context, for static files. Must exist,
+ * @param docBase base dir for the context, for static files. Must exist,
* relative to the server home
*/
-public Context addContext(String contextPath,
- String baseDir) {
-return addContext(getHost(), contextPath, baseDir);
+public Context addContext(String contextPath, String docBase) {
+return addContext(getHost(), contextPath, docBase);
}
/**
@@ -522,22 +519,26 @@ public class Tomcat {
/**
* @see #addWebapp(String, String)
*/
-public Context addWebapp(Host host, String url, String path) {
-return addWebapp(host, url, url, path);
+public Context addWebapp(Host host, String contextPath, String docBase) {
+return addWebapp(host, contextPath, contextPath, docBase);
}
/**
* @see #addWebapp(String, String)
+ *
+ * @param name Ignored. The path will be used
+ *
+ * @deprecated Use {@link #addWebapp(Host, String, String)}
*/
-public Context addWebapp(Host host, String url, String name, String path) {
-silence(host, url);
+@Deprecated
+public Context addWebapp(Host host, String contextPath, String name,
String docBase) {
+silence(host, contextPath);
-Context ctx = createContext(host, url);
-ctx.setName(name);
-ctx.setPath(url);
-ctx.setDocBase(path);
+Context ctx = createContext(host, contextPath);
+ctx.setPath(contextPath);
+ctx.setDocBase(docBase);
ctx.addLifecycleListener(new DefaultWebXmlListener());
-ctx.setConfigFile(getWebappConfigFile(path, url));
+ctx.setConfigFile(getWebappConfigFile(docBase, contextPath));
ContextConfig ctxCfg = new ContextConfig();
ctx.addLifecycleListener(ctxCfg);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667765 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Author: markt
Date: Thu Mar 19 14:17:58 2015
New Revision: 1667765
URL: http://svn.apache.org/r1667765
Log:
Remove deprecated method
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1667765&r1=1667764&r2=1667765&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Mar 19
14:17:58 2015
@@ -520,18 +520,6 @@ public class Tomcat {
* @see #addWebapp(String, String)
*/
public Context addWebapp(Host host, String contextPath, String docBase) {
-return addWebapp(host, contextPath, contextPath, docBase);
-}
-
-/**
- * @see #addWebapp(String, String)
- *
- * @param name Ignored. The path will be used
- *
- * @deprecated Use {@link #addWebapp(Host, String, String)}
- */
-@Deprecated
-public Context addWebapp(Host host, String contextPath, String name,
String docBase) {
silence(host, contextPath);
Context ctx = createContext(host, contextPath);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667766 - /tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
Author: markt
Date: Thu Mar 19 14:19:31 2015
New Revision: 1667766
URL: http://svn.apache.org/r1667766
Log:
Don't use deprecated (and now removed) method
Modified:
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
Modified:
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java?rev=1667766&r1=1667765&r2=1667766&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
Thu Mar 19 14:19:31 2015
@@ -46,7 +46,7 @@ public class TestReplicatedContext exten
}
File root = new File("test/webapp");
-Context context = tomcat.addWebapp(host, "", "",
root.getAbsolutePath());
+Context context = tomcat.addWebapp(host, "", root.getAbsolutePath());
Tomcat.addServlet(context, "test", new AccessContextServlet());
context.addServletMapping("/access", "test");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667767 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java
Author: markt Date: Thu Mar 19 14:21:03 2015 New Revision: 1667767 URL: http://svn.apache.org/r1667767 Log: Clean-up. Use clearer parameter names that are consistent with the docs. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 14:21:03 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648
[Bug 57723] An incomplete fix for invalid context paths in StandardContext.java / JNDI fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=57723 Mark Thomas changed: What|Removed |Added OS||All Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Fixed in 7.0.x for 7.0.60 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667770 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml
Author: markt Date: Thu Mar 19 14:29:13 2015 New Revision: 1667770 URL: http://svn.apache.org/r1667770 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57723 Ensure that the Context name and path remain consistent when adding a web application to an embedded Tomcat instance via Tomcat.addWebapp(Host,String,String,String) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 14:29:13 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637,1667747 -/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-1222329,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,1346365,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,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,
svn commit: r1667779 - in /tomcat/native/tags/TOMCAT_NATIVE_1_1_33: ./ native/include/tcn_version.h
Author: markt
Date: Thu Mar 19 14:43:26 2015
New Revision: 1667779
URL: http://svn.apache.org/r1667779
Log:
Tag 1.1.33
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_1_33/ (props changed)
- copied from r1667778, tomcat/native/branches/1.1.x/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h
Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar 19 14:43:26 2015
@@ -0,0 +1 @@
+dist
Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 19 14:43:26 2015
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h?rev=1667779&r1=1667778&r2=1667779&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_1_33/native/include/tcn_version.h Thu
Mar 19 14:43:26 2015
@@ -75,7 +75,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667796 - /tomcat/tc7.0.x/trunk/java/javax/el/ValueExpression.java
Author: markt
Date: Thu Mar 19 15:50:32 2015
New Revision: 1667796
URL: http://svn.apache.org/r1667796
Log:
Trivial change to trigger CI build to test CI system
Modified:
tomcat/tc7.0.x/trunk/java/javax/el/ValueExpression.java
Modified: tomcat/tc7.0.x/trunk/java/javax/el/ValueExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/el/ValueExpression.java?rev=1667796&r1=1667795&r2=1667796&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/el/ValueExpression.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/el/ValueExpression.java Thu Mar 19 15:50:32
2015
@@ -102,7 +102,7 @@ public abstract class ValueExpression ex
* @since EL 2.2
*/
public ValueReference getValueReference(@SuppressWarnings("unused")
ELContext context) {
- // Expected to be over-ridden by implementation
+// Expected to be over-ridden by implementation
return null;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "BuildTcNativeWin" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "BuildTcNativeWin" page has been changed by markt:
https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=30&rev2=31
Comment:
Update openssl version to 1.0.1m
cd ..\openssl
}}}
- Unpack the OpenSSL 1.0.1l source distribution in this directory
({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
+ Unpack the OpenSSL 1.0.1m source distribution in this directory
({{{C:\tomcat-native-1.1.x\native\srclib\openssl}}}).
Apply openssl-msvcrt.patch
{{{
@@ -102, +102 @@
mkdir \deps-x86\apr-1.5.1\include
mkdir \deps-x86\apr-1.5.1\lib
- mkdir \deps-x86\openssl-1.0.1l\include
+ mkdir \deps-x86\openssl-1.0.1m\include
- mkdir \deps-x86\openssl-1.0.1l\lib
+ mkdir \deps-x86\openssl-1.0.1m\lib
xcopy /E \deps-x86 \deps-x64\
xcopy /E \deps-x86 \deps-i64\
@@ -115, +115 @@
copy apr\WINXP_X64_LIB_RELEASE\apr-1.lib \deps-x64\apr-1.5.1\lib
copy apr\WINXP_I64_LIB_RELEASE\apr-1.lib \deps-i64\apr-1.5.1\lib
- xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1l\include\
+ xcopy /E openssl\inc32 \deps-x86\openssl-1.0.1m\include\
- xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1l\include\
+ xcopy /E openssl\inc32 \deps-x64\openssl-1.0.1m\include\
- xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1l\include\
+ xcopy /E openssl\inc32 \deps-i64\openssl-1.0.1m\include\
- copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1l\lib\
+ copy openssl\out32-x86\*.lib \deps-x86\openssl-1.0.1m\lib\
- copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1l\lib\
+ copy openssl\out32-x64\*.lib \deps-x64\openssl-1.0.1m\lib\
- copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1l\lib\
+ copy openssl\out32-i64\*.lib \deps-i64\openssl-1.0.1m\lib\
cd ..
SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_71
c:\cmsc\setenv.bat /x86
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1m APR_DECLARE_STATIC=1 ENABLE_OCSP=1
move WINXP_X86_DLL_RELEASE WINXP_X86_OCSP_DLL_RELEASE
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1l APR_DECLARE_STATIC=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.5.1
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1m APR_DECLARE_STATIC=1
c:\cmsc\setenv.bat /x64
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1m APR_DECLARE_STATIC=1 ENABLE_OCSP=1
move WINXP_X64_DLL_RELEASE WINXP_X64_OCSP_DLL_RELEASE
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1l APR_DECLARE_STATIC=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.5.1
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1m APR_DECLARE_STATIC=1
c:\cmsc\setenv.bat /i64
- nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1 ENABLE_OCSP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1m APR_DECLARE_STATIC=1 ENABLE_OCSP=1
move WINXP_I64_DLL_RELEASE WINXP_I64_OCSP_DLL_RELEASE
- nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1l APR_DECLARE_STATIC=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.5.1
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1m APR_DECLARE_STATIC=1
}}}
Tomcat Native Connector DLLs may then be found in
C:\tomcat-native-1.1.x\native\WINXP_*_[OCSP_]DLL_RELEASE
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8338 - in /dev/tomcat/tomcat-connectors/native/1.1.33: ./ binaries/ source/
Author: markt
Date: Thu Mar 19 16:50:00 2015
New Revision: 8338
Log:
Upload tomcat native 1.1.33 for voting
Added:
dev/tomcat/tomcat-connectors/native/1.1.33/
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip
(with props)
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.asc
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.md5
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.sha1
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip
(with props)
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.asc
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.md5
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip.sha1
dev/tomcat/tomcat-connectors/native/1.1.33/source/
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz
(with props)
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.asc
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.md5
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz.sha1
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip
(with props)
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.asc
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.md5
dev/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-win32-src.zip.sha1
Added:
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip
==
Binary file - no diff available.
Propchange:
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream
Added:
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.asc
==
---
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.asc
(added)
+++
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.asc
Thu Mar 19 16:50:00 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.9 (MingW32)
+
+iQIcBAABAgAGBQJVCvNDAAoJEBDAHFovYFnnUwoQAJipknfgXrB56i2aNHMo7Xao
+EVPT4Rw0lG6gXbmDbOsEDYPf+uXgAGUuxqu8ePS6lvlEJxCSXdgV+68CovAy4psZ
+ctD46tU6TCV2t2jZBE0Vmfv7BhlXrgxPVUDTcMegdGtomC6sRNrsSCPdtdLfybW0
+5/NEhqwi4xIHU5upz51XvX+HbJ0kovpBg1ewq4ClzD4yKSbACA/H60SuJv440KH0
+iTrm1oVx0zaOW938gyH7X94nxLE9ouQ0Mi0cGW9smW/jJE2xajCafWQ7ntrC+wij
+oD6Ir/ooIT+wK/2R8jCRcKc85aegc/QaVd9HbjgJYKwTmPSkqTxmis3hHfIbFC2i
+o6R9JAshnlRJj76hdTy/+xAUmuk7p2rICAD51QR34TT6hRAAhulT+hdXRcnE5uC/
+/1tvQpI3kW2XLhnrMAzPwf1eN4M95zE/ZytlmK0vfv5RB/xZurbTkRfJu0JejF3w
+XYfHSbSCurhCDsd1SxeHxU0qyyZpoSpf/TWqsxKTs0yfsegUYAkBanim1tzUcF0E
+aHRa8hoHfeZRXZjbWsw+vM+EssCYZD5EZ08gC3Dq3Va4zOfnjciAgDMqEtyr+m6f
+MsnfvlcWHEF2Vm5BjoseWcvX1RK+Iy5eNB/ozGM6QJZegtBOi/WtAfF3cu5VQw6I
+BTlsDpXJQcBAXBGCE49g
+=BpW4
+-END PGP SIGNATURE-
Added:
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.md5
==
---
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.md5
(added)
+++
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.md5
Thu Mar 19 16:50:00 2015
@@ -0,0 +1 @@
+744568cead73f06b7ccaa9976be689f7${md5sum.binary-prefix}tomcat-native-1.1.33-ocsp-win32-bin.zip
\ No newline at end of file
Added:
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.sha1
==
---
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.sha1
(added)
+++
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-ocsp-win32-bin.zip.sha1
Thu Mar 19 16:50:00 2015
@@ -0,0 +1 @@
+f4a13b9fbf0d5205d5cb72449ca9cecd07269a21${md5sum.binary-prefix}tomcat-native-1.1.33-ocsp-win32-bin.zip
\ No newline at end of file
Added:
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-native-1.1.33-win32-bin.zip
==
Binary file - no diff available.
Propchange:
dev/tomcat/tomcat-connectors/native/1.1.33/binaries/tomcat-n
[VOTE] Release Apache Tomcat Native 1.1.33
Version 1.1.33 includes the following changes: - Windows binaries built with APR 1.5.1 and OpenSSL 1.0.1m - Fix BZ57653: Crash when multiple events for same socket are returned via separate apr_pollfd_t structures. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.1.33 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.1.33/ [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_33 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat native 1.1.33 release
Rainer, On 3/19/15 10:16 AM, Rainer Jung wrote: > Am 16.03.2015 um 21:26 schrieb Mark Thomas: >> On 16/03/2015 20:17, Rainer Jung wrote: >>> Am 13.03.2015 um 12:17 schrieb Mark Thomas: On 12/03/2015 19:09, Christopher Schultz wrote: > Konstantin, > > On 3/12/15 2:22 PM, Konstantin Kolinko wrote: >> 2015-03-12 18:59 GMT+03:00 Rainer Jung : >>> Am 12.03.2015 um 14:04 schrieb Mark Thomas: Given bug 57653 [1], the next 8.0.x release (which is already over due from when I wanted to get it out) is going to need a new Tomcat native release. This would also be an opportunity to update the OpenSSl dependency in the Windows binaries. One question is whether Tomcat native should switch to the 1.0.2 branch or stick with 1.0.1. Thoughts? >>> >>> >>> A related question: when moving forward it would be easier if we >>> could >>> require 0.9.8 as the minimum supported version so we could try to >>> (partially) stay in sync with mod_ssl. I'd say 0.9.8 (min) is fine, >>> people >>> able to build tcnative themselves should be in a position to use a >>> still >>> maintained version of OpenSSL and not rely on 0.9.7 (our current >>> minimum >>> version). >>> >> >> >> Note that their January security announcement [1] mentions that >> OpenSSL 0.9.8 and 1.0.0 are both approaching an EOL: >> >> [1] https://www.openssl.org/news/secadv_20150108.txt >> >> [quote] >> As per our previous announcements and our Release Strategy >> (https://www.openssl.org/about/releasestrat.html), support for >> OpenSSL versions >> 1.0.0 and 0.9.8 will cease on 31st December 2015. No security >> updates for these >> releases will be provided after that date. Users of these releases >> are advised >> to upgrade. >> [/quote] > > Perhaps we should add a warning to tcnative if it detects an OpenSSL > less than 1.0.1. Just a warning, at least for now. When 0.9.8 and > 1.0.0 > both go EOL, we can bump-up the required version in tcnative to 1.0.1 > (at least). > >> 1.0.2 would be better if it provides some additional ciphers, for >> better security options. I agree that we would better wait a bit for >> 1.0.2a, b, or c. > > We should definitely /support/ 1.0.2 (which I believe we do), but > OpenSSL is the kind of library that we probably want to let others > beta > test first :) So... Stick with building with 1.0.1 for now. No takers for doing the release - I'll start this today. >>> >>> Just for information: the OpenSSL project has published an announcement >>> this evening: >>> >>> == 8>< >>> >>> Forthcoming OpenSSL releases >>> >>> >>> The OpenSSL project team would like to announce the forthcoming release >>> of OpenSSL versions 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf. >>> >>> These releases will be made available on 19th March. They will fix a >>> number of security defects. The highest severity defect fixed by these >>> releases is classified as "high" severity. >>> >>> == 8>< >>> >>> So that means 1.0.1l will be outdated in 4 days. We don't know yet, >>> whether the security issues apply to tcnative, so I don't have a strong >>> suggestion whether to better proceed and get this tcnative release done >>> or wait another 3 days for 1.0.1m. But I wanted to let you know, that a >>> new OpenSSL release is expected. >> >> I think we have to wait. >> >> I'll finish my various local checks but not go as far as uploading the >> RC for voting. >> >> I'll drop the 1.1.33 tag at some point as well. > > The OpenSSL release is public now - though their web server is very busy > right now. > > Most of the security issues (but not all) are in 1.0.2. So I think it is > fine we stay on 1.0.1 a little while. While I agree that most of the 12 issues fixed in this announcement of the releases for, well, all branches of OpenSSL are not an issue, assuming a sane server setup, some people prefer not to have sane setups ;) Nobody should be using EXPORT ciphers, but evidently, *many* people still are. Though use of client certificates is relatively limited, /those/ are the folks who are a) doing security correctly and b) vulnerable to CVE-2015-0286. So I stick with my +1 to stay with 1.0.1 for the time being, and I'm +1 to linking to 1.0.1m as I can see Mark is already doing. -chris signature.asc Description: OpenPGP digital signature
Re: [VOTE] Release Apache Tomcat Native 1.1.33
On 19/03/2015 16:52, Mark Thomas wrote: > Version 1.1.33 includes the following changes: > - Windows binaries built with APR 1.5.1 and OpenSSL 1.0.1m > - Fix BZ57653: Crash when multiple events for same socket are > returned via separate apr_pollfd_t structures. > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.1.33 is > [X] Stable, go ahead and release > [ ] Broken because of ... Source builds normally on OSX. Source builds normally on Windows. Trunk unit tests pass on 64-bit Windows and OSX. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57728] New: OpenSSL error 140A90A1 (no ciphers) on Tomcat 6.0.43 with tcnative 1.1.32 and APR SSL connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=57728 Bug ID: 57728 Summary: OpenSSL error 140A90A1 (no ciphers) on Tomcat 6.0.43 with tcnative 1.1.32 and APR SSL connector Product: Tomcat 6 Version: 6.0.43 Hardware: Other OS: Linux Status: NEW Severity: normal Priority: P2 Component: Native:Integration Assignee: dev@tomcat.apache.org Reporter: lsco...@gmail.com We are experiencing issues with Tomcat 6.0.43 that do not occur on Tomcat 7.0.59 with the exact same versions of tomcat-native (1.1.32) and apr (1.5.1) and same Tomcat configuration. When starting Tomcat, it throws the following exception (more complete logs, stacktrace, and configuration below): java.lang.Exception: Invalid Server SSL Protocol (error:140A90A1:lib(20):func(169):reason(161)) This error means: $ openssl errstr 140A90A1 error:140A90A1:SSL routines:SSL_CTX_new:library has no ciphers I tried specifying explicit SSLProtocol and SSLCipherSuite to no avail. To be sure that this was not caused by bugs in distribution patches (such as https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780447 which bit us on Tomcat 7.0.59), I compiled tomcat-native and libapr from latest Apache sources, obtained directly from Apache mirrors. More complete log and stacktrace: Mar 19, 2015 6:56:12 PM org.apache.catalina.core.AprLifecycleListener init INFO: Loaded APR based Apache Tomcat Native library 1.1.32 using APR version 1.5.1. Mar 19, 2015 6:56:12 PM org.apache.catalina.core.AprLifecycleListener init INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. Mar 19, 2015 6:56:13 PM org.apache.coyote.http11.Http11AprProtocol init SEVERE: Error initializing endpoint java.lang.Exception: Invalid Server SSL Protocol (error:140A90A1:lib(20):func(169):reason(161)) at org.apache.tomcat.jni.SSLContext.make(Native Method) at org.apache.tomcat.util.net.AprEndpoint.init(AprEndpoint.java:779) at org.apache.coyote.http11.Http11AprProtocol.init(Http11AprProtocol.java:109) at org.apache.catalina.connector.Connector.initialize(Connector.java:1123) at org.apache.catalina.core.StandardService.initialize(StandardService.java:703) at org.apache.catalina.core.StandardServer.initialize(StandardServer.java:838) at org.apache.catalina.startup.Catalina.load(Catalina.java:538) at org.apache.catalina.startup.Catalina.load(Catalina.java:562) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:261) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) Mar 19, 2015 6:56:13 PM org.apache.catalina.core.StandardService initialize SEVERE: Failed to initialize connector [Connector[HTTP/1.1-7102]] LifecycleException: Protocol handler initialization failed: java.lang.Exception: Invalid Server SSL Protocol (error:140A90A1:lib(20):func(169):reason(161)) at org.apache.catalina.connector.Connector.initialize(Connector.java:1125) at org.apache.catalina.core.StandardService.initialize(StandardService.java:703) at org.apache.catalina.core.StandardServer.initialize(StandardServer.java:838) at org.apache.catalina.startup.Catalina.load(Catalina.java:538) at org.apache.catalina.startup.Catalina.load(Catalina.java:562) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:261) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) Relevant Tomcat configuration: Host is Ubuntu Trusty 14.04 with libssl 1.0.1f-1ubuntu2.8, Java is build 1.7.0_55-b13. Again, this same exact configuration, on the same system, with the same libraries, starts just fine with Tomcat 7.0.59, and worked fine on Tomcat 6.0.37 with tomcat-native 1.1.29 and libapr 1.5.0. Note we have some applications which still require Tomcat 6 or we would simply do the obvious and migrate to Tomcat 7 or 8. Let me know if there's any additional information I can provide. -- 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 57728] OpenSSL error 140A90A1 (no ciphers) on Tomcat 6.0.43 with tcnative 1.1.32 and APR SSL connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=57728 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- This works for me on mutliple platforms. The users list is the place to figure out what is going on here. Line 779 of AprEndpoint is a comment so whatever it is you are using, it isn't an official Tomcat distribution. My first suggestion would be to start again with Tomcat 6.0.43, tomcat-native 1.1.32 and APR 1.5.1 downloaded from the ASF. I might even go as far as building OpenSSL from source too. -- 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: Buildbot slave changes
On 19/03/2015 14:10, Rémy Maucherat wrote: > 2015-03-19 14:43 GMT+01:00 Mark Thomas : > >> tomcat-trunk: probably ok >> A couple of test failures (UTF-8) caused by building with on old JDK >> version. I've updated to the latest Java 8 JDK and am re-running the build. >> > Twice as fast ? Not bad ! Indeed. All the buildbot CI builds have now run successfully at least once after I made my changes so I'm going to consider that task complete. At the moment everything is green in buildbot so gump is next on my TODO list while I wait for folks to vote for tc-native. hint hint :) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667863 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
Author: markt Date: Thu Mar 19 20:12:05 2015 New Revision: 1667863 URL: http://svn.apache.org/r1667863 Log: Revert accidental commit from r1650527 which was intended only for local debugging. Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1667863&r1=1667862&r2=1667863&view=diff == --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java Thu Mar 19 20:12:05 2015 @@ -69,7 +69,7 @@ public class TestWebSocketFrameClient ex // Ignore the latch result as the message count test below will tell us // if the right number of messages arrived -handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS / 4, +handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS, TimeUnit.MILLISECONDS); Queue messages = handler.getMessages(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57728] OpenSSL error 140A90A1 (no ciphers) on Tomcat 6.0.43 with tcnative 1.1.32 and APR SSL connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=57728 lsco...@gmail.com changed: What|Removed |Added Resolution|INVALID |--- Status|RESOLVED|REOPENED --- Comment #2 from lsco...@gmail.com --- Thanks for the reply, the reason for the line mismatch is that I pasted in the wrong stacktrace, from another test. Aside from that, exception is otherwise the same. My apologies, here's the correct stack: INFO: Loaded APR based Apache Tomcat Native library 1.1.32 using APR version 1.5.1. Mar 19, 2015 8:16:43 PM org.apache.catalina.core.AprLifecycleListener init INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. Mar 19, 2015 8:16:43 PM org.apache.coyote.http11.Http11AprProtocol init SEVERE: Error initializing endpoint java.lang.Exception: Unable to create SSLContext. Check that SSLEngine is enabled in the AprLifecycleListener, the AprLifecycleListener has initialised correctly and that a valid SSLProtocol has been specified java.lang.Exception: Unable to create SSLContext. Check that SSLEngine is enabled in the AprLifecycleListener, the AprLifecycleListener has initialised correctly and that a valid SSLProtocol has been specified at org.apache.tomcat.util.net.AprEndpoint.init(AprEndpoint.java:795) at org.apache.coyote.http11.Http11AprProtocol.init(Http11AprProtocol.java:109) at org.apache.catalina.connector.Connector.initialize(Connector.java:1123) at org.apache.catalina.core.StandardService.initialize(StandardService.java:703) at org.apache.catalina.core.StandardServer.initialize(StandardServer.java:843) at org.apache.catalina.startup.Catalina.load(Catalina.java:538) at org.apache.catalina.startup.Catalina.load(Catalina.java:562) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:261) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) Caused by: java.lang.Exception: Invalid Server SSL Protocol (error:140A90A1:lib(20):func(169):reason(161)) at org.apache.tomcat.jni.SSLContext.make(Native Method) at org.apache.tomcat.util.net.AprEndpoint.init(AprEndpoint.java:790) ... 12 more Mar 19, 2015 8:16:44 PM org.apache.catalina.core.StandardService initialize SEVERE: Failed to initialize connector [Connector[HTTP/1.1-7102]] LifecycleException: Protocol handler initialization failed: java.lang.Exception: Unable to create SSLContext. Check that SSLEngine is enabled in the AprLifecycleListener, the AprLifecycleListener has initialised correctly and that a valid SSLProtocol has been specified at org.apache.catalina.connector.Connector.initialize(Connector.java:1125) at org.apache.catalina.core.StandardService.initialize(StandardService.java:703) at org.apache.catalina.core.StandardServer.initialize(StandardServer.java:843) at org.apache.catalina.startup.Catalina.load(Catalina.java:538) at org.apache.catalina.startup.Catalina.load(Catalina.java:562) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:261) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) -- 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 57728] OpenSSL error 140A90A1 (no ciphers) on Tomcat 6.0.43 with tcnative 1.1.32 and APR SSL connector
https://bz.apache.org/bugzilla/show_bug.cgi?id=57728 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|REOPENED|RESOLVED --- Comment #3 from Mark Thomas --- This still works for me and my comment regarding the users list still stands. -- 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: r1667871 - /tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Author: markt
Date: Thu Mar 19 20:57:22 2015
New Revision: 1667871
URL: http://svn.apache.org/r1667871
Log:
Prevent threads from being renewed if a leak is detected. This might be why the
memoty leak tests sometimes fails on Gump.
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java?rev=1667871&r1=1667870&r2=1667871&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Thu Mar 19 20:57:22 2015
@@ -17,6 +17,7 @@
package org.apache.catalina.loader;
import java.io.InputStream;
+import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Filter;
import java.util.logging.LogManager;
@@ -24,7 +25,6 @@ import java.util.logging.LogRecord;
import javax.servlet.http.HttpServletResponse;
-
import org.junit.Assert;
import org.junit.Test;
@@ -34,6 +34,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
public class TestWebappClassLoaderThreadLocalMemoryLeak extends TomcatBaseTest
{
@@ -52,9 +53,11 @@ public class TestWebappClassLoaderThread
"org.apache.tomcat.unittest.TesterLeakingServlet1");
ctx.addServletMapping("/leak1", "leakServlet1");
-
tomcat.start();
+Executor executor =
tomcat.getConnector().getProtocolHandler().getExecutor();
+((ThreadPoolExecutor) executor).setThreadRenewalDelay(-1);
+
// Configure logging filter to check leak message appears
LogValidationFilter f = new LogValidationFilter(
"The web application [ROOT] created a ThreadLocal with key
of");
@@ -108,6 +111,9 @@ public class TestWebappClassLoaderThread
tomcat.start();
+Executor executor =
tomcat.getConnector().getProtocolHandler().getExecutor();
+((ThreadPoolExecutor) executor).setThreadRenewalDelay(-1);
+
// Configure logging filter to check leak message appears
LogValidationFilter f = new LogValidationFilter(
"The web application [ROOT] created a ThreadLocal with key
of");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667873 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Author: markt Date: Thu Mar 19 20:58:53 2015 New Revision: 1667873 URL: http://svn.apache.org/r1667873 Log: Prevent threads from being renewed if a leak is detected. This might be why the memory leak tests sometimes fail on Gump. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 20:58:53 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,164642
svn commit: r1667874 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Author: markt Date: Thu Mar 19 20:59:38 2015 New Revision: 1667874 URL: http://svn.apache.org/r1667874 Log: Prevent threads from being renewed if a leak is detected. This might be why the memory leak tests sometimes fail on Gump. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 20:59:38 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767 -/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-1222329,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,1346365,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,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-13617
Re: [VOTE] Release Apache Tomcat Native 1.1.33
Am 19.03.2015 um 17:52 schrieb Mark Thomas:
Version 1.1.33 includes the following changes:
- Windows binaries built with APR 1.5.1 and OpenSSL 1.0.1m
- Fix BZ57653: Crash when multiple events for same socket are
returned via separate apr_pollfd_t structures.
The proposed release artefacts can be found at [1],
and the build was done using tag [2].
The Apache Tomcat Native 1.1.33 is
[ ] Stable, go ahead and release
[ ] Broken because of ...
[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.1.33/
[2]
https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_33
Just two immediate observations:
- the binaries zip files do not contain LICENSE, NOTICE and README.txt.
They did for 1.1.32. Not sure how criticial that is.
- the md5 and sha1 checksum files have the format
CHECKSUM${md5sum.binary-prefix}FILENAME
instead of
CHECKSUM *FILENAME
Also more kind of an annoyance, not a big issue.
Your call :)
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1667925 - in /tomcat/site/trunk: docs/download-taglibs.html docs/index.html docs/oldnews.html docs/taglibs.html docs/taglibs/CHANGES.txt xdocs/download-taglibs.xml xdocs/index.xml xdocs/o
Author: jboynes Date: Fri Mar 20 03:35:36 2015 New Revision: 1667925 URL: http://svn.apache.org/r1667925 Log: Update site to announce Standard Taglib 1.2.5 Added: tomcat/site/trunk/docs/taglibs/CHANGES.txt Modified: tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/taglibs.html tomcat/site/trunk/xdocs/download-taglibs.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/taglibs.xml Modified: tomcat/site/trunk/docs/download-taglibs.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1667925&r1=1667924&r2=1667925&view=diff == --- tomcat/site/trunk/docs/download-taglibs.html (original) +++ tomcat/site/trunk/docs/download-taglibs.html Fri Mar 20 03:35:36 2015 @@ -207,7 +207,7 @@ https://www.apache.org/dist/tomcat/taglibs/KEYS";>KEYS | -Standard Taglib 1.2.3 | +Standard Taglib 1.2.5 | Browse | http://archive.apache.org/dist/tomcat/taglibs/";>Archives @@ -255,7 +255,7 @@ -Standard-1.2.3 +Standard-1.2.5 @@ -267,15 +267,15 @@ -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/README_src.txt"; rel="nofollow">Source README +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/README_src.txt"; rel="nofollow">Source README -zip - (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip.asc";>pgp, - https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip.md5";>md5) +zip + (https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.asc";>pgp, + https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip.md5";>md5) @@ -292,7 +292,7 @@ -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/README_bin.txt"; rel="nofollow">Binary README +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/README_bin.txt"; rel="nofollow">Binary README @@ -301,9 +301,9 @@ -taglibs-standard-impl-1.2.3.jar -(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar.asc";>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar.md5";>md5) +taglibs-standard-impl-1.2.5.jar +(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-impl-1.2.5.jar.md5";>md5) @@ -315,9 +315,9 @@ -taglibs-standard-spec-1.2.3.jar -(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.asc";>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.md5";>md5) +taglibs-standard-spec-1.2.5.jar +(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-spec-1.2.5.jar.md5";>md5) @@ -329,9 +329,9 @@ -taglibs-standard-jstlel-1.2.3.jar -(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar.asc";>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar.md5";>md5) +taglibs-standard-jstlel-1.2.5.jar +(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-jstlel-1.2.5.jar.md5";>md5) @@ -343,9 +343,9 @@ -taglibs-standard-compat-1.2.3.jar -(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar.asc";>pgp, -https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar.md5";>md5) +taglibs-standard-compat-1.2.5.jar +(https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-compat-1.2.5.jar.md5";>md5)
[ANN] Apache Standard Taglib 1.2.5 released
The Apache Tomcat team announces the immediate availability of Apache Standard Taglib 1.2.5. Apache Standard Taglib is an open source software implementation of the JSP Standard Tag Library (JSTL) technology. This release supports JSTL version 1.2 and includes minor bug-fixes to the previous 1.2.3 release. The notable changes include: - Reversion of a change released in 1.2.1 where set the HTTP method to GET when performing a local include - Avoid an AccessControlException if permission has not been granted to read the accessExternalEntity property Please refer to the project website for additional information. http://tomcat.apache.org/taglibs.html Enjoy! - The Apache Tomcat team signature.asc Description: Message signed with OpenPGP using GPGMail
[Bug 57729] New: Add QueryExecutionReportInterceptor to log query execution info
https://bz.apache.org/bugzilla/show_bug.cgi?id=57729 Bug ID: 57729 Summary: Add QueryExecutionReportInterceptor to log query execution info Product: Tomcat Modules Version: unspecified Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: enhancement Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: tad...@ttddyy.net Hi, I made a pull request about "QueryExecutionReportInterceptor", a new JdbcInterceptor which outputs all query execution related information. Detail is described in pull request: https://github.com/apache/tomcat/pull/18 If I need to make a patch and attach it here rather than github pull request, let me know. Thank you, - Tadaya -- 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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 57 mins 51 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150320-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150320.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150320-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150320/bin /openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomc
[Bug 57718] None of the ciphers specified are supported by the SSL engine
https://bz.apache.org/bugzilla/show_bug.cgi?id=57718 --- Comment #5 from Chandu --- Can you please answer this question When we were using tomcat 7.0.29 , This same set of ciphers use to work. I have upgraded tomcat to 7.0.59 and now I am not able to establish socket connection. Because I am getting Warning as "none of the cipher is supported " So My question is does BIO Connector will not use default JVM cipher list when "none of the ciphers is supported " in tomcat 7.0.59? -- 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
