Re: svn commit: r1654487 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
On 28/01/2015 11:01, Konstantin Kolinko wrote: > 2015-01-28 11:41 GMT+03:00 Mark Thomas : >>> 2015-01-24 13:00 GMT+03:00 : Author: markt Date: Sat Jan 24 10:00:32 2015 New Revision: 1654487 URL: http://svn.apache.org/r1654487 Log: Prep for next tag >> [...] > > I > really like this idea, if for no other reason than the changelog often > doesn't get updated with the latest release date until the *following* > release, which is ... irritating. :) No easy way to fix that. >>> >>> If we have marker text that means "in development", we can re-build the >>> site from svn trunk whenever we want and we can even remove the "in >>> development" builds if we want. >> >> But the web site is meant to be the docs for the latest released version. >> >> What I'd really like to do is get the release date into the actual >> release but that requires a crystal ball as to whether or not the VOTE >> will pass and when. >> >> If we changed that date from "release date" to "tagged date" (or some >> better name) we could set the date when we do the tag - that would be a >> lot nicer. > > rtext="tagged 2015-01-28", > > and change it into release date or "not released" afterwards. OK. I'll try that. Mark > > It is possible to use both dates, but I think it looks ugly, > maybe except the "not released" use case, > > rtext="tagged 2015-01-28, not released", > rtext="tagged 2015-01-28, released 2015-02-05", > rtext="tagged 2015-01-28, beta 2015-02-05", > > Tag dates are useful when looking into git changelog (that does not > have svn tags). > > Release dates are used in our board reports, and generally useful for > the public. > > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1654487 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
On 28/01/2015 15:21, Christopher Schultz wrote: > Mark, > > On 1/28/15 3:41 AM, Mark Thomas wrote: >> [The] web site is meant to be the docs for the latest released version. > > Agreed, but it almost never tells you when the latest version was > released. That's what I'm kind of hoping for. Yes, you can look at the > "News" page, but it's not in the public changelog until release N+1. > >> What I'd really like to do is get the release date into the actual >> release but that requires a crystal ball as to whether or not the VOTE >> will pass and when. > > Pid will certainly have to write that patch himself. > >> If we changed that date from "release date" to "tagged date" (or some >> better name) we could set the date when we do the tag - that would be a >> lot nicer. > > Or, commit the release date back to the tag once the vote passes. Is > that particularly illegal? Very. The tag has to be an exact match with what the PMC voted to release. That doesn't stop us updating the web-site independently. I'm more interested in what is released since that is what folks are more likely to look at. I think the tagged date is better than nothing here and doesn't generate too much complexity. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 Ralf Hauser changed: What|Removed |Added CC||hau...@acm.org -- 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 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #16 from Ognjen Blagojevic --- Created attachment 32407 --> https://issues.apache.org/bugzilla/attachment.cgi?id=32407&action=edit Patch to add useServerCipherSuitesOrder to NIO and NIO2 connectors -- 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 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 Ognjen Blagojevic changed: What|Removed |Added Component|Connectors |Connectors Version|trunk |unspecified Product|Tomcat 8|Tomcat 9 Target Milestone||- --- Comment #15 from Ognjen Blagojevic --- Chris, (In reply to Christopher Schultz from comment #14) > Ognjen, if you are still willing to produce a patch, consider writing it > against trunk, which will require Java 8 so won't need the reflection. If we > decide to back-port to Tomcat 8, the reflection can be re-introduced. Ok. I will attach patch for Tomcat 9. As you suggested: 1. Parameter name is useServerCipherSuitesOrder insted of useCipherSuitesOrder. 2. Code is deduplicated / moved to superclass. To test it: (1) Install JDK 1.8.0 (2) Install Java 8 JCE Unlimited Strength (3) Apply patch, build Tomcat (4) Add JSSE Connector configuration to server.xml: (5) Start Tomcat. Forward Secrecy is enabled (on all clients that support it) To test with NIO2, just replace Http11NioProtocol with Http11Nio2Protocol. -Ognjen -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java
Felix,
On 1/28/15 10:52 AM, Felix Schumacher wrote:
> Am 28.01.2015 15:36, schrieb Christopher Schultz:
>> Felix,
>>
>> On 1/27/15 2:21 PM, fschumac...@apache.org wrote:
>>> Author: fschumacher
>>> Date: Tue Jan 27 19:21:25 2015
>>> New Revision: 1655114
>>>
>>> URL: http://svn.apache.org/r1655114
>>> Log:
>>> Close the inputstream that was used to get the content of
>>> the readme file. Issue reported by Coverity Scan.
>>>
>>> Merged r1654522 from /tomcat/trunk
>>>
>>> Modified:
>>> tomcat/tc8.0.x/trunk/ (props changed)
>>>
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>>
>>>
>>> Propchange: tomcat/tc8.0.x/trunk/
>>> --
>>>
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Jan 27 19:21:25 2015
>>> @@ -1 +1 @@
>>> -/tomcat
>>>
>>> Modified:
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>>
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
>>>
>>> ==
>>>
>>> ---
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>> (original)
>>> +++
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>> Tue Jan 27 19:21:25 2015
>>> @@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
>>> directory.getWebappPath() + readmeFile);
>>> if (resource.isFile()) {
>>> StringWriter buffer = new StringWriter();
>>> -InputStream is = resource.getInputStream();
>>> -copyRange(new InputStreamReader(is),
>>> -new PrintWriter(buffer));
>>> +try (InputStream is = resource.getInputStream();
>>> +InputStreamReader reader = new
>>> InputStreamReader(is)) {
>>> +copyRange(reader, new PrintWriter(buffer));
>>> +} catch (IOException ignored) {
>>> +}
>>
>> I know it seems silly and extra, unnecessary code, but I really dislike
>> swallowing exceptions like this.
> Right, that's why I have added logging in r1655117. I think you will not
> like r1655115 either :)
Thanks!
-chris
signature.asc
Description: OpenPGP digital signature
svn commit: r1655467 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/factory/BeanFactory.java
Author: rjung
Date: Wed Jan 28 21:12:23 2015
New Revision: 1655467
URL: http://svn.apache.org/r1655467
Log:
Fix IDE nag
Backport of r1655454 from trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 21:12:23 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
+/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
Modified: tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1655467&r1=1655466&r2=1655467&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java Wed
Jan 28 21:12:23 2015
@@ -148,7 +148,7 @@ public class BeanFactory
/* Look for properties with explicitly configured setter */
RefAddr ra = ref.get("forceString");
-Map forced = new HashMap();
+Map forced = new HashMap<>();
String value;
if (ra != null) {
-
To unsubscribe, e-mail: dev-unsubscr
Re: svn commit: r1655454 - /tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
Am 28.01.2015 um 21:24 schrieb ma...@apache.org: Author: markt Date: Wed Jan 28 20:24:49 2015 New Revision: 1655454 URL: http://svn.apache.org/r1655454 Log: Fix IDE nag Thanks! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655454 - /tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
Author: markt
Date: Wed Jan 28 20:24:49 2015
New Revision: 1655454
URL: http://svn.apache.org/r1655454
Log:
Fix IDE nag
Modified:
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1655454&r1=1655453&r2=1655454&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Wed Jan 28
20:24:49 2015
@@ -148,7 +148,7 @@ public class BeanFactory
/* Look for properties with explicitly configured setter */
RefAddr ra = ref.get("forceString");
-Map forced = new HashMap();
+Map forced = new HashMap<>();
String value;
if (ra != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1655357 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
2015-01-28 22:43 GMT+03:00 Violeta Georgieva : > Hi, > > 2015-01-28 20:52 GMT+02:00 Konstantin Kolinko : >> >> 2015-01-28 18:03 GMT+03:00 : >> > Author: violetagg >> > Date: Wed Jan 28 15:03:33 2015 >> > New Revision: 1655357 >> > >> > URL: http://svn.apache.org/r1655357 >> > Log: >> > Update changelog >> > >> > Modified: >> > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >> > >> > Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml >> > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655357&r1=1655356&r2=1655357&view=diff >> > > == >> > --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) >> > +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 15:03:33 > 2015 >> > @@ -59,6 +59,10 @@ >> > >> >> The changelog entry below belongs to Jasper instead of Tribes. > > Thanks I fixed it. But I do not want to cancel 7.0.59 because of this. > > Is it acceptable if I change it directly on the site? OK. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655445 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/naming/factory/BeanFactory.java webapps/docs/changelog.xml webapps/docs/jndi-resources-howto.xml
Author: rjung Date: Wed Jan 28 19:51:33 2015 New Revision: 1655445 URL: http://svn.apache.org/r1655445 Log: Enhance our naming BeanFactory. If a bean property exists which the Introspector presents us with a type that we don't have a string conversion for, but the bean actually has a method to set the property from a string, allow to provide this information to the BeanFactory. New attribute "forceString" taking a comma separated list of items as values. Each item is either a bean property name (e.g. "foo") meaning that there is a setter function "setFoo(String)" for that property. Or the item is of the form "foo=method" meaning that property "foo" can be set by calling "method(String)". This should make writing a custom bean factory obsolete in quite a few cases. Concrete use case was tibco TibjmsConnectionFactory which has an attribute SSLIdentity detected by Introspector as byte[] but which can be set by setSSLIdentity(String). Existing BeanFactory throws NamingException. Backport of r1655312, r1655438 and r1655441 from trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/naming/factory/BeanFactory.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/jndi-resources-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 28 19:51:33 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 +/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-165513
svn commit: r1655444 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: violetagg Date: Wed Jan 28 19:47:19 2015 New Revision: 1655444 URL: http://svn.apache.org/r1655444 Log: Prep for next version Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1655444&r1=1655443&r2=1655444&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Wed Jan 28 19:47:19 2015 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=59 +version.build=60 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1655444&r1=1655443&r2=1655444&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Wed Jan 28 19:47:19 2015 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.59 +maven.asf.release.deploy.version=7.0.60 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655444&r1=1655443&r2=1655444&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 19:47:19 2015 @@ -55,6 +55,8 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues to not "pop up" wrt. others). --> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1655357 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Hi, 2015-01-28 20:52 GMT+02:00 Konstantin Kolinko : > > 2015-01-28 18:03 GMT+03:00 : > > Author: violetagg > > Date: Wed Jan 28 15:03:33 2015 > > New Revision: 1655357 > > > > URL: http://svn.apache.org/r1655357 > > Log: > > Update changelog > > > > Modified: > > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > > > > Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > > URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655357&r1=1655356&r2=1655357&view=diff > > == > > --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) > > +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 15:03:33 2015 > > @@ -59,6 +59,10 @@ > > > > The changelog entry below belongs to Jasper instead of Tribes. Thanks I fixed it. But I do not want to cancel 7.0.59 because of this. Is it acceptable if I change it directly on the site? Regards, Violeta > > > > > > > +57504: Initialize TLD locations cache when creating the > > +ServletContext. (jboynes) > > + > > + > > Fix a possible deadlock when receiver thread invokes > > mapMemberAdded() while ping thread invokes > > memberAlive(). (kfujino) > > > > > > > > - > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
svn commit: r1655443 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Wed Jan 28 19:41:13 2015 New Revision: 1655443 URL: http://svn.apache.org/r1655443 Log: Move the changelog to the correct section Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655443&r1=1655442&r2=1655443&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 19:41:13 2015 @@ -56,12 +56,16 @@ issues to not "pop up" wrt. others). --> - + 57504: Initialize TLD locations cache when creating the ServletContext. (jboynes) + + + + Fix a possible deadlock when receiver thread invokes mapMemberAdded() while ping thread invokes - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.59
The proposed Apache Tomcat 7.0.59 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.59/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1033/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ The proposed 7.0.59 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.59 Stable Regards, Violeta
svn commit: r1655441 - /tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
Author: rjung
Date: Wed Jan 28 19:34:53 2015
New Revision: 1655441
URL: http://svn.apache.org/r1655441
Log:
Add some code comments for new feature.
Modified:
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1655441&r1=1655440&r2=1655441&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Wed Jan 28
19:34:53 2015
@@ -146,6 +146,7 @@ public class BeanFactory
Object bean = beanClass.newInstance();
+/* Look for properties with explicitly configured setter */
RefAddr ra = ref.get("forceString");
Map forced = new HashMap();
String value;
@@ -157,10 +158,14 @@ public class BeanFactory
String setterName;
int index;
+/* Items are given as comma separated list */
for (String param: value.split(",")) {
param = param.trim();
+/* A single item can either be of the form name=method
+ * or just a property name (and we will use a standard
+ * setter) */
index = param.indexOf('=');
-if (index>= 0) {
+if (index >= 0) {
setterName = param.substring(index + 1).trim();
param = param.substring(0, index).trim();
} else {
@@ -197,6 +202,7 @@ public class BeanFactory
Object[] valueArray = new Object[1];
+/* Shortcut for properties with explicitly configured
setter */
Method method = forced.get(propName);
if (method != null) {
valueArray[0] = value;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655439 - in /tomcat/trunk/java/org/apache: coyote/ajp/AjpNioProtocol.java coyote/http11/Http11NioProtocol.java tomcat/util/net/NioEndpoint.java
Author: markt
Date: Wed Jan 28 19:30:12 2015
New Revision: 1655439
URL: http://svn.apache.org/r1655439
Log:
Simplify. Do read registrations via the SocketWrapper rather than
directly with the Socket & Poller.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1655439&r1=1655438&r2=1655439&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Wed Jan 28
19:30:12 2015
@@ -128,7 +128,7 @@ public class AjpNioProtocol extends Abst
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
-socket.getSocket().getPoller().add(socket.getSocket());
+socket.registerReadInterest();
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1655439&r1=1655438&r2=1655439&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Jan
28 19:30:12 2015
@@ -210,7 +210,7 @@ public class Http11NioProtocol extends A
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller) {
-socket.getSocket().getPoller().add(socket.getSocket());
+socket.registerReadInterest();
}
}
@@ -242,7 +242,7 @@ public class Http11NioProtocol extends A
// - this is an upgraded connection
// - the request line/headers have not been completely
//read
-socket.getSocket().getPoller().add(socket.getSocket());
+socket.registerReadInterest();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1655439&r1=1655438&r2=1655439&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jan 28
19:30:12 2015
@@ -839,11 +839,9 @@ public class NioEndpoint extends Abstrac
* however).
*
* @param socket to add to the poller
+ * @param interestOps Operations for which to register this socket with
+ *the Poller
*/
-public void add(final NioChannel socket) {
-add(socket,SelectionKey.OP_READ);
-}
-
public void add(final NioChannel socket, final int interestOps) {
PollerEvent r = eventCache.pop();
if ( r==null) r = new PollerEvent(socket,null,interestOps);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655438 - /tomcat/trunk/webapps/docs/jndi-resources-howto.xml
Author: rjung
Date: Wed Jan 28 19:29:46 2015
New Revision: 1655438
URL: http://svn.apache.org/r1655438
Log:
Use a slightly less artificial example for the
new feature.
Modified:
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1655438&r1=1655437&r2=1655438&view=diff
==
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Wed Jan 28 19:29:46 2015
@@ -339,70 +339,78 @@ writer.println("foo = " + bean.getFoo()
-The bean has two properties, both are of type byte[].
-The first property foo has a setter taking a string argument.
-By default the Tomcat BeanFactory would try to use the automatically
-detected setter with the same argument type as the property type and
-then throw a NamingException, because it is not prepared to convert
-the given string attribute value to byte[].
+The bean has two properties, both are of type InetAddress.
+The first property local has an additional setter taking a
+string argument. By default the Tomcat BeanFactory would try to use the
+automatically detected setter with the same argument type as the property
+type and then throw a NamingException, because it is not prepared to
convert
+the given string attribute value to InetAddress.
We can tell the Tomcat BeanFactory to use the other setter like that:
-The bean property bar can also be set from a string,
-but one has to use the non-standard method name init.
-To set foo and bar use the following
+The bean property remote can also be set from a string,
+but one has to use the non-standard method name host.
+To set local and remote use the following
configuration:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1655357 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
2015-01-28 18:03 GMT+03:00 : > Author: violetagg > Date: Wed Jan 28 15:03:33 2015 > New Revision: 1655357 > > URL: http://svn.apache.org/r1655357 > Log: > Update changelog > > Modified: > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > > Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655357&r1=1655356&r2=1655357&view=diff > == > --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 15:03:33 2015 > @@ -59,6 +59,10 @@ > The changelog entry below belongs to Jasper instead of Tribes. > > > +57504: Initialize TLD locations cache when creating the > +ServletContext. (jboynes) > + > + > Fix a possible deadlock when receiver thread invokes > mapMemberAdded() while ping thread invokes > memberAlive(). (kfujino) > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java
Am 28.01.2015 15:36, schrieb Christopher Schultz:
Felix,
On 1/27/15 2:21 PM, fschumac...@apache.org wrote:
Author: fschumacher
Date: Tue Jan 27 19:21:25 2015
New Revision: 1655114
URL: http://svn.apache.org/r1655114
Log:
Close the inputstream that was used to get the content of
the readme file. Issue reported by Coverity Scan.
Merged r1654522 from /tomcat/trunk
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:21:25 2015
@@ -1 +1 @@
-/tomcat
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Tue Jan 27 19:21:25 2015
@@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
directory.getWebappPath() + readmeFile);
if (resource.isFile()) {
StringWriter buffer = new StringWriter();
-InputStream is = resource.getInputStream();
-copyRange(new InputStreamReader(is),
-new PrintWriter(buffer));
+try (InputStream is = resource.getInputStream();
+InputStreamReader reader = new
InputStreamReader(is)) {
+copyRange(reader, new PrintWriter(buffer));
+} catch (IOException ignored) {
+}
I know it seems silly and extra, unnecessary code, but I really dislike
swallowing exceptions like this.
Right, that's why I have added logging in r1655117. I think you will not
like r1655115 either :)
Felix
-chris
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #17 from Christopher Schultz --- (In reply to Mark Thomas from comment #16) > There is nothing stopping users copying an exploded directory into the > appBase in the same way a WAR is copied. The ASF's JIRA instance runs this > way for exactly the security concerns you cite. Yes, but those WARs are being copied locally and can work by using a user other than Tomcat's uid. > I do not see any security benefits that are unique to unpackWARs="false" If Tomcat itself can be remotely exploited to drop a WAR file into webapps/ then it might be auto-deployed without local access (which is what you describe above). -- 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: r1655365 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_59: ./ build.properties.default
Author: violetagg Date: Wed Jan 28 15:38:51 2015 New Revision: 1655365 URL: http://svn.apache.org/r1655365 Log: Tag 7.0.59 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ (props changed) - copied from r1655361, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jan 28 15:38:51 2015 @@ -0,0 +1,2 @@ +(https?\://issues.apache.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- --- bugtraq:message (added) +++ bugtraq:message Wed Jan 28 15:38:51 2015 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- --- svn:ignore (added) +++ svn:ignore Wed Jan 28 15:38:51 2015 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_59/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jan 28 15:38:51 2015 @@ -0,0 +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 +/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,1343
Re: svn commit: r1654487 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Mark, On 1/28/15 3:41 AM, Mark Thomas wrote: > [The] web site is meant to be the docs for the latest released version. Agreed, but it almost never tells you when the latest version was released. That's what I'm kind of hoping for. Yes, you can look at the "News" page, but it's not in the public changelog until release N+1. > What I'd really like to do is get the release date into the actual > release but that requires a crystal ball as to whether or not the VOTE > will pass and when. Pid will certainly have to write that patch himself. > If we changed that date from "release date" to "tagged date" (or some > better name) we could set the date when we do the tag - that would be a > lot nicer. Or, commit the release date back to the tag once the vote passes. Is that particularly illegal? -chris signature.asc Description: OpenPGP digital signature
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #16 from Mark Thomas --- (In reply to Christopher Schultz from comment #15) > (In reply to Francisco A. Lozano from comment #12) > > One question about your reasoning - what's the point of having > > unpackWARS="false" option if it's so unusably slow in T8? > > One valid use case: read-only filesystem (from Tomcat's perspective). > unpackWars="false" allows you to run with the host's appBase directory > non-writable by Tomcat. There is nothing stopping users copying an exploded directory into the appBase in the same way a WAR is copied. The ASF's JIRA instance runs this way for exactly the security concerns you cite. I do not see any security benefits that are unique to unpackWARs="false" -- 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: r1655357 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Wed Jan 28 15:03:33 2015 New Revision: 1655357 URL: http://svn.apache.org/r1655357 Log: Update changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655357&r1=1655356&r2=1655357&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 15:03:33 2015 @@ -59,6 +59,10 @@ +57504: Initialize TLD locations cache when creating the +ServletContext. (jboynes) + + Fix a possible deadlock when receiver thread invokes mapMemberAdded() while ping thread invokes memberAlive(). (kfujino) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #15 from Christopher Schultz --- (In reply to Francisco A. Lozano from comment #12) > One question about your reasoning - what's the point of having > unpackWARS="false" option if it's so unusably slow in T8? One valid use case: read-only filesystem (from Tomcat's perspective). unpackWars="false" allows you to run with the host's appBase directory non-writable by Tomcat. Having the webapps directory writable by Tomcat is a security concern, especially if Tomcat were exploited in some way... the attacker could deploy an application by dropping a WAR file into that directory. Obviously, there are other ways to attack Tomcat, but this is a legitimate layer of protection. The old behavior of unpackWars="false" expanding WAR files into the work/ directory was acceptable from a security perspective, since nothing in the work/ directory could be auto-deployed. Again, there are other security concerns here with the work directory outside the scope of the original question. -- 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 57251] WAR deployment unbelievably slow when unpackWARs=false
https://issues.apache.org/bugzilla/show_bug.cgi?id=57251 --- Comment #14 from Wolfgang Imig --- "... I'd be interested in hearing if there are any other use cases..." Here is my use case for unpackWARs="false": Our software product installs for each repository the same set of web applications. If the customer wants to update an application, she usually wants to have it updated for all repositories. To make the update process as simple as possible, the WARs are not stored at Tomcat/webapps but in a directory outside of tomcat. Each WAR is placed there only once. Context container files in Tomcat/conf/Catalina/localhost represent the required web applications and link in their "docBase" attribute to the WAR. With unpackWARs="false", the startup time in Tomcat 8 is unacceptably slow, usually several minutes. Setting unpackWARs="true" results in an acceptable performance, but it has the downside that Tomcat does not recognize if the WAR was updated and always starts the exploded WAR. In our case, WARs are only updated when Tomcat is stopped. I think your suggestion about comparing the last modified times is a reasonable solution (timestamp of WAR compared to timestamp of a file that is created during unpacking). -- 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 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #14 from Christopher Schultz --- Ognjen, if you are still willing to produce a patch, consider writing it against trunk, which will require Java 8 so won't need the reflection. If we decide to back-port to Tomcat 8, the reflection can be re-introduced. Are you still able to update the patch? (In reply to Ralf Hauser from comment #13) > Please implement this feature also for non-APR connectors A.S.A.P. - I think > it is even worthwhile to backport to Tomcat 7! This enhancement request is specifically targeted towards the non-APR connectors. The APR connector already supports this capability via the SSLHonorCipherOrder setting. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1655132 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Mark, On 1/27/15 2:39 PM, ma...@apache.org wrote: > Author: markt > Date: Tue Jan 27 19:39:03 2015 > New Revision: 1655132 > > URL: http://svn.apache.org/r1655132 > Log: > Start tends to make extensive use of resources. Trigger a clean-up once > it finishes. > > Modified: > tomcat/trunk/java/org/apache/catalina/core/StandardContext.java > > Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1655132&r1=1655131&r2=1655132&view=diff > == > --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) > +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Jan > 27 19:39:03 2015 > @@ -5216,6 +5216,9 @@ public class StandardContext extends Con > broadcaster.sendNotification(notification); > } > > +// Trigger clean-up of the resources > +getResources().backgroundProcess(); I think it would be better to have a "cleanupResources" method that gets called from backgroundProcess, and to call cleanupResources here instead. Calling backgroundProcess here seems architecturally unsound. -chris signature.asc Description: OpenPGP digital signature
Re: svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java
Felix,
On 1/27/15 2:21 PM, fschumac...@apache.org wrote:
> Author: fschumacher
> Date: Tue Jan 27 19:21:25 2015
> New Revision: 1655114
>
> URL: http://svn.apache.org/r1655114
> Log:
> Close the inputstream that was used to get the content of
> the readme file. Issue reported by Coverity Scan.
>
> Merged r1654522 from /tomcat/trunk
>
> Modified:
> tomcat/tc8.0.x/trunk/ (props changed)
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>
> Propchange: tomcat/tc8.0.x/trunk/
> --
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Jan 27 19:21:25 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,164489
2
>
> ,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,1654725,1654735,1654766,1654785
> +/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,164489
2
>
> ,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,1654725,1654735,1654766,1654785
>
> Modified:
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
> URL:
> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
> ==
> ---
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
> (original)
> +++
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
> Tue Jan 27 19:21:25 2015
> @@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
> directory.getWebappPath() + readmeFile);
> if (resource.isFile()) {
> StringWriter buffer = new StringWriter();
> -InputStream is = resource.getInputStream();
> -copyRange(new InputStreamReader(is),
> -new PrintWriter(buffer));
> +try (Inp
svn commit: r1655353 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Wed Jan 28 14:35:01 2015
New Revision: 1655353
URL: http://svn.apache.org/r1655353
Log:
Remove unused return value
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1655353&r1=1655352&r2=1655353&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jan 28
14:35:01 2015
@@ -1050,8 +1050,7 @@ public class NioEndpoint extends Abstrac
stopLatch.countDown();
}
-protected boolean processKey(SelectionKey sk, NioSocketWrapper
attachment) {
-boolean result = true;
+protected void processKey(SelectionKey sk, NioSocketWrapper
attachment) {
try {
if ( close ) {
cancelledKey(sk);
@@ -1078,8 +1077,6 @@ public class NioEndpoint extends Abstrac
if (closeSocket) {
cancelledKey(sk);
}
-} else {
-result = false;
}
}
}
@@ -1093,7 +1090,6 @@ public class NioEndpoint extends Abstrac
ExceptionUtils.handleThrowable(t);
log.error("",t);
}
-return result;
}
public SendfileState processSendfile(SelectionKey sk, NioSocketWrapper
socketWrapper,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655352 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Wed Jan 28 14:31:42 2015
New Revision: 1655352
URL: http://svn.apache.org/r1655352
Log:
Simplify Sendfile processing. Rename 'event' so its purpose is clearer.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1655352&r1=1655351&r2=1655352&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jan 28
14:31:42 2015
@@ -1096,7 +1096,8 @@ public class NioEndpoint extends Abstrac
return result;
}
-public SendfileState processSendfile(SelectionKey sk, NioSocketWrapper
socketWrapper, boolean event) {
+public SendfileState processSendfile(SelectionKey sk, NioSocketWrapper
socketWrapper,
+boolean calledByProcessor) {
NioChannel sc = null;
try {
unreg(sk, socketWrapper, sk.readyOps());
@@ -1106,13 +1107,7 @@ public class NioEndpoint extends Abstrac
log.trace("Processing send file for: " + sd.fileName);
}
-// This method is called by the Http11Processor for the first
-// execution and then subsequent executions are via the Poller.
-// This boolean keeps track of the current caller as the
-// required behaviour varies slightly.
-boolean calledByProcessor = (sd.fchannel == null);
-
-if (calledByProcessor) {
+if (sd.fchannel == null) {
// Setup the file channel
File f = new File(sd.fileName);
if (!f.exists()) {
@@ -1159,16 +1154,15 @@ public class NioEndpoint extends Abstrac
sd.fchannel.close();
} catch (Exception ignore) {
}
+// For calls from outside the Poller, the caller is
+// responsible for registering the socket for the
+// appropriate event(s) if sendfile completes.
if (!calledByProcessor) {
if (sd.keepAlive) {
if (log.isDebugEnabled()) {
log.debug("Connection is keep alive,
registering back for OP_READ");
}
-if (event) {
-
this.add(socketWrapper.getSocket(),SelectionKey.OP_READ);
-} else {
-reg(sk,socketWrapper,SelectionKey.OP_READ);
-}
+reg(sk,socketWrapper,SelectionKey.OP_READ);
} else {
if (log.isDebugEnabled()) {
log.debug("Send file connection is being
closed");
@@ -1181,7 +1175,7 @@ public class NioEndpoint extends Abstrac
if (log.isDebugEnabled()) {
log.debug("OP_WRITE for sendfile: " + sd.fileName);
}
-if (event) {
+if (calledByProcessor) {
add(socketWrapper.getSocket(),SelectionKey.OP_WRITE);
} else {
reg(sk,socketWrapper,SelectionKey.OP_WRITE);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655351 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: markt
Date: Wed Jan 28 14:31:38 2015
New Revision: 1655351
URL: http://svn.apache.org/r1655351
Log:
Adding a socket to the Poller with OP_CALLBACK resulted in a call to
processSocket() with exactly the same paramters as if processSocket()
was called directly. Therefore, call processSocket() directly and avoid
the overhead of going via the Poller.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1655351&r1=1655350&r2=1655351&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jan 28
14:31:38 2015
@@ -80,7 +80,6 @@ public class NioEndpoint extends Abstrac
public static final int OP_REGISTER = 0x100; //register interest op
-public static final int OP_CALLBACK = 0x200; //callback interest op
// - Fields
@@ -578,12 +577,7 @@ public class NioEndpoint extends Abstrac
@Override
public void processSocket(SocketWrapperBase socketWrapper,
SocketStatus socketStatus, boolean dispatch) {
-NioChannel socket = socketWrapper.getSocket();
-if (socket.isOpen() && dispatch && socketStatus ==
SocketStatus.OPEN_READ) {
-socket.getPoller().add(socket, OP_CALLBACK);
-} else {
-processSocket((NioSocketWrapper) socketWrapper, socketStatus,
dispatch);
-}
+processSocket((NioSocketWrapper) socketWrapper, socketStatus,
dispatch);
}
protected boolean processSocket(NioSocketWrapper attachment, SocketStatus
status, boolean dispatch) {
@@ -591,7 +585,6 @@ public class NioEndpoint extends Abstrac
if (attachment == null) {
return false;
}
-attachment.setCallBackNotify(false); //will get reset upon next reg
SocketProcessor sc = processorCache.pop();
if ( sc == null ) sc = new SocketProcessor(attachment, status);
else sc.reset(attachment, status);
@@ -773,19 +766,11 @@ public class NioEndpoint extends Abstrac
if (key != null) {
final NioSocketWrapper att = (NioSocketWrapper)
key.attachment();
if ( att!=null ) {
-//handle callback flag
-if ((interestOps & OP_CALLBACK) == OP_CALLBACK ) {
-att.setCallBackNotify(true);
-} else {
-att.setCallBackNotify(false);
-}
-interestOps = (interestOps &
(~OP_CALLBACK));//remove the callback flag
att.access();//to prevent timeout
//we are registering the key to start with, reset
the fairness counter.
int ops = key.interestOps() | interestOps;
att.interestOps(ops);
-if (att.getCallBackNotify()) key.interestOps(0);
-else key.interestOps(ops);
+key.interestOps(ops);
} else {
cancel = true;
}
@@ -863,9 +848,6 @@ public class NioEndpoint extends Abstrac
PollerEvent r = eventCache.pop();
if ( r==null) r = new PollerEvent(socket,null,interestOps);
else r.reset(socket,null,interestOps);
-if ( (interestOps&OP_CALLBACK) == OP_CALLBACK ) {
-nextExpiration = 0; //force the check for faster callback
-}
addEvent(r);
if (close) {
NioEndpoint.NioSocketWrapper ka =
(NioEndpoint.NioSocketWrapper)socket.getAttachment();
@@ -1251,12 +1233,6 @@ public class NioEndpoint extends Abstrac
cancelledKey(key); //we don't support any keys without
attachments
} else if ( ka.getError() != null) {
cancelledKey(key);//TODO this is not yet being used
-} else if (ka.getCallBackNotify() ) {
-ka.setCallBackNotify(false);
-int ops = ka.interestOps() & ~OP_CALLBACK;
-reg(key,ka,0);//avoid multiple calls, this gets
re-registered after invocation
-ka.interestOps(ops);
-if (!processSocket(ka, SocketStatus.OPEN_READ, true))
processSocket(ka, SocketStatus.DISCONNECT, true);
} else if ((ka.interestOps()&SelectionKey.OP_READ) ==
SelectionKey.OP_READ ||
(ka.inte
svn commit: r1655312 - in /tomcat/trunk: java/org/apache/naming/factory/BeanFactory.java webapps/docs/jndi-resources-howto.xml
Author: rjung
Date: Wed Jan 28 13:43:11 2015
New Revision: 1655312
URL: http://svn.apache.org/r1655312
Log:
Enhance our naming BeanFactory.
If a bean property exists which the Introspector
presents us with a type that we don't have a
string conversion for, but the bean actually
has a method to set the property from a string,
allow to provide this information to the
BeanFactory.
New attribute "forceString" taking a comma separated
list of items as values. Each item is either a bean
property name (e.g. "foo") meaning that there is a
setter function "setFoo(String)" for that property.
Or the item is of the form "foo=method" meaning that
property "foo" can be set by calling "method(String)".
This should make writing a custom bean factory
obsolete in quite a few cases.
Concrete use case was tibco TibjmsConnectionFactory
which has an attribute SSLIdentity detected by
Introspector as byte[] but which can be set by
setSSLIdentity(String). Existing BeanFactory throws
NamingException.
Modified:
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1655312&r1=1655311&r2=1655312&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Wed Jan 28
13:43:11 2015
@@ -20,9 +20,12 @@ package org.apache.naming.factory;
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Hashtable;
+import java.util.Map;
import javax.naming.Context;
import javax.naming.Name;
@@ -143,22 +146,72 @@ public class BeanFactory
Object bean = beanClass.newInstance();
+RefAddr ra = ref.get("forceString");
+Map forced = new HashMap();
+String value;
+
+if (ra != null) {
+value = (String)ra.getContent();
+Class paramTypes[] = new Class[1];
+paramTypes[0] = String.class;
+String setterName;
+int index;
+
+for (String param: value.split(",")) {
+param = param.trim();
+index = param.indexOf('=');
+if (index>= 0) {
+setterName = param.substring(index + 1).trim();
+param = param.substring(0, index).trim();
+} else {
+setterName = "set" +
+ param.substring(0, 1).toUpperCase() +
+ param.substring(1);
+}
+try {
+forced.put(param,
+ beanClass.getMethod(setterName,
paramTypes));
+} catch (NoSuchMethodException|SecurityException ex) {
+throw new NamingException
+("Forced String setter " + setterName +
+ " not found for property " + param);
+}
+}
+}
+
Enumeration e = ref.getAll();
+
while (e.hasMoreElements()) {
-RefAddr ra = e.nextElement();
+ra = e.nextElement();
String propName = ra.getType();
if (propName.equals(Constants.FACTORY) ||
propName.equals("scope") || propName.equals("auth") ||
+propName.equals("forceString") ||
propName.equals("singleton")) {
continue;
}
-String value = (String)ra.getContent();
+value = (String)ra.getContent();
Object[] valueArray = new Object[1];
+Method method = forced.get(propName);
+if (method != null) {
+valueArray[0] = value;
+try {
+method.invoke(bean, valueArray);
+} catch (IllegalAccessException|
+ IllegalArgumentException|
+ InvocationTargetException ex) {
+throw new NamingException
+("Forced String setter " + method.getName() +
+ " threw exception for property " + prop
svn commit: r1655292 - in /tomcat/trunk/java/org/apache: coyote/ajp/AjpProcessor.java tomcat/util/net/AprEndpoint.java tomcat/util/net/Nio2Endpoint.java tomcat/util/net/NioEndpoint.java tomcat/util/ne
Author: markt
Date: Wed Jan 28 13:07:37 2015
New Revision: 1655292
URL: http://svn.apache.org/r1655292
Log:
Simplify read and write registration for non-blocking I/O.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1655292&r1=1655291&r2=1655292&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Jan 28
13:07:37 2015
@@ -582,7 +582,7 @@ public class AjpProcessor extends Abs
}
case NB_READ_INTEREST: {
if (!endOfStream) {
-socketWrapper.regsiterForEvent(true, false);
+socketWrapper.registerReadInterest();
}
break;
}
@@ -644,7 +644,7 @@ public class AjpProcessor extends Abs
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, x);
}
} catch (IllegalStateException x) {
-socketWrapper.regsiterForEvent(false, true);
+socketWrapper.registerWriteInterest();
}
} else if (status == SocketStatus.OPEN_READ &&
request.getReadListener() != null) {
@@ -653,7 +653,7 @@ public class AjpProcessor extends Abs
asyncStateMachine.asyncOperation();
}
} catch (IllegalStateException x) {
-socketWrapper.regsiterForEvent(true, false);
+socketWrapper.registerReadInterest();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1655292&r1=1655291&r2=1655292&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Jan 28
13:07:37 2015
@@ -2629,20 +2629,15 @@ public class AprEndpoint extends Abstrac
@Override
public void registerReadInterest() {
-regsiterForEvent(true, false);
+((AprEndpoint) getEndpoint()).getPoller().add(
+getSocket().longValue(), -1, true, false);
}
@Override
public void registerWriteInterest() {
-regsiterForEvent(false, true);
-}
-
-
-@Override
-public void regsiterForEvent(boolean read, boolean write) {
((AprEndpoint) getEndpoint()).getPoller().add(
-getSocket().longValue(), -1, read, write);
+getSocket().longValue(), -1, false, true);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1655292&r1=1655291&r2=1655292&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Jan 28
13:07:37 2015
@@ -1284,12 +1284,6 @@ public class Nio2Endpoint extends Abstra
}
-@Override
-public void regsiterForEvent(boolean read, boolean write) {
-// NO-OP. Appropriate handlers will already have been registered.
-}
-
-
public void awaitBytes() {
if (getSocket() == null) {
return;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1655292&r1=1655291&r2=1655292&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jan 28
13:07:37 2015
@@ -1571,22 +1571,6 @@ public class NioEndpoint extends Abstrac
@Override
-public void regsiterForEvent(boolean read, boolean write) {
-SelectionKey key = getSocket().getIOChannel().keyFor(
-getSocket().getPoller().getSelector());
-if (read) {
-this.interestOps(this.interestOps() | SelectionKey.OP_READ);
-key.interestOps(key.interestOps() | SelectionKey.OP_READ);
-}
-
svn commit: r1655285 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: markt
Date: Wed Jan 28 12:47:03 2015
New Revision: 1655285
URL: http://svn.apache.org/r1655285
Log:
Fix (very) theoretical timing issue.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1655285&r1=1655284&r2=1655285&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
Jan 28 12:47:03 2015
@@ -1090,8 +1090,9 @@ public abstract class AbstractHttp11Proc
}
if (!disableUploadTimeout) {
-if(endpoint.getSoTimeout() > 0) {
-setSocketTimeout(endpoint.getSoTimeout());
+int soTimeout = endpoint.getSoTimeout();
+if(soTimeout > 0) {
+setSocketTimeout(soTimeout);
} else {
setSocketTimeout(0);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1655284 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java AbstractHttp11Protocol.java Http11Nio2Processor.java Http11NioProcessor.java
Author: markt
Date: Wed Jan 28 12:46:59 2015
New Revision: 1655284
URL: http://svn.apache.org/r1655284
Log:
AbstractHttp11Processor is already obtaining the keep-alive timeout
directly from the Endpoint in some places so refactor to obtain it this
way consistently.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1655284&r1=1655283&r2=1655284&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
Jan 28 12:46:59 2015
@@ -161,11 +161,6 @@ public abstract class AbstractHttp11Proc
*/
protected int maxKeepAliveRequests = -1;
-/**
- * The number of seconds Tomcat will wait for a subsequent request
- * before closing the connection.
- */
-protected int keepAliveTimeout = -1;
/**
* Maximum timeout on uploads. 5 minutes as in Apache HTTPD server.
@@ -427,21 +422,6 @@ public abstract class AbstractHttp11Proc
return maxKeepAliveRequests;
}
-/**
- * Set the Keep-Alive timeout.
- */
-public void setKeepAliveTimeout(int timeout) {
-keepAliveTimeout = timeout;
-}
-
-
-/**
- * Return the number Keep-Alive timeout.
- */
-public int getKeepAliveTimeout() {
-return keepAliveTimeout;
-}
-
/**
* Set the maximum size of a POST which will be buffered in SSL mode.
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1655284&r1=1655283&r2=1655284&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Jan 28 12:46:59 2015
@@ -217,7 +217,6 @@ public abstract class AbstractHttp11Prot
protected void configureProcessor(AbstractHttp11Processor processor) {
processor.setAdapter(getAdapter());
processor.setMaxKeepAliveRequests(getMaxKeepAliveRequests());
-processor.setKeepAliveTimeout(getKeepAliveTimeout());
processor.setConnectionUploadTimeout(getConnectionUploadTimeout());
processor.setDisableUploadTimeout(getDisableUploadTimeout());
processor.setCompressionMinSize(getCompressionMinSize());
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1655284&r1=1655283&r2=1655284&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Wed Jan
28 12:46:59 2015
@@ -81,13 +81,12 @@ public class Http11Nio2Processor extends
protected void resetTimeouts() {
if (!getErrorState().isError() && socketWrapper != null &&
asyncStateMachine.isAsyncDispatching()) {
-long soTimeout = endpoint.getSoTimeout();
-//reset the timeout
+// Reset the timeout
if (keepAlive) {
-socketWrapper.setTimeout(keepAliveTimeout);
+socketWrapper.setTimeout(endpoint.getKeepAliveTimeout());
} else {
-socketWrapper.setTimeout(soTimeout);
+socketWrapper.setTimeout(endpoint.getSoTimeout());
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1655284&r1=1655283&r2=1655284&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Jan
28 12:46:59 2015
@@ -68,13 +68,12 @@ public class Http11NioProcessor extends
final NioEndpoint.NioSocketWrapper attach =
(NioEndpoint.NioSocketWrapper)socketWrapper.getSocket().getAttachment();
if (!getErrorState().isError() && attach != null &&
asyncStateMachine.isAsyncDispatching()) {
-long soTimeout = endpoint.getSoTimeout()
svn commit: r1655272 - in /tomcat/trunk/java/org/apache: coyote/http11/Http11Nio2Protocol.java tomcat/util/net/Nio2Endpoint.java
Author: remm
Date: Wed Jan 28 12:11:54 2015
New Revision: 1655272
URL: http://svn.apache.org/r1655272
Log:
Cleanup and simplify.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1655272&r1=1655271&r2=1655272&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed Jan
28 12:11:54 2015
@@ -161,7 +161,7 @@ public class Http11Nio2Protocol extends
((Nio2Endpoint) proto.getEndpoint()).removeTimeout(socket);
}
if (addToPoller) {
-((Nio2Endpoint) proto.getEndpoint()).awaitBytes(socket);
+((Nio2SocketWrapper) socket).awaitBytes();
}
}
@@ -191,7 +191,7 @@ public class Http11Nio2Protocol extends
} else if (processor.isUpgrade()) {
if (((Nio2SocketWrapper) socket).isUpgradeInit()) {
try {
-((Nio2Endpoint)
proto.getEndpoint()).awaitBytes(socket);
+((Nio2SocketWrapper) socket).awaitBytes();
} catch (ReadPendingException e) {
// Ignore, the initial state after upgrade is
// impossible to predict, and a read must be pending
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1655272&r1=1655271&r2=1655272&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Jan 28
12:11:54 2015
@@ -1261,13 +1261,11 @@ public class Nio2Endpoint extends Abstra
@Override
public void registerReadInterest() {
synchronized (readCompletionHandler) {
-if (readPending.tryAcquire()) {
-readPending.release();
-
+if (readPending.availablePermits() == 0) {
+readInterest = true;
+} else {
// If no read is pending, notify
getEndpoint().processSocket(this, SocketStatus.OPEN_READ,
true);
-} else {
-readInterest = true;
}
}
}
@@ -1359,13 +1357,6 @@ public class Nio2Endpoint extends Abstra
}
}
-public void awaitBytes(SocketWrapperBase socket) {
-if (socket == null) {
-return;
-}
-((Nio2SocketWrapper) socket).awaitBytes();
-}
-
private CompletionHandler sendfile = new
CompletionHandler() {
@Override
@@ -1388,7 +1379,7 @@ public class Nio2Endpoint extends Abstra
}
if (attachment.keepAlive) {
if (!isInline()) {
-awaitBytes(attachment.socket);
+attachment.socket.awaitBytes();
} else {
attachment.doneInline = true;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1654487 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
2015-01-28 11:41 GMT+03:00 Mark Thomas : >> 2015-01-24 13:00 GMT+03:00 : >>> Author: markt >>> Date: Sat Jan 24 10:00:32 2015 >>> New Revision: 1654487 >>> >>> URL: http://svn.apache.org/r1654487 >>> Log: Prep for next tag > [...] I really like this idea, if for no other reason than the changelog often doesn't get updated with the latest release date until the *following* release, which is ... irritating. :) >>> >>> No easy way to fix that. >> >> If we have marker text that means "in development", we can re-build the >> site from svn trunk whenever we want and we can even remove the "in >> development" builds if we want. > > But the web site is meant to be the docs for the latest released version. > > What I'd really like to do is get the release date into the actual > release but that requires a crystal ball as to whether or not the VOTE > will pass and when. > > If we changed that date from "release date" to "tagged date" (or some > better name) we could set the date when we do the tag - that would be a > lot nicer. rtext="tagged 2015-01-28", and change it into release date or "not released" afterwards. It is possible to use both dates, but I think it looks ugly, maybe except the "not released" use case, rtext="tagged 2015-01-28, not released", rtext="tagged 2015-01-28, released 2015-02-05", rtext="tagged 2015-01-28, beta 2015-02-05", Tag dates are useful when looking into git changelog (that does not have svn tags). Release dates are used in our board reports, and generally useful for the public. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55536] allow to disable Secure Client-Initiated Renegotiation in Java TLS - DOS risk
https://issues.apache.org/bugzilla/show_bug.cgi?id=55536
--- Comment #4 from Ralf Hauser ---
with java8, a per Ivan Ristic's excellent article
http://blog.ivanristic.com/2014/03/ssl-tls-improvements-in-java-8.html,
adding somewhere even in your application code
System.setProperty("jdk.tls.rejectClientInitiatedRenegotiation", "true");
appears to have the same effect, albeit not thread-safe, but on a jvm-wide
level.
--
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: r1655259 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Wed Jan 28 10:32:54 2015 New Revision: 1655259 URL: http://svn.apache.org/r1655259 Log: Mark 7.0.58 as "not released" Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1655259&r1=1655258&r2=1655259&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 28 10:32:54 2015 @@ -66,7 +66,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57472] performance (classloader?) problems with signed jars in WEB-INF/lib
https://issues.apache.org/bugzilla/show_bug.cgi?id=57472 --- Comment #8 from ole.schulz-hildebra...@ppimedia.de --- thanks for the fast fix of this issue :-) Startup with tomcat 8.0.x trunk is as fast as tomcat 7 now. Do I have to close this bug or is that done by you? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.58
2015-01-26 16:54 GMT+02:00 Violeta Georgieva : > > The proposed Apache Tomcat 7.0.58 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.58/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1031/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_58/ > > The proposed 7.0.58 release is: > [X] Broken - do not release > [ ] Stable - go ahead and release as 7.0.58 Stable I'm canceling the vote because of the regression in JspC I will prepare 7.0.59 for voting in an hour > Regards, > Violeta
svn commit: r1655242 - /tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
Author: markt
Date: Wed Jan 28 09:06:43 2015
New Revision: 1655242
URL: http://svn.apache.org/r1655242
Log:
Use the constant
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java?rev=1655242&r1=1655241&r2=1655242&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java Wed
Jan 28 09:06:43 2015
@@ -111,7 +111,7 @@ public class TesterFirehoseServer {
System.out.println("Received " + msg + ", now sending data");
session.getUserProperties().put(
-"org.apache.tomcat.websocket.BLOCKING_SEND_TIMEOUT",
+WsRemoteEndpointImplBase.BLOCKING_SEND_TIMEOUT_PROPERTY,
Long.valueOf(SEND_TIME_OUT_MILLIS));
Basic remote = session.getBasicRemote();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57472] performance (classloader?) problems with signed jars in WEB-INF/lib
https://issues.apache.org/bugzilla/show_bug.cgi?id=57472 --- Comment #7 from Andrei Costescu --- Thank you! :) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1654487 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
On 26/01/2015 22:19, Christopher Schultz wrote: > Mark, > Mark, > > On 1/26/15 2:41 PM, Mark Thomas wrote: >> On 26/01/2015 15:31, Christopher Schultz wrote: >>> Mark, >>> >>> On 1/26/15 3:31 AM, Mark Thomas wrote: On 24/01/2015 19:21, Konstantin Kolinko wrote: > 2015-01-24 13:00 GMT+03:00 : >> Author: markt >> Date: Sat Jan 24 10:00:32 2015 >> New Revision: 1654487 >> >> URL: http://svn.apache.org/r1654487 >> Log: >> Prep for next tag >> >> Modified: >> tomcat/tc8.0.x/trunk/build.properties.default >> tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default >> tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml >> > >> Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1654487&r1=1654486&r2=1654487&view=diff >> == >> --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) >> +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Jan 24 10:00:32 >> 2015 >> @@ -44,7 +44,9 @@ >>They eventually become mixed with the numbered issues. (I.e., numbered >>issues to not "pop up" wrt. others). >> --> >> - >> + > > 1. Typo: in development Fixed. Thanks. > 2. An interesting idea, but release manager would have to remove that > text when creating a tag. If you do not mind that extra work, then an > item should be added to Release process description in the Wiki. I'll see how I get on with it. It was a spur of the moment thing so I might go off the idea. >>> >>> Assuming I'm reading that correctly, it implies that we might be >>> publishing changelogs *before* a release has actually been rolled. >> >> It is mainly there for folks that look at the file in svn or on the CI >> server. >> >>> I >>> really like this idea, if for no other reason than the changelog often >>> doesn't get updated with the latest release date until the *following* >>> release, which is ... irritating. :) >> >> No easy way to fix that. > > If we have marker text that means "in development", we can re-build the > site from svn trunk whenever we want and we can even remove the "in > development" builds if we want. But the web site is meant to be the docs for the latest released version. What I'd really like to do is get the release date into the actual release but that requires a crystal ball as to whether or not the VOTE will pass and when. If we changed that date from "release date" to "tagged date" (or some better name) we could set the date when we do the tag - that would be a lot nicer. >>> What about having instead of "release text" or whatever, maybe an ENUM >>> which contains a few mnemonics like "dev", "release", "votefail", etc.? >>> That can be validated by an XML validator and the XSLT can produce >>> standardized text for each status. >> >> Not sure how that would help with the most important part which is the date. > > Good point. Do you not use a release script that does that for you? Nope. I do that manually as part of the version number changes when updating for the next release. (It would take me far longer to write and test a reliable script than it does to just do the update manually). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57509] maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException
https://issues.apache.org/bugzilla/show_bug.cgi?id=57509 Remy Maucherat changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX OS||All --- Comment #1 from Remy Maucherat --- The exception corresponds to what is actually occurring, so it looks fine to me as is. -- 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 57509] New: maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException
https://issues.apache.org/bugzilla/show_bug.cgi?id=57509 Bug ID: 57509 Summary: maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException Product: Tomcat 8 Version: 8.0.18 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: yklovej...@163.com Modify the server.xml, add the maxHttpHeaderSize attribute: I deliberately modify the maxHttpHeaderSize to a small value, then I make a normal request, Sure, the request header is more than 24 bytes. Then the server is report following error: 28-Jan-2015 16:08:01.870 SEVERE [http-nio-8080-exec-1] org.apache.coyote.http11.AbstractHttp11Processor.endRequest Error finishing response java.lang.ArrayIndexOutOfBoundsException: 24 at org.apache.coyote.http11.AbstractOutputBuffer.sendStatus(AbstractOutputBuffer.java:445) at org.apache.coyote.http11.AbstractHttp11Processor.prepareResponse(AbstractHttp11Processor.java:1554) at org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:739) at org.apache.coyote.Response.action(Response.java:179) ... Is not check the maxHttpHeaderSize? Normal circumstances, it's should response 413-request entity is too large. I think this is better and reasonable. -- 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
