svn commit: r957098 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt conf/catalina.policy webapps/docs/changelog.xml webapps/docs/security-manager-howto.xml
Author: kkolinko
Date: Wed Jun 23 02:11:20 2010
New Revision: 957098
URL: http://svn.apache.org/viewvc?rev=957098&view=rev
Log:
Additional patch that amends BZ 49213 fix
The Manager is in ${catalina.base}
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/catalina.policy
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 23 02:11:20 2010
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,79
svn commit: r957044 - /tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
Author: markt Date: Tue Jun 22 21:44:17 2010 New Revision: 957044 URL: http://svn.apache.org/viewvc?rev=957044&view=rev Log: Fix some old copy/paste errors Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/web.xml?rev=957044&r1=957043&r2=957044&view=diff == --- tomcat/trunk/webapps/host-manager/WEB-INF/web.xml (original) +++ tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Tue Jun 22 21:44:17 2010 @@ -23,18 +23,12 @@ version="3.0" metadata-complete="true"> - Tomcat Manager Application + Tomcat Host Manager Application -A scriptable management web application for the Tomcat Web Server; - Manager lets you view, load/unload/etc particular web applications. +A scriptable host management web application for the Tomcat Web Server; + Manager lets you view, create and remove virual hosts. - HostManager org.apache.catalina.manager.host.HostManagerServlet - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49230] sun.net.www.http.KeepAliveCache preventing classloader from being garbage collected
https://issues.apache.org/bugzilla/show_bug.cgi?id=49230 --- Comment #2 from sylvain.laur...@gmail.com 2010-06-22 15:36:52 EDT --- IMHO, logging an error if the class is not found might induce some users of non-Sun JVMs in error... an INFO level is probably enough, with a message explaining that it might be normal with some JVMs. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956984 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jun 22 19:18:51 2010 New Revision: 956984 URL: http://svn.apache.org/viewvc?rev=956984&view=rev Log: Add fix of 49475 Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=956984&r1=956983&r2=956984&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 22 19:18:51 2010 @@ -98,6 +98,10 @@ 49436: Correct documented default for readonly attribute of the UserDatabase component. (markt) + +49475: Use new role name for manager application access on +the ROOT web application's index page. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49475] Welcome page mentions obsolete role name
https://issues.apache.org/bugzilla/show_bug.cgi?id=49475 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-06-22 15:17:39 EDT --- Fixed. Will be in 7.0.1 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956983 - /tomcat/trunk/webapps/ROOT/index.html
Author: markt Date: Tue Jun 22 19:17:08 2010 New Revision: 956983 URL: http://svn.apache.org/viewvc?rev=956983&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49475 Use new role name for manager app access Modified: tomcat/trunk/webapps/ROOT/index.html Modified: tomcat/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.html?rev=956983&r1=956982&r2=956983&view=diff == --- tomcat/trunk/webapps/ROOT/index.html (original) +++ tomcat/trunk/webapps/ROOT/index.html Tue Jun 22 19:17:08 2010 @@ -154,7 +154,7 @@ As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: $CATALINA_HOME/webapps/ROOT/index.html where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. -NOTE: For security reasons, using the manager webapp is restricted to users with role "manager". +NOTE: For security reasons, using the manager webapp is restricted to users with role "manager-gui". Users are defined in: $CATALINA_HOME/conf/tomcat-users.xml Included with this release are a host of sample Servlets and JSPs (with associated source code), extensive documentation, and an introductory guide to developing web applications. Tomcat mailing lists are available at the Tomcat project web site: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956964 - in /tomcat/trunk/webapps: ROOT/index.html docs/changelog.xml
Author: markt Date: Tue Jun 22 17:52:40 2010 New Revision: 956964 URL: http://svn.apache.org/viewvc?rev=956964&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=49122 Update ROOT's index page Patch provided by pid Modified: tomcat/trunk/webapps/ROOT/index.html tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.html?rev=956964&r1=956963&r2=956964&view=diff == --- tomcat/trunk/webapps/ROOT/index.html (original) +++ tomcat/trunk/webapps/ROOT/index.html Tue Jun 22 17:52:40 2010 @@ -22,192 +22,155 @@ Apache Tomcat /**/ - +/*]]>*/ + - - - - http://tomcat.apache.org/";> - - - - Apache Tomcat @VERSION@ - -http://www.apache.org/";> - - - - - - - - - - - - - - Administration - - - - Status -Tomcat Manager - - - - - - - - - Documentation - - - -Release Notes -Change Log -Tomcat Documentation - - - - - - - - - Tomcat Online - - - -http://tomcat.apache.org/";>Home Page - http://tomcat.apache.org/faq/";>FAQ -http://tomcat.apache.org/bugreport.html";>Bug Database -http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&resolution=LATER&resolution=REMIND&resolution=---&bugidtype=include&product=Tomcat+6&cmdtype=doit&order=Importance";>Open Bugs -http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Users Mailing List -http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>Developers Mailing List -IRC - -
DO NOT REPLY [Bug 49122] Update of ROOT application index.html
https://issues.apache.org/bugzilla/show_bug.cgi?id=49122 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2010-06-22 13:52:58 EDT --- Thanks. Patch applied. Will be in 7.0.1 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956958 - /tomcat/trunk/build.properties.default
Author: markt Date: Tue Jun 22 17:24:53 2010 New Revision: 956958 URL: http://svn.apache.org/viewvc?rev=956958&view=rev Log: Update version number Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=956958&r1=956957&r2=956958&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Tue Jun 22 17:24:53 2010 @@ -27,7 +27,7 @@ # - Vesion Control Flags - version.major=7 version.minor=0 -version.build=0 +version.build=1 version.patch=0 version.suffix=-dev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956937 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Tue Jun 22 16:10:34 2010
New Revision: 956937
URL: http://svn.apache.org/viewvc?rev=956937&view=rev
Log:
vote
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=956937&r1=956936&r2=956937&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 22 16:10:34 2010
@@ -130,7 +130,7 @@ PATCHES PROPOSED TO BACKPORT:
of "long time".
2) I see no way to turn off this feature or filter the output.
- Additional patch related to
+* Additional patch related to
https://issues.apache.org/bugzilla/show_bug.cgi?id=49213
The Manager is in ${catalina.base}.
http://svn.apache.org/viewvc?view=revision&revision=955655
@@ -150,7 +150,29 @@ PATCHES PROPOSED TO BACKPORT:
protection.
http://people.apache.org/~markt/patches/2010-06-20-crsf-prevention-filter-tc6.patch
+1: markt
- -1:
+ -1: kkolinko: (
+ minor: - s/Tomact/Tomcat/ in several comments
+ - @author xxd in FilterBase.java
+ - In CsrfPreventionFilter.setEntryPoints(String) maybe do trimming
of the strings,
+this.entryPoints.add(value.trim());
+ major:
+ Running with a user that has role manager-gui.
+ 1. Sessions list page does not work.
+Cannot see session detail, cannot invalidate a session.
+It is similar to BZ 49476 of TC7.
+
+This issue also occurs for the user with role "manager". Maybe
+allow the filter to skip its check if the user has certain role?
+
+ 2. Showing the standard "error 403" page without any explanation is rude.
+ 3. I cannot access the Server Status page. This differs with TC7, where
+ all "manager-*" roles have access to /status/*
+ 4. I cannot access the following URL, which worked in TC 6.0.26:
+http://localhost:8080/manager/html/
+ The filter prevents access to it.
+ The following URL works:
+http://localhost:8080/manager/html
+ )
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49230
Additional JRE leak protection. HttpClient keep-alive thread
@@ -158,3 +180,5 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=956832&view=rev
+1: markt, kfujino
-1:
+ kkolinko: +1 if it is off by default, +0 otherwise, because handling of
+ non-Sun JREs should be improved here.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49488] Infrequent StringIndexOutOfBoundsException in WebappClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=49488
Konstantin Kolinko changed:
What|Removed |Added
Status|NEW |NEEDINFO
--- Comment #2 from Konstantin Kolinko 2010-06-22
10:35:31 EDT ---
It is very strange. The code in RequestUtil.normalize() is
126 // Resolve occurrences of "//" in the normalized path
127 while (true) {
128 int index = normalized.indexOf("//");
129 if (index < 0)
130 break;
131 normalized = normalized.substring(0, index) +
132 normalized.substring(index + 1);
133 }
I do not see how it can break.
1. What exact version of Java are you using? Is it 32-bit, or 64-bit?
2. What exact version of Tomcat 5.5.x were you using before?
3. Is this error reproducible, or it happens randomly?
4. Do you have any clue about what class it tried to load?
Note, that it is possible to turn on debug logging in WebappClassLoader class,
by adding the following line to conf/logging.properties:
org.apache.catalina.loader.WebappClassLoader.level=FINE
The code that fails is triggered only if the class file path contains a '//'.
Having a double slash there is unusual. So maybe it is not Tomcat version
change that triggers this, but how you web application is deployed.
By the way, Tomcat 6.0.27 is already available for testing. See a [VOTE] thread
on dev@ list.
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 44454] busy count reported in mod_jk inflated, causes incorrect balancing
https://issues.apache.org/bugzilla/show_bug.cgi?id=44454 --- Comment #24 from Sebb 2010-06-22 08:00:29 EDT --- Oops, sorry! Though a JVM is not involved here, increment still requires two separate memory operations. BTW, shared memory can behave very unexpectedly - e.g. writes by one CPU may appear out of order to another CPU unless appropriate instructions (memory barriers) are used. This is in addition to the problems caused by interleaved reads/writes, which can affect arithmetic operations potentially even on a single CPU system. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49424] Using URL.ChunkedStreamingMode results in HTTP response code: 405
https://issues.apache.org/bugzilla/show_bug.cgi?id=49424 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas 2010-06-22 07:55:40 EDT --- The fix has been applied 5.5.x and will be included in 5.5.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956856 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/catalina/src/share/org/apache/catalina/connector/Request.java container/webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 22 11:53:26 2010
New Revision: 956856
URL: http://svn.apache.org/viewvc?rev=956856&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49424
Avoid NPE if client provides no data with a chunked POST request
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956856&r1=956855&r2=956856&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 11:53:26 2010
@@ -59,10 +59,3 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=955190
+1: kfujino
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49424
- Avoid NPE if client provides no data with a chunked POST request
- http://svn.apache.org/viewvc?rev=953434&view=rev
- (by markt)
- +1: kkolinko, markt, kfujino
- -1:
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java?rev=956856&r1=956855&r2=956856&view=diff
==
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/connector/Request.java
Tue Jun 22 11:53:26 2010
@@ -2461,7 +2461,9 @@ public class Request
}
return;
}
-parameters.processParameters(formData, 0, formData.length);
+if (formData != null) {
+parameters.processParameters(formData, 0, formData.length);
+}
}
}
@@ -2507,6 +2509,9 @@ public class Request
body.append(buffer, 0, len);
}
}
+if (body.getLength() == 0) {
+return null;
+}
if (body.getLength() < body.getBuffer().length) {
int length = body.getLength();
byte[] result = new byte[length];
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=956856&r1=956855&r2=956856&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jun 22
11:53:26 2010
@@ -95,6 +95,10 @@
Fix possible overflows when calculating session statistics. (kkolinko)
+
+49424: Avoid NPE if client provides no data with a chunked
+POST request. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49488] Infrequent StringIndexOutOfBoundsException in WebappClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=49488 --- Comment #1 from bratapfe...@gmx.de 2010-06-22 07:31:52 EDT --- I may note that the exception occurs after tomcat start up has finished. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 44454] busy count reported in mod_jk inflated, causes incorrect balancing
https://issues.apache.org/bugzilla/show_bug.cgi?id=44454 --- Comment #23 from Mark Thomas 2010-06-22 07:29:39 EDT --- (In reply to comment #22) > At the risk of stating the obvious: Interesting but irrelevant. This is httpd module code, not Java code. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 44454] busy count reported in mod_jk inflated, causes incorrect balancing
https://issues.apache.org/bugzilla/show_bug.cgi?id=44454 --- Comment #22 from Sebb 2010-06-22 07:26:05 EDT --- At the risk of stating the obvious: 32 bit reads and writes are guaranteed atomic by the JVM. However, an arithmetic operation (e.g. increment) requires two operations: read and then write, and another thread can write the field between the two atomic operations. 64 bit reads and writes are not even guaranteed atomic. This was to allow for systems that did not have 64 bit operations, which therefore had to perform 2 off 32-bit operations. (Note: they probably are atomic on most modern systems, depending on the alignment). Adding volatile makes 64 bit reads and writes atomic, but does not protect multiple operations such as increment. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49488] New: Infrequent StringIndexOutOfBoundsException in WebappClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=49488 Summary: Infrequent StringIndexOutOfBoundsException in WebappClassLoader Product: Tomcat 6 Version: 6.0.24 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: bratapfe...@gmx.de After switching from Tomcat 5.5 to Tomcat 6.0.24, every now and then Tomcat's WebappClassLoader throws StringIndexOutOfBoundsExceptions, which leads to various exceptions like NoDefClassFoundError. With Tomcat 5.5, everything went fine. The web application in which the exceptions occur remained untouched throughout the whole time. The error is also present in Tomcat 6.0.26. Here is a short stack trace from the Catalina log file: java.lang.StringIndexOutOfBoundsException: String index out of range: 95 at java.lang.String.substring(String.java:1934) at org.apache.catalina.util.RequestUtil.normalize(RequestUtil.java:131) at org.apache.naming.resources.FileDirContext.normalize(FileDirContext.java:771) at org.apache.naming.resources.FileDirContext.file(FileDirContext.java:809) at org.apache.naming.resources.FileDirContext.getAttributes(FileDirContext.java:429) at org.apache.naming.resources.BaseDirContext.getAttributes(BaseDirContext.java:747) at org.apache.naming.resources.ProxyDirContext.getAttributes(ProxyDirContext.java:840) at org.apache.catalina.loader.WebappClassLoader.findResourceInternal(WebappClassLoader.java:2414) at org.apache.catalina.loader.WebappClassLoader.findClassInternal(WebappClassLoader.java:2266) at org.apache.catalina.loader.WebappClassLoader.findClass(WebappClassLoader.java:976) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1451) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1329) at java.lang.Class.getDeclaredClasses0(Native Method) at java.lang.Class.getDeclaredClasses(Class.java:1699) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49487] Angosso Siteweb Inc.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 Roger Mbiama Assogo changed: What|Removed |Added Status|NEW |RESOLVED URL||http://angosso.net/. CC||cont...@angosso.net Platform|Other |All Resolution||FIXED -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49487] New: Angosso Siteweb Inc.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49487 Summary: Angosso Siteweb Inc. Product: Tomcat Connectors Version: unspecified Platform: Other OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: cont...@angosso.net Created an attachment (id=25628) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25628) angosso.jpg 1 1 Internet212.227.231.169Linux Apache/2.2.11 Unix mod_ssl/2.2.11 OpenSSL/0.9.8c DAV/2 mod_jk/1.2.28 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956846 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kfujino Date: Tue Jun 22 10:43:58 2010 New Revision: 956846 URL: http://svn.apache.org/viewvc?rev=956846&view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956846&r1=956845&r2=956846&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 10:43:58 2010 @@ -64,5 +64,5 @@ PATCHES PROPOSED TO BACKPORT: Avoid NPE if client provides no data with a chunked POST request http://svn.apache.org/viewvc?rev=953434&view=rev (by markt) - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956845 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino
Date: Tue Jun 22 10:43:23 2010
New Revision: 956845
URL: http://svn.apache.org/viewvc?rev=956845&view=rev
Log:
vote
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=956845&r1=956844&r2=956845&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 22 10:43:23 2010
@@ -134,7 +134,7 @@ PATCHES PROPOSED TO BACKPORT:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49213
The Manager is in ${catalina.base}.
http://svn.apache.org/viewvc?view=revision&revision=955655
- +1: kkolinko, markt
+ +1: kkolinko, markt, kfujino
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443
@@ -156,5 +156,5 @@ PATCHES PROPOSED TO BACKPORT:
Additional JRE leak protection. HttpClient keep-alive thread
Patch by Rob Kooper
http://svn.apache.org/viewvc?rev=956832&view=rev
- +1: markt
+ +1: markt, kfujino
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49445] After session ID is changed on authentication, the session replication does not work.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49445 Keiichi Fujino changed: What|Removed |Added Component|Cluster |Catalina:Cluster Version|unspecified |5.5.29 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49445] After session ID is changed on authentication, the session replication does not work.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49445 --- Comment #4 from Keiichi Fujino 2010-06-22 06:14:53 EDT --- This fix applied to 6.0, will be in 6.0.28 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956838 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/session/ webapps/docs/
Author: kfujino
Date: Tue Jun 22 10:09:14 2010
New Revision: 956838
URL: http://svn.apache.org/viewvc?rev=956838&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49445
The change in session ID is notified to other node.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessage.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=956838&r1=956837&r2=956838&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 22 10:09:14 2010
@@ -137,12 +137,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49445
- The change in session ID is notified to other node.
- http://svn.apache.org/viewvc?view=revision&revision=955190
- +1: kfujino, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443
Use remoteIpHeader rather then remoteIPHeader consistently
http://people.apache.org/~markt/patches/2010-06-18-bug49443-tc6.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=956838&r1=956837&r2=956838&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Tue Jun 22 10:09:14 2010
@@ -133,22 +133,23 @@ public class DeltaManager extends Cluste
private long sessionReplaceCounter = 0 ;
long processingTime = 0;
private long counterReceive_EVT_GET_ALL_SESSIONS = 0 ;
-private long counterSend_EVT_ALL_SESSION_DATA = 0 ;
private long counterReceive_EVT_ALL_SESSION_DATA = 0 ;
private long counterReceive_EVT_SESSION_CREATED = 0 ;
private long counterReceive_EVT_SESSION_EXPIRED = 0;
private long counterReceive_EVT_SESSION_ACCESSED = 0 ;
private long counterReceive_EVT_SESSION_DELTA = 0;
+private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
+private long counterReceive_EVT_CHANGE_SESSION_ID = 0 ;
private long counterSend_EVT_GET_ALL_SESSIONS = 0 ;
+private long counterSend_EVT_ALL_SESSION_DATA = 0 ;
private long counterSend_EVT_SESSION_CREATED = 0;
private long counterSend_EVT_SESSION_DELTA = 0 ;
private long counterSend_EVT_SESSION_ACCESSED = 0;
private long counterSend_EVT_SESSION_EXPIRED = 0;
private int counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
-private int counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE = 0 ;
+private long counterSend_EVT_CHANGE_SESSION_ID = 0;
private int counterNoStateTransfered = 0 ;
-
// -
Constructor
public DeltaManager() {
super();
@@ -224,7 +225,14 @@ public class DeltaManager extends Cluste
public int getCounterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE() {
return counterSend_EVT_ALL_SESSION_TRANSFERCOMPLETE;
}
-
+
+/**
+ * @return Returns the counterSend_EVT_CHANGE_SESSION_ID.
+ */
+public long getCounterSend_EVT_CHANGE_SESSION_ID() {
+return counterSend_EVT_CHANGE_SESSION_ID;
+}
+
/**
* @return Returns the counterReceive_EVT_ALL_SESSION_DATA.
*/
@@ -274,6 +282,13 @@ public class DeltaManager extends Cluste
public int getCounterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE() {
return counterReceive_EVT_ALL_SESSION_TRANSFERCOMPLETE;
}
+
+/**
+ * @return Returns the counterReceive_EVT_CHANGE_SESSION_ID.
+ */
+public long getCounterReceive_EVT_CHANGE_SESSION_ID() {
+return counterReceive_EVT_CHANGE_SESSION_ID;
+}
/**
* @return Returns the processingTime.
@@ -605,6 +620,65 @@ public class DeltaManager extends Cluste
}
/**
+ * Change the session ID of the current session to a new randomly generated
+ * session ID.
+ *
+ * @param session The session to change the session ID for
+ */
+@Override
+public void changeSessionId(Session session) {
+changeSessionId(session, true);
+}
+
+public void changeSessionId(Session session, boolean notify) {
+// original sessionID
+String orgSessionID = session.getId();
+
DO NOT REPLY [Bug 46115] Cannot deploy without specifying "Context Path"
https://issues.apache.org/bugzilla/show_bug.cgi?id=46115 Mark Thomas changed: What|Removed |Added CC||anomaly...@gmail.com --- Comment #3 from Mark Thomas 2010-06-22 05:41:09 EDT --- *** Bug 49451 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49451] Incorrect label on 'Context Path' when provisioning a new app
https://issues.apache.org/bugzilla/show_bug.cgi?id=49451 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #2 from Mark Thomas 2010-06-22 05:41:08 EDT --- This was fixed in 6.0.19 onwards. *** This bug has been marked as a duplicate of bug 46115 *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49230] sun.net.www.http.KeepAliveCache preventing classloader from being garbage collected
https://issues.apache.org/bugzilla/show_bug.cgi?id=49230 --- Comment #1 from Mark Thomas 2010-06-22 05:25:02 EDT --- Thanks for the patch. It has been applied to 7.0.x and will be included in 7.0.1 onwards. I have also proposed the patch for back-port to to 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956834 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jun 22 09:24:29 2010 New Revision: 956834 URL: http://svn.apache.org/viewvc?rev=956834&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=956834&r1=956833&r2=956834&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 22 09:24:29 2010 @@ -157,3 +157,10 @@ PATCHES PROPOSED TO BACKPORT: http://people.apache.org/~markt/patches/2010-06-20-crsf-prevention-filter-tc6.patch +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49230 + Additional JRE leak protection. HttpClient keep-alive thread + Patch by Rob Kooper + http://svn.apache.org/viewvc?rev=956832&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956832 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml
Author: markt
Date: Tue Jun 22 09:21:25 2010
New Revision: 956832
URL: http://svn.apache.org/viewvc?rev=956832&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49230
Enhance JRE leak prevention listener with protection for the keep-alive thread
started by sun.net.www.http.HttpClient
Patch provided by Rob Kooper.
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/listeners.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=956832&r1=956831&r2=956832&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Tue Jun 22 09:21:25 2010
@@ -80,6 +80,19 @@ public class JreMemoryLeakPreventionList
this.gcDaemonProtection = gcDaemonProtection;
}
+ /**
+ * Protect against the memory leak caused when the first call to
+ * sun.net.www.http.HttpClient is triggered by a web
+ * application. This first call will start a KeepAlive thread with the
+ * thread's context class loader configured to be the web application
class
+ * loader. Defaults to true.
+ */
+ private boolean keepAliveProtection = true;
+ public boolean isKeepAliveProtection() { return keepAliveProtection; }
+ public void setKeepAliveProtection(boolean keepAliveProtection) {
+ this.keepAliveProtection = keepAliveProtection;
+ }
+
/**
* Protect against the memory leak, when the initialization of the
* Java Cryptography Architecture is triggered by initializing
@@ -177,6 +190,21 @@ public class JreMemoryLeakPreventionList
log.error(sm.getString("jreLeakListener.gcDaemonFail"), e);
}
}
+
+/*
+ * When a servlet opens a connection using a URL it will use
+ * sun.net.www.http.HttpClient which keeps a static reference to a
+ * keep-alive cache which is loaded using the web application class
+ * loader.
+ */
+if (keepAliveProtection) {
+try {
+Class.forName("sun.net.www.http.HttpClient");
+} catch (ClassNotFoundException e) {
+log.error("Could not prevent sun.net.www.http.HttpClient" +
+ " from being loaded.", e);
+}
+}
/*
* Creating a MessageDigest during web application startup
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=956832&r1=956831&r2=956832&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 22 09:21:25 2010
@@ -55,6 +55,12 @@
Add entryPoint support to the CSRF prevention filter. (markt)
+
+49230: Enhance JRE leak prevention listener with protection
+for the keep-alive thread started by
+sun.net.www.http.HttpClient. Patch provided by Rob Kooper.
+(markt)
+
Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=956832&r1=956831&r2=956832&view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Tue Jun 22 09:21:25 2010
@@ -260,6 +260,16 @@ service:jmx:rmi://:10002
startup on non-Sun JVMs. The default is true.
+
+Enables protection so that the KeepAlive thread started by
+sun.net.www.http.HttpClient does not result in a memory
+leak. The thread is started the first time the HttpClient
+class is used. Without this protection, if a web application uses this
+class the KeepAlive thread will be configured with the thread's context
+class loader set to the web application class loader which in turn will
+trigger a memory leak on reload. Defaults to true.
+
+
Enables protection so that any token poller thread initialized by
sun.security.pkcs11.SunPKCS11.initToken() does not
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956829 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Tue Jun 22 09:07:19 2010 New Revision: 956829 URL: http://svn.apache.org/viewvc?rev=956829&view=rev Log: 3rd vote for two issues. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=956829&r1=956828&r2=956829&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 22 09:07:19 2010 @@ -140,13 +140,13 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49445 The change in session ID is notified to other node. http://svn.apache.org/viewvc?view=revision&revision=955190 - +1: kfujino, markt + +1: kfujino, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443 Use remoteIpHeader rather then remoteIPHeader consistently http://people.apache.org/~markt/patches/2010-06-18-bug49443-tc6.patch - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Backport the CSRF prevention filter to Tomcat 6 and configure the Manager and - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true
https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #13 from Mark Thomas 2010-06-22 05:05:04 EDT --- This has been fixed in 5.5.x and will be included in 5.5.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956826 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.xml container/webapps/docs/changelog.xml
Author: markt Date: Tue Jun 22 09:04:20 2010 New Revision: 956826 URL: http://svn.apache.org/viewvc?rev=956826&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990#c11 Do not omit exe and dll files in release builds built on Unixes, to align them with the official ones built on Windows. Add support for "skip.installer" property. Patch by kkolinko. Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/build/build.xml tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956826&r1=956825&r2=956826&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 09:04:20 2010 @@ -54,14 +54,6 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=749019 -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990#c11 - Do not omit exe and dll files in release builds built on Unixes, - to align them with the official ones built on Windows. - Add support for "skip.installer" property. - https://issues.apache.org/bugzilla/attachment.cgi?id=25537 - +1: kkolinko, markt, kfujino - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49445 The change in session ID is notified to other node. http://svn.apache.org/viewvc?view=revision&revision=955190 Modified: tomcat/tc5.5.x/trunk/build/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=956826&r1=956825&r2=956826&view=diff == --- tomcat/tc5.5.x/trunk/build/build.xml (original) +++ tomcat/tc5.5.x/trunk/build/build.xml Tue Jun 22 09:04:20 2010 @@ -1398,6 +1398,28 @@ + + + + + + + + + + + + + + + @@ -1530,26 +1552,6 @@ - - - - - - - - - - - - - @@ -1702,6 +1704,7 @@ otherwise this check fails and the .exe distro is not generated --> + Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=956826&r1=956825&r2=956826&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jun 22 09:04:20 2010 @@ -58,6 +58,10 @@ 49236: Do not use indexing when packing Tomcat JARs. (kkolinko) + +48990: Build windows distributions correctly on Linux and +add support for the skip.installer property. (kkolinko) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49196] NPE in PageContext.getErrorData()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49196 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2010-06-22 05:01:05 EDT --- This has been fixed in 5.5.x and will be included in 5.5.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956822 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/webapps/docs/changelog.xml servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
Author: markt
Date: Tue Jun 22 09:00:15 2010
New Revision: 956822
URL: http://svn.apache.org/viewvc?rev=956822&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
Avoid NullPointerException in PageContext.getErrorData() if an error-handling
JSP page is called directly.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956822&r1=956821&r2=956822&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 09:00:15 2010
@@ -54,14 +54,6 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=749019
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
- Avoid NullPointerException in PageContext.getErrorData() if an
- error-handling JSP page is called directly.
- It is backport of r948057.
- https://issues.apache.org/bugzilla/attachment.cgi?id=25534
- +1: kkolinko, markt, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990#c11
Do not omit exe and dll files in release builds built on Unixes,
to align them with the official ones built on Windows.
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=956822&r1=956821&r2=956822&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jun 22
09:00:15 2010
@@ -133,6 +133,11 @@
security manager if the first access is to a JSP that uses a
FunctionMapper. (markt/kkolinko)
+
+49196: Avoid NullPointerException in
+PageContext.getErrorData() if an error-handling JSP page is called
+directly. (kkolinko)
+
Modified:
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java?rev=956822&r1=956821&r2=956822&view=diff
==
---
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
(original)
+++
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
Tue Jun 22 09:00:15 2010
@@ -512,10 +512,18 @@ abstract public class PageContext
* @since 2.0
*/
public ErrorData getErrorData() {
+int status = 0;
+
+Integer status_code = (Integer)getRequest().getAttribute(
+"javax.servlet.error.status_code");
+// Avoid NPE if attribute is not set
+if (status_code != null) {
+status = status_code.intValue();
+}
+
return new ErrorData(
(Throwable)getRequest().getAttribute(
"javax.servlet.error.exception" ),
-((Integer)getRequest().getAttribute(
-"javax.servlet.error.status_code" )).intValue(),
+status,
(String)getRequest().getAttribute(
"javax.servlet.error.request_uri" ),
(String)getRequest().getAttribute(
"javax.servlet.error.servlet_name" ) );
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48843] Tomcat Acceptor Thread goes into wait() and it will never come back
https://issues.apache.org/bugzilla/show_bug.cgi?id=48843 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #12 from Mark Thomas 2010-06-22 04:55:08 EDT --- The second issue has been fixed in 5.5.x and will also be included in 5.5.30 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r956820 - in /tomcat/tc5.5.x/trunk: STATUS.txt connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java container/webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 22 08:54:20 2010
New Revision: 956820
URL: http://svn.apache.org/viewvc?rev=956820&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48843#c8
Fix handling the add queue in AprEndpoint.Poller and AprEndpoint.Sendfile. Do
not miss Object.notify() wakeup.
Patch by kkolinko
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956820&r1=956819&r2=956820&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 08:54:20 2010
@@ -54,14 +54,6 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=749019
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48843#c8
- Fix handling the add queue in AprEndpoint.Poller and AprEndpoint.Sendfile.
- Do not miss Object.notify() wakeup.
- https://issues.apache.org/bugzilla/attachment.cgi?id=25529
- (Easier to review if you ignore whitespaces during the diff)
- +1: kkolinko, rjung, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
Avoid NullPointerException in PageContext.getErrorData() if an
error-handling JSP page is called directly.
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=956820&r1=956819&r2=956820&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Tue Jun 22 08:54:20 2010
@@ -1029,9 +1029,9 @@ public class AprEndpoint {
protected long[] desc;
protected long[] addS;
-protected int addCount = 0;
+protected volatile int addCount = 0;
-protected int keepAliveCount = 0;
+protected volatile int keepAliveCount = 0;
public int getKeepAliveCount() { return keepAliveCount; }
/**
@@ -1118,15 +1118,17 @@ public class AprEndpoint {
}
}
-while (keepAliveCount < 1 && addCount < 1) {
-// Reset maintain time.
-maintainTime = 0;
-try {
-synchronized (this) {
-this.wait();
+if (keepAliveCount < 1 && addCount < 1) {
+synchronized (this) {
+while (keepAliveCount < 1 && addCount < 1) {
+// Reset maintain time.
+maintainTime = 0;
+try {
+this.wait();
+} catch (InterruptedException e) {
+// Ignore
+}
}
-} catch (InterruptedException e) {
-// Ignore
}
}
@@ -1134,17 +1136,22 @@ public class AprEndpoint {
// Add sockets which are waiting to the poller
if (addCount > 0) {
synchronized (this) {
-for (int i = (addCount - 1); i >= 0; i--) {
-int rv = Poll.add
-(serverPollset, addS[i], Poll.APR_POLLIN);
-if (rv == Status.APR_SUCCESS) {
-keepAliveCount++;
-} else {
-// Can't do anything: close the socket
right away
-Socket.destroy(addS[i]);
+int successCount = 0;
+try {
+for (int i = (addCount - 1); i >= 0; i--) {
+int rv = Poll.add
+(serverPollset, addS[i],
Poll.APR_POLLIN);
+if (rv == Status.APR_SUCCESS) {
+successCount++;
+} else {
+// Can't do anything: close the socket
right away
+Socket.destroy(addS[i]);
+}
}
+} finally {
+keepAliveCount += succe
svn commit: r956818 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Tue Jun 22 08:50:57 2010 New Revision: 956818 URL: http://svn.apache.org/viewvc?rev=956818&view=rev Log: Vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=956818&r1=956817&r2=956818&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jun 22 08:50:57 2010 @@ -88,5 +88,5 @@ PATCHES PROPOSED TO BACKPORT: Avoid NPE if client provides no data with a chunked POST request http://svn.apache.org/viewvc?rev=953434&view=rev (by markt) - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47714] Reponse mixed between users
https://issues.apache.org/bugzilla/show_bug.cgi?id=47714 --- Comment #16 from Paul Hinds 2010-06-22 04:05:20 EDT --- FYI We are now running succesfully with modjk .30 , no reuse, no reties, and a new tomcat 4.3.0_CP07, provided by JBoss. This combination seems to be OK, and we have not seen further issues in production systems. I can not confirm that the jk upgrade is what made the difference since we upgraded both modjk and TC at the same time. We were unable to duplicate the issues in test environments. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 44454] busy count reported in mod_jk inflated, causes incorrect balancing
https://issues.apache.org/bugzilla/show_bug.cgi?id=44454 --- Comment #21 from William A. Rowe Jr. 2010-06-22 03:44:22 EDT --- Well, we are already misusing the phrase optlock vs real locking, so perhaps an additional pedantic mode that always locks? 32 bit math is not smp-safe on most architectures. There was an apr_atomic interface that illustrated that, if you would like to refer to the apr project sources. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 44454] busy count reported in mod_jk inflated, causes incorrect balancing
https://issues.apache.org/bugzilla/show_bug.cgi?id=44454 --- Comment #20 from Rainer Jung 2010-06-22 03:26:19 EDT --- Thanks for looking into this Bill! Should 32Bit operations be atomic? The busy counter could well be 32 Bits. For most of the other pure statistics counters, like bytes transferred, total request number etc. I'm not to concerned about correctness of the numbers, but the busy count influences the work of the balancer. Regards, Rainer -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
