svn commit: r1658734 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: LocalStrings.properties UpgradeProcessor.java
Author: markt
Date: Tue Feb 10 15:43:46 2015
New Revision: 1658734
URL: http://svn.apache.org/r1658734
Log:
Ensure that a dropped connection does not leave references to the
UpgradeProcessor
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1658734r1=1658733r2=1658734view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Tue Feb 10 15:43:46 2015
@@ -14,6 +14,8 @@
# limitations under the License.
upgradeProcessor.isCloseFail=Failed to close input stream associated with
upgraded connection
+upgradeProcessor.onDataAvailableFail=Failed to process data available event
+upgradeProcessor.onWritePossibleFail=Failed to process write possible event
upgradeProcessor.osCloseFail=Failed to close output stream associated with
upgraded connection
upgrade.sis.isFinished.ise=It is illegal to call isFinished() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1658734r1=1658733r2=1658734view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Tue Feb 10 15:43:46 2015
@@ -98,10 +98,24 @@ public class UpgradeProcessor implements
@Override
public final SocketState upgradeDispatch(SocketStatus status) throws
IOException {
if (status == SocketStatus.OPEN_READ) {
-upgradeServletInputStream.onDataAvailable();
-upgradeServletOutputStream.checkWriteDispatch();
+try {
+upgradeServletInputStream.onDataAvailable();
+upgradeServletOutputStream.checkWriteDispatch();
+} catch (IOException ioe) {
+// The error handling within the ServletInputStream should have
+// marked the stream for closure which will get picked up
below,
+// triggering the clean-up of this processor.
+
log.debug(sm.getString(upgradeProcessor.onDataAvailableFail), ioe);
+}
} else if (status == SocketStatus.OPEN_WRITE) {
-upgradeServletOutputStream.onWritePossible();
+try {
+upgradeServletOutputStream.onWritePossible();
+} catch (IOException ioe) {
+// The error handling within the ServletOutputStream should
have
+// marked the stream for closure which will get picked up
below,
+// triggering the clean-up of this processor.
+
log.debug(sm.getString(upgradeProcessor.onWritePossibleFail), ioe);
+}
} else if (status == SocketStatus.STOP) {
try {
upgradeServletInputStream.close();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658738 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractProcessor.java java/org/apache/coyote/http11/upgrade/LocalStrings.properties webapps/docs/changelog.xm
Author: markt Date: Tue Feb 10 15:54:05 2015 New Revision: 1658738 URL: http://svn.apache.org/r1658738 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 Ensure that a dropped connection does not leave references to the UpgradeProcessor Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 15:54:05 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
[Bug 57546] Memory Leak in SecureNioChannel
https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas ma...@apache.org --- Thanks for the report and the pointers to reproduce this. I have fixed the problem in trunk, 8.0.x (for 8.0.19 onwards) and 7.0.x (for 7.0.60 onwards). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57559] New: Decoded Request URI used for Asynchronous dispatch
https://issues.apache.org/bugzilla/show_bug.cgi?id=57559 Bug ID: 57559 Summary: Decoded Request URI used for Asynchronous dispatch Product: Tomcat 7 Version: 7.0.53 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: cg.throwa...@mailinator.com Overview: In a scenario where an original request contains part of the URI percent-encoded (e.g. /context/foo/%24/bar), when the request is put into asynchronous mode using ServletRequest.startAsync() and then dispatched using the no-argument AsyncContext.dispatch() method, the dispatch is incorrectly made to a percent-decoded URI (e.g. /context/foo/$/bar), not the original request URI. Steps to Reproduce: Consider the following servlet: https://gist.github.com/anonymous/957122b45ae656a5e8f1 It puts a request into asynchronous mode using ServletRequest.startAsync() and immediately dispatches it using the no-argument AsyncContext.dispatch() method. When the asynchronous dispatch takes place, the request URI is written to the response. 1) Compile and deploy the servlet to http://localhost:8080/context 2) Visit http://localhost:8080/context/foo/%24/bar (or any similar percent-encoded URI) in your browser Actual Results: The printed-out request URI is /context/foo/$/bar (i.e. the request has been dispatched to /context/foo/$/bar, a percent-decoded version of the original URI) Expected Results: The printed-out request URI is /context/foo/%24/bar (i.e. the request should be dispatched to /context/foo/%24/bar, the original URI) Additional Information: The Java Servlet 3.0 Specification says: The dispatch method takes no argument. It uses the original URI as the path. If the AsyncContext was initialized via the startAsync(ServletRequest, ServletResponse) and the request passed is an instance of HttpServletRequest, then the dispatch is to the URI returned by HttpServletRequest.getRequestURI(). Otherwise the dispatch is to the URI of the request when it was last dispatched by the container. It seems clear that the dispatch should be to the original request URI as obtained from HttpServletRequest.getRequestURI(), and the Javadoc of HttpServletRequest.getRequestURI() states that The web container does not decode this String. Therefore, it seems the asynchronous dispatch should not be made to a percent-decoded version of the original URI, but to the original URI 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
svn commit: r1658724 - in /tomcat/native/trunk/native: include/ssl_private.h src/sslutils.c
Author: kkolinko
Date: Tue Feb 10 14:40:37 2015
New Revision: 1658724
URL: http://svn.apache.org/r1658724
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
In openssl/ssl.h the macro is defined as
#define SSL_CTX_clear_extra_chain_certs(ctx) \
SSL_CTX_ctrl(ctx,SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS,0,NULL)
The implementation of SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS does NULL check and
does call sk_X509_pop_free(), so there no more need to do it here.
http://osxr.org/openssl/source/ssl/s3_lib.c#3637
Not compiled or tested, waiting for GUMP.
Modified:
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/src/sslutils.c
Modified: tomcat/native/trunk/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1658724r1=1658723r2=1658724view=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Tue Feb 10 14:40:37 2015
@@ -298,12 +298,6 @@ typedef struct {
} tcn_ssl_conn_t;
-#define SSL_CTX_get_extra_certs(ctx)((ctx)-extra_certs)
-#define SSL_CTX_set_extra_certs(ctx, value) \
-TCN_BEGIN_MACRO \
-(ctx)-extra_certs = (value); \
-TCN_END_MACRO
-
/*
* Additional Functions
*/
Modified: tomcat/native/trunk/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1658724r1=1658723r2=1658724view=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Tue Feb 10 14:40:37 2015
@@ -405,7 +405,6 @@ int SSL_CTX_use_certificate_chain(SSL_CT
X509 *x509;
unsigned long err;
int n;
-STACK_OF(X509) *extra_certs;
if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
return -1;
@@ -421,12 +420,10 @@ int SSL_CTX_use_certificate_chain(SSL_CT
}
X509_free(x509);
}
+
/* free a perhaps already configured extra chain */
-extra_certs = SSL_CTX_get_extra_certs(ctx);
-if (extra_certs != NULL) {
-sk_X509_pop_free(extra_certs, X509_free);
-SSL_CTX_set_extra_certs(ctx,NULL);
-}
+SSL_CTX_clear_extra_chain_certs(ctx);
+
/* create new extra chain by loading the certs */
n = 0;
while ((x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL)) != NULL) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658737 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractProcessor.java java/org/apache/coyote/http11/upgrade/LocalStrings.properties webapps/docs/changelog.xm
Author: markt Date: Tue Feb 10 15:53:06 2015 New Revision: 1658737 URL: http://svn.apache.org/r1658737 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 Ensure that a dropped connection does not leave references to the UpgradeProcessor Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 15:53:06 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734 Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java URL:
Re: svn commit: r1658734 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: LocalStrings.properties UpgradeProcessor.java
2015-02-10 16:43 GMT+01:00 ma...@apache.org: Author: markt Date: Tue Feb 10 15:43:46 2015 New Revision: 1658734 URL: http://svn.apache.org/r1658734 Log: Ensure that a dropped connection does not leave references to the UpgradeProcessor Good find, but what happens if onDataAvailable or onWritePossible throw a runtime exception (like a NPE), since this is user code. It could also leak then ? Shouldn't the code catch everything, also call onError on the listener and close ? Rémy
svn commit: r1658728 - in /tomcat/native/branches/1.1.x: ./ native/include/ssl_private.h native/src/sslutils.c xdocs/miscellaneous/changelog.xml
Author: kkolinko
Date: Tue Feb 10 14:45:19 2015
New Revision: 1658728
URL: http://svn.apache.org/r1658728
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
In openssl/ssl.h the macro is defined as
#define SSL_CTX_clear_extra_chain_certs(ctx) \
SSL_CTX_ctrl(ctx,SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS,0,NULL)
The implementation of SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS does NULL check and
does call sk_X509_pop_free(), so there no more need to do it here.
http://osxr.org/openssl/source/ssl/s3_lib.c#3637
Not compiled or tested, waiting for GUMP.
It is merge of r1658724 from tomcat/native/trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/include/ssl_private.h
tomcat/native/branches/1.1.x/native/src/sslutils.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 10 14:45:19 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1658557,1658641-1658642
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1658557,1658641-1658642,1658724
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/ssl_private.h?rev=1658728r1=1658727r2=1658728view=diff
==
--- tomcat/native/branches/1.1.x/native/include/ssl_private.h (original)
+++ tomcat/native/branches/1.1.x/native/include/ssl_private.h Tue Feb 10
14:45:19 2015
@@ -295,12 +295,6 @@ typedef struct {
} tcn_ssl_conn_t;
-#define SSL_CTX_get_extra_certs(ctx)((ctx)-extra_certs)
-#define SSL_CTX_set_extra_certs(ctx, value) \
-TCN_BEGIN_MACRO \
-(ctx)-extra_certs = (value); \
-TCN_END_MACRO
-
/*
* Additional Functions
*/
Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=1658728r1=1658727r2=1658728view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslutils.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslutils.c Tue Feb 10 14:45:19 2015
@@ -420,7 +420,6 @@ int SSL_CTX_use_certificate_chain(SSL_CT
X509 *x509;
unsigned long err;
int n;
-STACK_OF(X509) *extra_certs;
if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
return -1;
@@ -436,12 +435,10 @@ int SSL_CTX_use_certificate_chain(SSL_CT
}
X509_free(x509);
}
+
/* free a perhaps already configured extra chain */
-extra_certs = SSL_CTX_get_extra_certs(ctx);
-if (extra_certs != NULL) {
-sk_X509_pop_free(extra_certs, X509_free);
-SSL_CTX_set_extra_certs(ctx,NULL);
-}
+SSL_CTX_clear_extra_chain_certs(ctx);
+
/* create new extra chain by loading the certs */
n = 0;
while ((x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL)) != NULL) {
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1658728r1=1658727r2=1658728view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Tue Feb 10
14:45:19 2015
@@ -40,7 +40,7 @@
changelog
fix
Fix compilation failures with master branch of OpenSSL. Replace access
- to OpenSSL session internals by accessor function. (rjung)
+ to OpenSSL internals by accessor functions. (rjung/kkolinko)
/fix
/changelog
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658854 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Wed Feb 11 01:32:58 2015 New Revision: 1658854 URL: http://svn.apache.org/r1658854 Log: Add links to Gump results for Tomcat-Native Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1658854r1=1658853r2=1658854view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Wed Feb 11 01:32:58 2015 @@ -679,6 +679,46 @@ prepared and published by ASF Buildbot, tr style=vertical-align:top +tda href=http://vmgump.apache.org/gump/public/tomcat-native/;tomcat-native/a/td + td + +ul + +liSource path: code/tomcat/native/branches/1.1.x/code +/li + +li +strongProjects:/strong + +ul + +li +a href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-buildconf/;tomcat-native-buildconf/a +/li + +li +a href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-configure/;tomcat-native-configure/a +/li + +li +a href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/;tomcat-native-make/a - performs the actual build/li + +li +a href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make-install/;tomcat-native-make-install/a +/li + +/ul + +/li + +/ul + +/td + +/tr + +tr style=vertical-align:top + tda href=http://vmgump.apache.org/gump/public/tomcat-taglibs/;tomcat-taglibs/a/td td Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1658854r1=1658853r2=1658854view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Wed Feb 11 01:32:58 2015 @@ -204,6 +204,22 @@ prepared and published by ASF Buildbot, /td /tr tr style=vertical-align:top + tda href=http://vmgump.apache.org/gump/public/tomcat-native/;tomcat-native/a/td + td +ul + liSource path: code/tomcat/native/branches/1.1.x/code/li + listrongProjects:/strong +ul + lia href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-buildconf/;tomcat-native-buildconf/a/li + lia href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-configure/;tomcat-native-configure/a/li + lia href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/;tomcat-native-make/a - performs the actual build/li + lia href=http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make-install/;tomcat-native-make-install/a/li +/ul + /li +/ul + /td +/tr +tr style=vertical-align:top tda href=http://vmgump.apache.org/gump/public/tomcat-taglibs/;tomcat-taglibs/a/td td ul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 17 mins 46 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150211-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150211-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150211.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/wo rkspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150211.jar -Dtest.temp=output/test-tmp-BIO -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
[VOTE] Release Apache Taglibs 1.2.3
The proposed Apache Taglibs 1.2.3 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/taglibs/taglibs-standard-1.2.3/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1034/ The SVN tag is: http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/ The proposed 1.2.3 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 1.2.3 Stable Thanks Jeremy signature.asc Description: Message signed with OpenPGP using GPGMail
[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 10 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 31 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.4-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.4-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150211.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150211.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150211.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150211.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.4-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.4-SNAPSHOT on 2939 files [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/changelog.xml:71: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:545: Got 1 errors and 0 warnings. Total time: 31 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2015021104, vmgump.apache.org:vmgump:2015021104 Gump E-mail Identifier (unique within run) #3. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57546] Memory Leak in SecureNioChannel
https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 --- Comment #8 from Paul Gaylie paul.gay...@gmail.com --- Hi Mark, Great that you found the bug. Exactly what code needed to be updated? Just curious where the proper fix needed to be applied - was driving me nuts. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 18 mins 34 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150211-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150211-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150211.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/wor kspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150211.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
svn commit: r7986 - /dev/tomcat/taglibs/taglibs-standard-1.2.3/
Author: jboynes Date: Wed Feb 11 04:37:27 2015 New Revision: 7986 Log: Stage files for taglibs 1.2.3 release vote Added: dev/tomcat/taglibs/taglibs-standard-1.2.3/ dev/tomcat/taglibs/taglibs-standard-1.2.3/NOTICE dev/tomcat/taglibs/taglibs-standard-1.2.3/README_bin.txt dev/tomcat/taglibs/taglibs-standard-1.2.3/README_src.txt dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip (with props) dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip.asc dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip.md5 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-1.2.3-source-release.zip.sha1 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar (with props) dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar.asc dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar.md5 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-compat-1.2.3.jar.sha1 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar (with props) dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar.asc dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar.md5 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-impl-1.2.3.jar.sha1 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar (with props) dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar.asc dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar.md5 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-jstlel-1.2.3.jar.sha1 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar (with props) dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.asc dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.md5 dev/tomcat/taglibs/taglibs-standard-1.2.3/taglibs-standard-spec-1.2.3.jar.sha1 Added: dev/tomcat/taglibs/taglibs-standard-1.2.3/NOTICE == --- dev/tomcat/taglibs/taglibs-standard-1.2.3/NOTICE (added) +++ dev/tomcat/taglibs/taglibs-standard-1.2.3/NOTICE Wed Feb 11 04:37:27 2015 @@ -0,0 +1,5 @@ +Apache Standard Taglib +Copyright 2001-2015 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Added: dev/tomcat/taglibs/taglibs-standard-1.2.3/README_bin.txt == --- dev/tomcat/taglibs/taglibs-standard-1.2.3/README_bin.txt (added) +++ dev/tomcat/taglibs/taglibs-standard-1.2.3/README_bin.txt Wed Feb 11 04:37:27 2015 @@ -0,0 +1,111 @@ +--- +Apache Standard Tag Library 1.2.3 -- BINARY DISTRIBUTION +--- +Thanks for downloading this release of the Standard tag library, +an implementation of the JavaServer Pages(tm)(JSP) +Standard Tag Library (JSTL). + +This code is licensed to you by the Apache Software Foundation and its +contributors under the terms of the Apache License V2.0; +please see the included NOTICE and LICENSE files for details. + +JSTL is an effort of the Java Community Process (JCP) and +comes out of the JSR-052 expert group. For more information on JSTL, +please go to http://jcp.org/en/jsr/detail?id=52 . + +--- +LIBRARY DEPENDENCIES + +This version of the Standard Tag Library has the following runtime +dependencies: + + 1. Dependencies provided by a JSP 2.1 container: + - Java 1.5 or later + - Servlet 2.5 or later + - JSP 2.1 or later + + 2. Additional dependencies + - The XML tag library requires Apache Xalan 2.7.1 or later + +--- +Apache Xalan 2.7.1 + +To address performance issues with XSLT processing, this version relies on +implementation specific functionality from Apache Xalan. The following +libraries should be included in the classpath for your application: + - xalan-2.7.1.jar + - serializer-2.7.1.jar + +--- +ADD DEPENDENCIES TO A WEB APPLICATION + +To use this distribution with your own web applications, add the following JAR +files to the '/WEB-INF/lib' directory of your application: + - taglibs-standard-spec-1.2.3.jar + - taglibs-standard-impl-1.2.3.jar + - taglibs-standard-jstlel-1.2.3.jar + - xalan-2.7.1.jar + - serializer-2.7.1.jar + +If you do not use JSTL 1.0 tags then the taglibs-standard-jstlel JAR may be +omitted. If you do not use the XML library, then the Apache Xalan dependencies +may also be omitted. + +If you build you
svn commit: r1658862 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Wed Feb 11 01:51:30 2015 New Revision: 1658862 URL: http://svn.apache.org/r1658862 Log: Fix trailing whitespace Modified: 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=1658862r1=1658861r2=1658862view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Feb 11 01:51:30 2015 @@ -68,7 +68,7 @@ fix bug57556/bug: Align codegetRealPath()/code behaviour with that of earlier versions and include a trailing separator if the real path -refers to a directory. (markt) +refers to a directory. (markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658865 - in /tomcat/site/trunk: docs/sitemap-main.xml xdocs/sitemap-main.xml
Author: kkolinko Date: Wed Feb 11 02:00:42 2015 New Revision: 1658865 URL: http://svn.apache.org/r1658865 Log: Add oldnews-2014.html to sitemap file. Modified: tomcat/site/trunk/docs/sitemap-main.xml tomcat/site/trunk/xdocs/sitemap-main.xml Modified: tomcat/site/trunk/docs/sitemap-main.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/sitemap-main.xml?rev=1658865r1=1658864r2=1658865view=diff == --- tomcat/site/trunk/docs/sitemap-main.xml (original) +++ tomcat/site/trunk/docs/sitemap-main.xml Wed Feb 11 02:00:42 2015 @@ -112,6 +112,11 @@ priority0.5/priority /url url +lochttp://tomcat.apache.org/oldnews-2014.html/loc +changefreqmonthly/changefreq +priority0.4/priority + /url + url lochttp://tomcat.apache.org/oldnews-2013.html/loc changefreqmonthly/changefreq priority0.4/priority Modified: tomcat/site/trunk/xdocs/sitemap-main.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/sitemap-main.xml?rev=1658865r1=1658864r2=1658865view=diff == --- tomcat/site/trunk/xdocs/sitemap-main.xml (original) +++ tomcat/site/trunk/xdocs/sitemap-main.xml Wed Feb 11 02:00:42 2015 @@ -112,6 +112,11 @@ priority0.5/priority /url url +lochttp://tomcat.apache.org/oldnews-2014.html/loc +changefreqmonthly/changefreq +priority0.4/priority + /url + url lochttp://tomcat.apache.org/oldnews-2013.html/loc changefreqmonthly/changefreq priority0.4/priority - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57564] New: Make JspC amenable to subclassing
https://issues.apache.org/bugzilla/show_bug.cgi?id=57564 Bug ID: 57564 Summary: Make JspC amenable to subclassing Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: j...@mortbay.com Created attachment 32451 -- https://issues.apache.org/bugzilla/attachment.cgi?id=32451action=edit JspC proposed patch In a similar vein to the changes to the JasperInitializer to facilitate subclassing for different usage scenarios (eg use in different containers), it would be great if there were a few minor tweaks to JspC that would allow it to support these same usages. Attached is a patch with the changes proposed. regards Jan -- 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: r1658853 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Wed Feb 11 01:20:52 2015 New Revision: 1658853 URL: http://svn.apache.org/r1658853 Log: I configured APR connector tests for Tomcat 7 at Gump. Add a link to them. Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1658853r1=1658852r2=1658853view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Wed Feb 11 01:20:52 2015 @@ -616,6 +616,10 @@ prepared and published by ASF Buildbot, /li li +a href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/;tomcat-tc7.0.x-test-apr/a +/li + +li a href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/;tomcat-tc7.0.x-test-bio/a /li Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1658853r1=1658852r2=1658853view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Wed Feb 11 01:20:52 2015 @@ -179,6 +179,7 @@ prepared and published by ASF Buildbot, ul lia href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x/;tomcat-tc7.0.x/a/li lia href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-dbcp/;tomcat-tc7.0.x-dbcp/a/li + lia href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/;tomcat-tc7.0.x-test-apr/a/li lia href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/;tomcat-tc7.0.x-test-bio/a/li lia href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/;tomcat-tc7.0.x-test-nio/a/li lia href=http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/;tomcat-tc7.0.x-validate/a/li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658873 - in /tomcat/taglibs/standard/trunk: build-tools/pom.xml compat/pom.xml impl/pom.xml jstlel/pom.xml pom.xml spec/pom.xml
Author: jboynes Date: Wed Feb 11 04:17:26 2015 New Revision: 1658873 URL: http://svn.apache.org/r1658873 Log: [maven-release-plugin] prepare for next development iteration Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/pom.xml?rev=1658873r1=1658872r2=1658873view=diff == --- tomcat/taglibs/standard/trunk/build-tools/pom.xml (original) +++ tomcat/taglibs/standard/trunk/build-tools/pom.xml Wed Feb 11 04:17:26 2015 @@ -24,20 +24,20 @@ parent groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version /parent artifactIdtaglibs-build-tools/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version nameApache Standard Taglib Build Tools/name descriptionBuild tool settings common to all Standard Taglib modules/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/build-tools/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/build-tools + connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools /developerConnection - urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/build-tools/url + urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/url /scm /project Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1658873r1=1658872r2=1658873view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Wed Feb 11 04:17:26 2015 @@ -24,11 +24,11 @@ parent groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version /parent artifactIdtaglibs-standard-compat/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version packagingbundle/packaging nameApache Standard Taglib 1.0 Compatibility/name @@ -39,10 +39,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/compat/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/compat + connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat /developerConnection - urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/compat/url + urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/url /scm developers @@ -69,12 +69,12 @@ dependency groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard-spec/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version /dependency dependency groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard-impl/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version /dependency dependency Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1658873r1=1658872r2=1658873view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Wed Feb 11 04:17:26 2015 @@ -24,11 +24,11 @@ parent groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version /parent artifactIdtaglibs-standard-impl/artifactId -version1.2.3/version +version1.2.4-SNAPSHOT/version packagingbundle/packaging nameApache Standard Taglib Implementation/name @@ -39,10 +39,10 @@ /description scm -
svn commit: r1658871 - in /tomcat/taglibs/standard/trunk: build-tools/pom.xml compat/pom.xml impl/pom.xml jstlel/pom.xml pom.xml spec/pom.xml
Author: jboynes Date: Wed Feb 11 04:17:23 2015 New Revision: 1658871 URL: http://svn.apache.org/r1658871 Log: [maven-release-plugin] prepare release taglibs-standard-1.2.3 Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml tomcat/taglibs/standard/trunk/compat/pom.xml tomcat/taglibs/standard/trunk/impl/pom.xml tomcat/taglibs/standard/trunk/jstlel/pom.xml tomcat/taglibs/standard/trunk/pom.xml tomcat/taglibs/standard/trunk/spec/pom.xml Modified: tomcat/taglibs/standard/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/pom.xml?rev=1658871r1=1658870r2=1658871view=diff == --- tomcat/taglibs/standard/trunk/build-tools/pom.xml (original) +++ tomcat/taglibs/standard/trunk/build-tools/pom.xml Wed Feb 11 04:17:23 2015 @@ -24,20 +24,20 @@ parent groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version /parent artifactIdtaglibs-build-tools/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version nameApache Standard Taglib Build Tools/name descriptionBuild tool settings common to all Standard Taglib modules/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools + connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/build-tools/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/build-tools /developerConnection - urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/url + urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/build-tools/url /scm /project Modified: tomcat/taglibs/standard/trunk/compat/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1658871r1=1658870r2=1658871view=diff == --- tomcat/taglibs/standard/trunk/compat/pom.xml (original) +++ tomcat/taglibs/standard/trunk/compat/pom.xml Wed Feb 11 04:17:23 2015 @@ -24,11 +24,11 @@ parent groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version /parent artifactIdtaglibs-standard-compat/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version packagingbundle/packaging nameApache Standard Taglib 1.0 Compatibility/name @@ -39,10 +39,10 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat + connectionscm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/compat/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/compat /developerConnection - urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/url + urlhttp://svn.apache.org/viewvc/tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/compat/url /scm developers @@ -69,12 +69,12 @@ dependency groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard-spec/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version /dependency dependency groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard-impl/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version /dependency dependency Modified: tomcat/taglibs/standard/trunk/impl/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1658871r1=1658870r2=1658871view=diff == --- tomcat/taglibs/standard/trunk/impl/pom.xml (original) +++ tomcat/taglibs/standard/trunk/impl/pom.xml Wed Feb 11 04:17:23 2015 @@ -24,11 +24,11 @@ parent groupIdorg.apache.taglibs/groupId artifactIdtaglibs-standard/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version /parent artifactIdtaglibs-standard-impl/artifactId -version1.2.3-SNAPSHOT/version +version1.2.3/version packagingbundle/packaging nameApache Standard Taglib Implementation/name @@ -39,10 +39,10 @@ /description scm -
svn commit: r1658872 - /tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/
Author: jboynes Date: Wed Feb 11 04:17:25 2015 New Revision: 1658872 URL: http://svn.apache.org/r1658872 Log: [maven-release-plugin] copy for tag taglibs-standard-1.2.3 Added: tomcat/taglibs/standard/tags/taglibs-standard-1.2.3/ - copied from r1658871, tomcat/taglibs/standard/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658754 - in /tomcat/taglibs/standard/trunk: ./ impl/src/main/java/org/apache/taglibs/standard/util/ impl/src/test/java/org/apache/taglibs/standard/util/
Author: jboynes
Date: Tue Feb 10 16:32:13 2015
New Revision: 1658754
URL: http://svn.apache.org/r1658754
Log:
Check protocol when resolving on older JREs
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/XmlUtilTest.java
(with props)
Modified:
tomcat/taglibs/standard/trunk/CHANGES.txt
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Modified: tomcat/taglibs/standard/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1658754r1=1658753r2=1658754view=diff
==
--- tomcat/taglibs/standard/trunk/CHANGES.txt (original)
+++ tomcat/taglibs/standard/trunk/CHANGES.txt Tue Feb 10 16:32:13 2015
@@ -1,8 +1,9 @@
Changes in 1.2.3 release
-57547 Fix regression with running on older JREs
-57548 Update library version number printed by Version class
+57560 Check protocol when resolving on older JREs
57549 Fix reference to old SNAPSHOT version of taglibs-build-tools in pom
files.
+57548 Update library version number printed by Version class
+57547 Fix regression with running on older JREs
Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs]
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java?rev=1658754r1=1658753r2=1658754view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
Tue Feb 10 16:32:13 2015
@@ -77,4 +77,19 @@ public class UrlUtil {
// if so, we've got an absolute url
return true;
}
+
+public static String getScheme(CharSequence url) {
+StringBuilder scheme = new StringBuilder();
+for (int i = 0; i url.length(); i++) {
+char ch = url.charAt(i);
+if (ch == ':') {
+String result = scheme.toString();
+if (!jar.equals(result)) {
+return result;
+}
+}
+scheme.append(ch);
+}
+throw new IllegalArgumentException(No scheme found: + url);
+}
}
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java?rev=1658754r1=1658753r2=1658754view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Tue Feb 10 16:32:13 2015
@@ -20,6 +20,7 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.Reader;
import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.concurrent.Callable;
@@ -111,6 +112,27 @@ public class XmlUtil {
}
}
+private static final String SP_ALLOWED_PROTOCOLS =
org.apache.taglibs.standard.xml.accessExternalEntity;
+private static final String ALLOWED_PROTOCOLS =
AccessController.doPrivileged(new PrivilegedActionString() {
+public String run() {
+String defaultProtocols = System.getSecurityManager() == null ?
all : ;
+return System.getProperty(SP_ALLOWED_PROTOCOLS, defaultProtocols);
+}
+});
+
+static void checkProtocol(String allowedProtocols, String uri) {
+if (all.equalsIgnoreCase(allowedProtocols)) {
+return;
+}
+String protocol = UrlUtil.getScheme(uri);
+for (String allowed : allowedProtocols.split(,)) {
+if (allowed.trim().equalsIgnoreCase(protocol)) {
+return;
+}
+}
+throw new SecurityException(Access to external URI not allowed: +
uri);
+}
+
/**
* Create a new empty document.
*
@@ -219,7 +241,7 @@ public class XmlUtil {
}
/**
- * JSTL-specific implementation of EntityResolver.
+ * JSTL-specific implementation of EntityResolver, used by parsers.
*/
public static class JstlEntityResolver implements EntityResolver {
private final PageContext ctx;
@@ -242,6 +264,7 @@ public class XmlUtil {
// we're only concerned with relative URLs
svn commit: r1658771 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java Processor.java ajp/AjpProcessor.java http11/Http11Processor.java http11/upgrade/UpgradeProcessor.java spdy/SpdyPr
Author: remm
Date: Tue Feb 10 18:04:17 2015
New Revision: 1658771
URL: http://svn.apache.org/r1658771
Log:
Drop unused throws clause.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1658771r1=1658770r2=1658771view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Feb 10
18:04:17 2015
@@ -212,7 +212,7 @@ public abstract class AbstractProcessor
* upgrade.
*/
@Override
-public abstract SocketState upgradeDispatch(SocketStatus status) throws
IOException;
+public abstract SocketState upgradeDispatch(SocketStatus status);
@Override
public abstract HttpUpgradeHandler getHttpUpgradeHandler();
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1658771r1=1658770r2=1658771view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Tue Feb 10 18:04:17 2015
@@ -40,7 +40,7 @@ public interface Processor {
SocketState asyncPostProcess();
HttpUpgradeHandler getHttpUpgradeHandler();
-SocketState upgradeDispatch(SocketStatus status) throws IOException;
+SocketState upgradeDispatch(SocketStatus status);
void errorDispatch();
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=1658771r1=1658770r2=1658771view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Feb 10
18:04:17 2015
@@ -846,9 +846,9 @@ public class AjpProcessor extends Abstra
@Override
-public SocketState upgradeDispatch(SocketStatus status) throws IOException
{
+public SocketState upgradeDispatch(SocketStatus status) {
// Should never reach this code but in case we do...
-throw new IOException(
+throw new IllegalStateException(
sm.getString(ajpprocessor.httpupgrade.notsupported));
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1658771r1=1658770r2=1658771view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Feb 10
18:04:17 2015
@@ -1817,7 +1817,7 @@ public class Http11Processor extends Abs
@Override
-public SocketState upgradeDispatch(SocketStatus status) throws IOException
{
+public SocketState upgradeDispatch(SocketStatus status) {
// Should never reach this code but in case we do...
throw new IllegalStateException(
sm.getString(http11Processor.upgrade));
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1658771r1=1658770r2=1658771view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Tue Feb 10 18:04:17 2015
@@ -96,7 +96,7 @@ public class UpgradeProcessor implements
@Override
-public final SocketState upgradeDispatch(SocketStatus status) throws
IOException {
+public final SocketState upgradeDispatch(SocketStatus status) {
if (status == SocketStatus.OPEN_READ) {
try {
upgradeServletInputStream.onDataAvailable();
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1658771r1=1658770r2=1658771view=diff
==
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Re: svn commit: r1658754 - in /tomcat/taglibs/standard/trunk: ./ impl/src/main/java/org/apache/taglibs/standard/util/ impl/src/test/java/org/apache/taglibs/standard/util/
2015-02-10 19:32 GMT+03:00 jboy...@apache.org:
Author: jboynes
Date: Tue Feb 10 16:32:13 2015
New Revision: 1658754
URL: http://svn.apache.org/r1658754
Log:
Check protocol when resolving on older JREs
Added:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/XmlUtilTest.java
(with props)
Modified:
tomcat/taglibs/standard/trunk/CHANGES.txt
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java?rev=1658754r1=1658753r2=1658754view=diff
==
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/UrlUtil.java
Tue Feb 10 16:32:13 2015
@@ -77,4 +77,19 @@ public class UrlUtil {
// if so, we've got an absolute url
return true;
}
+
+public static String getScheme(CharSequence url) {
This method is only used with a String argument.
For a String it would be easier to use indexOf(':'),
though it does special processing for jar protocol.
+StringBuilder scheme = new StringBuilder();
+for (int i = 0; i url.length(); i++) {
+char ch = url.charAt(i);
+if (ch == ':') {
+String result = scheme.toString();
+if (!jar.equals(result)) {
+return result;
+}
+}
+scheme.append(ch);
+}
+throw new IllegalArgumentException(No scheme found: + url);
+}
}
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: r1658757 - in /tomcat/taglibs/standard/trunk: CHANGES.txt README_bin.txt
Author: jboynes Date: Tue Feb 10 16:43:59 2015 New Revision: 1658757 URL: http://svn.apache.org/r1658757 Log: Update changes and docs Modified: tomcat/taglibs/standard/trunk/CHANGES.txt tomcat/taglibs/standard/trunk/README_bin.txt Modified: tomcat/taglibs/standard/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1658757r1=1658756r2=1658757view=diff == --- tomcat/taglibs/standard/trunk/CHANGES.txt (original) +++ tomcat/taglibs/standard/trunk/CHANGES.txt Tue Feb 10 16:43:59 2015 @@ -5,6 +5,11 @@ Changes in 1.2.3 release 57548 Update library version number printed by Version class 57547 Fix regression with running on older JREs +XML tags now enable FEATURE_SECURE_PROCESSING when parsing and transforming. The JSTL-specific +EntityResolver also checks the protocol being used against a white-list specified in the system +property org.apache.taglibs.standard.xml.accessExternalEntity in to order to limit access on +older JREs. + Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs] 57433 Double-check locking in ExpressionEvaluatorManager Modified: tomcat/taglibs/standard/trunk/README_bin.txt URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_bin.txt?rev=1658757r1=1658756r2=1658757view=diff == --- tomcat/taglibs/standard/trunk/README_bin.txt (original) +++ tomcat/taglibs/standard/trunk/README_bin.txt Tue Feb 10 16:43:59 2015 @@ -88,9 +88,16 @@ The JSTL tag library can be imported int --- COMPATIBILITY -The 1.2 version of the Standard Taglib has been tested under Tomcat 7.0.47 +The 1.2 version of the Standard Taglib has been tested using Tomcat 7.0.57 and should work in any compliant JSP 2.1 (or later) container. +In version 1.2.3 and later, the XML libraries enable FEATURE_SECURE_PROCESSING +when parsing and transforming. A new system property + org.apache.taglibs.standard.xml.accessExternalEntity +can be used to further restrict the protocols over which external entities can +be resolved. When a SecurityManager is enabled this will, by default, allow +access to no protocols. + --- COMMENTS AND QUESTIONS - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57560] New: Check protocol when resolving on older JREs
https://issues.apache.org/bugzilla/show_bug.cgi?id=57560 Bug ID: 57560 Summary: Check protocol when resolving on older JREs Product: Taglibs Version: 1.2.1 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Standard Taglib Assignee: dev@tomcat.apache.org Reporter: jboy...@apache.org Add a mechanism to check the protocol being used when resolving entities on older JREs. -- 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: r1658641 - /tomcat/native/trunk/native/src/sslnetwork.c
Author: rjung
Date: Tue Feb 10 08:53:09 2015
New Revision: 1658641
URL: http://svn.apache.org/r1658641
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
Not compiled or tested, waiting for GUMP.
Modified:
tomcat/native/trunk/native/src/sslnetwork.c
Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1658641r1=1658640r2=1658641view=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Feb 10 08:53:09 2015
@@ -408,7 +408,7 @@ ssl_socket_recv(apr_socket_t *sock, char
i = SSL_get_error(con-ssl, s);
/* Special case if the close notify alert send by peer */
-if (s == 0 (con-ssl-shutdown SSL_RECEIVED_SHUTDOWN)) {
+if (s == 0 (SSL_get_shutdown(con-ssl)
SSL_RECEIVED_SHUTDOWN)) {
*len = 0;
return APR_EOF;
}
@@ -633,7 +633,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
if (SSL_get_state(con-ssl) != SSL_ST_OK) {
return APR_EGENERAL;
}
-con-ssl-state = SSL_ST_ACCEPT;
+SSL_set_state(con-ssl, SSL_ST_ACCEPT);
ecode = SSL_ERROR_WANT_READ;
while (ecode == SSL_ERROR_WANT_READ) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57546] Memory Leak in SecureNioChannel
https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 --- Comment #3 from Mark Thomas ma...@apache.org --- (In reply to Paul Gaylie from comment #2) Mark, Unfortunately, killing a browser is not a good simulation because the browser is smart enough to properly close the websocket when it gets killed. With kill -9 the browser nver gets the chance. The close isn't clean - a bunch of IOExceptions are triggered. Here is what to do: connect using a mobile browser on your phone (like Chrome on Android) and then shutoff the mobile data connection on your phone. Then you should see the doClose() operation happening on the server side. I'll try but right now my money is on this already being fixed in the post 8.0.18 changes. -- 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: Hi
On 10/02/2015 06:28, Pravallika Peddi wrote: Thanks Chris for the information. Mark Chris: I have gone through one of the issues given by Mark: https://issues.apache.org/bugzilla/show_bug.cgi?id=57021 and found that this issue is fixed already. Steps i performed: 1) Download Tomcat 6.0 - 32 bit version and run it on 32-bit Windows platform. Tomcat Server started successfully using commands mentioned in issue. Stop the tomcat. Check the catalina.out folder and it has no error messages. Rename catalina.out file. 2) Download Tomcat 6.0-64 bit version and extract tcnative-dll and copy it on to 32-bit Tomcat folder. Start the Tomcat Server and check the catalina.out file. It has proper error message Feb 10, 2015 11:42:54 AM org.apache.catalina.core.AprLifecycleListener init INFO: The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: and i did not observe any error in command line as mentioned in the issue. I attached both the catalina.out files for your reference. Even i checked the recent Trunk AppLifecycleListener.init() java method and did not find the source code that was mentioned in the issue. Hence i feel the issue is fixed. Please confirm so that i will close the issue. The issue is not fixed. Tomcat isn't finding the tc-native library so the error isn't triggering. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57554] Exception loading sessions from persistent storage
https://issues.apache.org/bugzilla/show_bug.cgi?id=57554 Rainer Jung rainer.j...@kippdata.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID -- 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: r1658646 - in /tomcat/native/branches/1.1.x: ./ native/src/sslnetwork.c
Author: rjung
Date: Tue Feb 10 09:00:11 2015
New Revision: 1658646
URL: http://svn.apache.org/r1658646
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
Not compiled or tested, waiting for GUMP.
Backport of r1658641 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 10 09:00:11 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1658557
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1658557,1658641-1658642
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=1658646r1=1658645r2=1658646view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Tue Feb 10 09:00:11
2015
@@ -410,7 +410,7 @@ ssl_socket_recv(apr_socket_t *sock, char
rv = apr_get_netos_error();
i = SSL_get_error(con-ssl, s);
/* Special case if the close notify alert send by peer */
-if (s == 0 (con-ssl-shutdown SSL_RECEIVED_SHUTDOWN)) {
+if (s == 0 (SSL_get_shutdown(con-ssl)
SSL_RECEIVED_SHUTDOWN)) {
con-shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
return APR_EOF;
}
@@ -647,7 +647,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
if (SSL_get_state(con-ssl) != SSL_ST_OK) {
return APR_EGENERAL;
}
-con-ssl-state = SSL_ST_ACCEPT;
+SSL_set_state(con-ssl, SSL_ST_ACCEPT);
apr_socket_timeout_get(con-sock, timeout);
ecode = SSL_ERROR_WANT_READ;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1658557 - /tomcat/native/trunk/native/src/sslinfo.c
Am 10.02.2015 um 00:18 schrieb Konstantin Kolinko: 2015-02-09 22:52 GMT+03:00 rj...@apache.org: Author: rjung Date: Mon Feb 9 19:52:36 2015 New Revision: 1658557 URL: http://svn.apache.org/r1658557 Log: Replace access to OpenSSL session internals by accessor function. Internals are no longer available for OpenSSL master. Not compiled or tested, waiting for GUMP. Modified: tomcat/native/trunk/native/src/sslinfo.c This change is in native trunk, but Gump builds the 1.1.x branch... In project/tomcat-native.xml of Gump: svn repository=asf dir=tomcat/native/branches/1.1.x/ Thank you Konstantin, also for merging to 1.1. I thought if it is building against OpenSSL master branch it must be our trunk, but well ... I hope I fixed the next file and there's not much SSL files left, so maybe not too many further iterations needed. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57554] Exception loading sessions from persistent storage
https://issues.apache.org/bugzilla/show_bug.cgi?id=57554 --- Comment #1 from Rainer Jung rainer.j...@kippdata.de --- Comment on attachment 32445 -- https://issues.apache.org/bugzilla/attachment.cgi?id=32445 catalina output I don't think that it is related to the session ID generator change. It doesn't look so to me. Please post your problem to the users mailing list. It doesn't look like a TC problem even though you experienced it after update. If discussion on the users list shows evidence, that it is indeed a Tomcat problem, you can reopen this ticket. Regards, Rainer -- 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 57556] New: getServletContext().getRealPath(/) returns path not ending with /
https://issues.apache.org/bugzilla/show_bug.cgi?id=57556 Bug ID: 57556 Summary: getServletContext().getRealPath(/) returns path not ending with / Product: Tomcat 8 Version: trunk Hardware: PC Status: NEW Severity: major Priority: P2 Component: Specification APIs Assignee: dev@tomcat.apache.org Reporter: ps.kart...@gmail.com I have been using this getServletContext().getRealPath(/) till Tomcat6 and i got the return string path ending with slash. For Example getServletContext().getRealPath(/) will return E:/TomcatHome/webapps/CRM/ But when I tried with Tomcat 8.0.14 I got path without slash For Example getServletContext().getRealPath(/) will return E:/TomcatHome/webapps/CRM Ending slash missing Is there anything changed in Tomcat 8 and is there any configuration I can make to get the result that I got in previous version of Tomcat, because if I have to change in code, I have to change in lot of places in all the webapps I created. -- 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 56085] IllegalArgumentException is thrown when calling getServletContext().getRealPath(\\)
https://issues.apache.org/bugzilla/show_bug.cgi?id=56085 karthic ps.kart...@gmail.com changed: What|Removed |Added Version|8.0.0-RC10 |8.0.14 -- 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 57556] getServletContext().getRealPath(/) returns path not ending with /
https://issues.apache.org/bugzilla/show_bug.cgi?id=57556 karthic ps.kart...@gmail.com changed: What|Removed |Added OS||All -- 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
async and thread constraint
Hi guys, in org.apache.coyote.AsyncStateMachine#asyncDispatch tomcat checks ContainerThreadMarker.isContainerThread() basically it prevents to use JAXRS 2 @Suspended without creating custom threads - which is not intended. Was this limitation intended or just to try to avoid to consume container threads? PS: there is no log saying dispatching is skipped so it makes it very hard to understand without opening an IDE and tomcat sources, could it be enhanced please? Romain Manni-Bucau @rmannibucau http://www.tomitribe.com http://rmannibucau.wordpress.com https://github.com/rmannibucau - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Hi
Got you Mark. Now i am able to reproduce the problem by keeping I64 bit dll in x64 bit windows platform. I will fix it and let you know. Thanks, VIN On Tue, Feb 10, 2015 at 2:19 PM, Mark Thomas ma...@apache.org wrote: On 10/02/2015 06:28, Pravallika Peddi wrote: Thanks Chris for the information. Mark Chris: I have gone through one of the issues given by Mark: https://issues.apache.org/bugzilla/show_bug.cgi?id=57021 and found that this issue is fixed already. Steps i performed: 1) Download Tomcat 6.0 - 32 bit version and run it on 32-bit Windows platform. Tomcat Server started successfully using commands mentioned in issue. Stop the tomcat. Check the catalina.out folder and it has no error messages. Rename catalina.out file. 2) Download Tomcat 6.0-64 bit version and extract tcnative-dll and copy it on to 32-bit Tomcat folder. Start the Tomcat Server and check the catalina.out file. It has proper error message Feb 10, 2015 11:42:54 AM org.apache.catalina.core.AprLifecycleListener init INFO: The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: and i did not observe any error in command line as mentioned in the issue. I attached both the catalina.out files for your reference. Even i checked the recent Trunk AppLifecycleListener.init() java method and did not find the source code that was mentioned in the issue. Hence i feel the issue is fixed. Please confirm so that i will close the issue. The issue is not fixed. Tomcat isn't finding the tc-native library so the error isn't triggering. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57556] getServletContext().getRealPath(/) returns path not ending with /
https://issues.apache.org/bugzilla/show_bug.cgi?id=57556 --- Comment #1 from karthic ps.kart...@gmail.com --- I mentioned I used till Tomcat6, it is typo, I have been using this code from Tomcat5.5 to Tomcat7 -- 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 45014] Request and Response classes should have wrappers for use in Valves
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014 --- Comment #18 from Remy Maucherat r...@apache.org --- Adding your dummy classes means wrapping is supported and, probably, that there is more API stability that what is actually the case. I continue to believe that this is not a good idea. If people, like you, want to hack, feel free, but it would be better to be able to disregard side effects and problems that could be introduced. Especially if it is only hacking to be able to do useless debugging. Unless my veto is found invalid, I think this should be resolved as wontfix. -- 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 45014] Request and Response classes should have wrappers for use in Valves
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014 --- Comment #19 from mr.oliver.hernan...@gmail.com --- Remy, please re-read my previous comments (https://issues.apache.org/bugzilla/show_bug.cgi?id=45014#c5 https://issues.apache.org/bugzilla/show_bug.cgi?id=45014#c6). This need is far from useless. We're seeing these errors, Caused by: java.io.IOException: Strange I/O stream, returned 0 bytes on read at com.ctc.wstx.io.BaseReader.reportStrangeStream(BaseReader.java:216) at com.ctc.wstx.io.UTF8Reader.loadMore(UTF8Reader.java:375) at com.ctc.wstx.io.UTF8Reader.read(UTF8Reader.java:111) at com.ctc.wstx.io.ReaderBootstrapper.initialLoad(ReaderBootstrapper.java:250) at com.ctc.wstx.io.ReaderBootstrapper.bootstrapInput(ReaderBootstrapper.java:133) at com.ctc.wstx.stax.WstxInputFactory.doCreateSR(WstxInputFactory.java:546) ... 36 more and the valve I put together has been a tremendous help in troubleshooting it. Instead of this issue being categorized as a bug, maybe this should be considered a feature request. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56085] IllegalArgumentException is thrown when calling getServletContext().getRealPath(\\)
https://issues.apache.org/bugzilla/show_bug.cgi?id=56085 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Version|8.0.14 |8.0.0-RC10 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- Restore Version field back to 8.0.0-RC10 This issue was reported in 8.0-RC10 and fixed since 8.0.2. -- 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 57556] getServletContext().getRealPath(/) returns path not ending with /
https://issues.apache.org/bugzilla/show_bug.cgi?id=57556 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Version|trunk |8.0.14 -- 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: r1658734 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: LocalStrings.properties UpgradeProcessor.java
On 10/02/2015 15:59, Rémy Maucherat wrote: 2015-02-10 16:43 GMT+01:00 ma...@apache.org: Author: markt Date: Tue Feb 10 15:43:46 2015 New Revision: 1658734 URL: http://svn.apache.org/r1658734 Log: Ensure that a dropped connection does not leave references to the UpgradeProcessor Good find, but what happens if onDataAvailable or onWritePossible throw a runtime exception (like a NPE), since this is user code. It could also leak then ? Shouldn't the code catch everything, also call onError on the listener and close ? Good point. I was thinking purely in terms of WebSocket but you are right - this needs to be more general. I'll take another look. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658777 - in /tomcat/site/trunk: docs/migration-8.html xdocs/migration-8.xml
Author: kkolinko Date: Tue Feb 10 18:40:52 2015 New Revision: 1658777 URL: http://svn.apache.org/r1658777 Log: Enhance wording and add a link to Apache Commons DBCP project Modified: tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/xdocs/migration-8.xml Modified: tomcat/site/trunk/docs/migration-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1658777r1=1658776r2=1658777view=diff == --- tomcat/site/trunk/docs/migration-8.html (original) +++ tomcat/site/trunk/docs/migration-8.html Tue Feb 10 18:40:52 2015 @@ -429,15 +429,21 @@ of Apache Tomcat./p div class=text -pTomcat 8 embeds a packaged renamed version of Commons DBCP 2.x. There are -a number of notable changes between Commons DBCP 1.x and Commons DBCP 2.x +pTomcat 8 embeds a packaged renamed version of +a href=http://commons.apache.org/proper/commons-dbcp/;Apache Commons DBCP/a +2.x. There are a number of notable changes between Commons DBCP 1.x +(used by Tomcat 7 and earlier) and Commons DBCP 2.x which are likely to require configuration changes./p ul -liThe maxActive configuration option has been renamed to maxTotal/li +liThe codemaxActive/code configuration option has been renamed + to codemaxTotal/code +/li -liThe maxWait configuration option has been renamed to maxWaitMillis/li +liThe codemaxWait/code configuration option has been renamed to + codemaxWaitMillis/code +/li liThe JDBC driver JAR may be placed in WEB-INF/lib as an alternative to $CATALINA_BASE/lib provided that the driver class is only used by that Modified: tomcat/site/trunk/xdocs/migration-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1658777r1=1658776r2=1658777view=diff == --- tomcat/site/trunk/xdocs/migration-8.xml (original) +++ tomcat/site/trunk/xdocs/migration-8.xml Tue Feb 10 18:40:52 2015 @@ -130,12 +130,16 @@ of Apache Tomcat./p subsection name=Database Connection Pooling -pTomcat 8 embeds a packaged renamed version of Commons DBCP 2.x. There are -a number of notable changes between Commons DBCP 1.x and Commons DBCP 2.x +pTomcat 8 embeds a packaged renamed version of +a href=http://commons.apache.org/proper/commons-dbcp/;Apache Commons DBCP/a +2.x. There are a number of notable changes between Commons DBCP 1.x +(used by Tomcat 7 and earlier) and Commons DBCP 2.x which are likely to require configuration changes./p ul - liThe maxActive configuration option has been renamed to maxTotal/li - liThe maxWait configuration option has been renamed to maxWaitMillis/li + liThe codemaxActive/code configuration option has been renamed + to codemaxTotal/code/li + liThe codemaxWait/code configuration option has been renamed to + codemaxWaitMillis/code/li liThe JDBC driver JAR may be placed in WEB-INF/lib as an alternative to $CATALINA_BASE/lib provided that the driver class is only used by that web application./li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 45014] Request and Response classes should have wrappers for use in Valves
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014 --- Comment #21 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Remy Maucherat from comment #20) Yes, I did note that I guess in hindsight I could have implemented a filter. This is a feature for hackers, my vote is to let people deal with it to avoid having any additional support burden. I'm happy to simply leave the classes as attachments to this enhancement request and not commit anything. I don't personally have a use for them at this moment. A few years ago it occurred to me that they would be something useful for Valve authors. Since Valve is an internal API, Valve authors should already be comfortable with an unstable API. We'll see if this gets any votes. It's remained untouched for 6 years until this week. It's clear there is not much demand that the examples here will not fill. -- 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: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x
Hello! I am CS student and it looks like that this task is quite interesting. I would take it for GSOC if ASF organization will be selected. Currently I have some time to do research in Tomcat codebase. Could you provide me some entry points? Thanks, Fjodor -- View this message in context: http://tomcat.10.x6.nabble.com/Consider-support-for-the-Servlet-profile-of-JSR-196-JASPIC-in-Tomcat-7-0-x-tp4993387p5029627.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658779 - in /tomcat/site/trunk: docs/migration-8.html xdocs/migration-8.xml
Author: kkolinko Date: Tue Feb 10 18:55:04 2015 New Revision: 1658779 URL: http://svn.apache.org/r1658779 Log: Enhance wording and add a link to jndi-datasource-examples-howto.html Modified: tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/xdocs/migration-8.xml Modified: tomcat/site/trunk/docs/migration-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1658779r1=1658778r2=1658779view=diff == --- tomcat/site/trunk/docs/migration-8.html (original) +++ tomcat/site/trunk/docs/migration-8.html Tue Feb 10 18:55:04 2015 @@ -431,7 +431,9 @@ of Apache Tomcat./p pTomcat 8 embeds a packaged renamed version of a href=http://commons.apache.org/proper/commons-dbcp/;Apache Commons DBCP/a -2.x. There are a number of notable changes between Commons DBCP 1.x +2.x as the default implementation of a +a href=tomcat-8.0-doc/jndi-datasource-examples-howto.htmldatabase connection pool/a. +There are a number of notable changes between Commons DBCP 1.x (used by Tomcat 7 and earlier) and Commons DBCP 2.x which are likely to require configuration changes./p Modified: tomcat/site/trunk/xdocs/migration-8.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1658779r1=1658778r2=1658779view=diff == --- tomcat/site/trunk/xdocs/migration-8.xml (original) +++ tomcat/site/trunk/xdocs/migration-8.xml Tue Feb 10 18:55:04 2015 @@ -132,7 +132,9 @@ of Apache Tomcat./p pTomcat 8 embeds a packaged renamed version of a href=http://commons.apache.org/proper/commons-dbcp/;Apache Commons DBCP/a -2.x. There are a number of notable changes between Commons DBCP 1.x +2.x as the default implementation of a +a href=tomcat-8.0-doc/jndi-datasource-examples-howto.htmldatabase connection pool/a. +There are a number of notable changes between Commons DBCP 1.x (used by Tomcat 7 and earlier) and Commons DBCP 2.x which are likely to require configuration changes./p ul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 45014] Request and Response classes should have wrappers for use in Valves
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014 --- Comment #22 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Remy Maucherat from comment #18) Adding your dummy classes means wrapping is supported and, probably, that there is more API stability that what is actually the case. This is the first time you've mentioned API stability which, honestly, is a real concern. Here are the stats for changes to o.a.coyote.Request: - Tomcat 9, root to tip: no changes - Tomcat 8, root (r1636341) to tip: no changes - Tomcat 7, root (r1155369) to tip: 5 commits: r1446110, r1446138, r1446138, *r156*, r1561675, r1518197. The single *starred* commit changed the API. This API is pretty stable, even if it is not officially so. -- 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: r1658781 - /tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Tue Feb 10 19:04:01 2015 New Revision: 1658781 URL: http://svn.apache.org/r1658781 Log: Add note about DBCP changes between Tomcat 7 and 8, replacing an old note that was saying about Tomcat 5.0 and 5.5 Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1658781r1=1658780r2=1658781view=diff == --- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original) +++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue Feb 10 19:04:01 2015 @@ -52,9 +52,12 @@ to the wider audience, or if you feel we p bPlease note that JNDI resource configuration changed somewhat between -Tomcat 5.0.x and Tomcat 5.5.x./b You will most likely need to modify older +Tomcat 7.x and Tomcat 8.x as they are using different versions of +Apache Commons DBCP library./b You will most likely need to modify older JNDI resource configurations to match the syntax in the example below in order to make them work in Tomcat version-major/. +See a href=http://tomcat.apache.org/migration.html;Tomcat Migration Guide/a +for details. /p p - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 45014] Request and Response classes should have wrappers for use in Valves
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014 --- Comment #23 from Christopher Schultz ch...@christopherschultz.net --- (In reply to Christopher Schultz from comment #22) - Tomcat 7, root (r1155369) to tip: 5 commits: r1446110, r1446138, r1446138, *r156*, r1561675, r1518197. The single *starred* commit changed the API. This incorrectly identifies the commit which included the API change. The correct commit is r1518197 for the API change. -- 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: r1658783 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/jndi-datasource-examples-howto.xml
Author: kkolinko Date: Tue Feb 10 19:09:16 2015 New Revision: 1658783 URL: http://svn.apache.org/r1658783 Log: Add note about DBCP changes between Tomcat 7 and 8, replacing an old note that was saying about Tomcat 5.0 and 5.5 Merged r1658781 from tomcat/trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 19:09:16 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781 Modified: tomcat/tc8.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1658783r1=1658782r2=1658783view=diff == ---
Re: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x
Hi, On Tuesday, February 10, 2015, Fjodor Vershinin [via Tomcat] ml-node+s10n5029627...@n6.nabble.com wrote: Hello! I am CS student and it looks like that this task is quite interesting. I would take it for GSOC if ASF organization will be selected. Currently I have some time to do research in Tomcat codebase. Could you provide me some entry points? Thanks for your interest in this. An entry point could be my original JASPIC article that you can find here; http://arjan-tijms.omnifaces.org/2012/11/implementing-container-authentication.html At the end of the article you'll find a list of resources. My approach would be to investigate how Tomcat integrates authentication modules, eg look at the source of the JAAS support in Tomcat; that code has to do similar integration. You can look at JBoss 7.x for an example too, it used Tomcat and an integration Valve (WebJaspiAuthenticator seehttp:// grepcode.com/file/repository.jboss.org/nexus/content/repositories/releases/org.jboss.as/jboss-as-web/7.1.1.Final/org/jboss/as/web/security/jaspi/WebJASPIAuthenticator.java ) Geronimo also implemented JASPIC and used Tomcat, so that implementation would be high on the list to study too. Many implementations have a (large) part of their code dedicated to handling some xml file where jaspic auth modules are defined. Strictly speaking this is not a required part of JASPIC, but it's somewhat expected for configuring modules at the container side (as apposed to from within the app archive). I did actually more or less promise to do this implementation myself, but so far havent found the time for it. Let me know if this is enough to get started. Kind regards, Arjan Thanks, Fjodor -- If you reply to this email, your message will be added to the discussion below: http://tomcat.10.x6.nabble.com/Consider-support-for-the-Servlet-profile-of-JSR-196-JASPIC-in-Tomcat-7-0-x-tp4993387p5029627.html To unsubscribe from Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x, click here http://tomcat.10.x6.nabble.com/template/NamlServlet.jtp?macro=unsubscribe_by_codenode=4993387code=YXJqYW4udGlqbXNAZ21haWwuY29tfDQ5OTMzODd8LTM3MzU5NTg0OA== . NAML http://tomcat.10.x6.nabble.com/template/NamlServlet.jtp?macro=macro_viewerid=instant_html%21nabble%3Aemail.namlbase=nabble.naml.namespaces.BasicNamespace-nabble.view.web.template.NabbleNamespace-nabble.view.web.template.NodeNamespacebreadcrumbs=notify_subscribers%21nabble%3Aemail.naml-instant_emails%21nabble%3Aemail.naml-send_instant_email%21nabble%3Aemail.naml -- View this message in context: http://tomcat.10.x6.nabble.com/Consider-support-for-the-Servlet-profile-of-JSR-196-JASPIC-in-Tomcat-7-0-x-tp4993387p5029633.html Sent from the Tomcat - Dev mailing list archive at Nabble.com.
[Bug 57546] Memory Leak in SecureNioChannel
https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 --- Comment #4 from Mark Thomas ma...@apache.org --- Interesting. I tried testing with a separate machine so I could pull out the network cable. That has triggered a problem that looks like the one described here. I'm looking into this at the moment. Musing on why I didn't see this when I kill -9'd the browser, I suspect that the client OS was doing some clean-up since it was still connected. -- 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 57558] New: validator ant task throws NoClassDefFoundError - Tomcat 8.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
Bug ID: 57558
Summary: validator ant task throws NoClassDefFoundError -
Tomcat 8.0.18
Product: Tomcat 8
Version: 8.0.18
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: knst.koli...@gmail.com
This has been reported on the users list
http://mail-archives.apache.org/mod_mbox/tomcat-users/201502.mbox/%3CCAHvOsHzPt9hK8iGSTfXCzCcUSMq4N0DH5o1WRzTFvW-pKdVRRg%40mail.gmail.com%3E
http://tomcat.markmail.org/thread/du5j6z54cw2pfdvz
quote
I'm using Tomcat 8.0.18.
I've following ant build.xml:
import file=${tomcat.home}/bin/
catalina-tasks.xml/
target name=jspc
jasper
validateXml=false
uriroot=${webapp.path}
webXmlFragment=${webapp.path}/WEB-INF/generated_web.xml
outputDir=${webapp.path}/WEB-INF/src /
validator path=${webapp.path} /
...
/target
jasper task works great, but validator task throws
java.lang.NoClassDefFoundError: org/apache/catalina/Globals
/quote
Searching the jars, org/apache/catalina/Globals.class is in catalina.jar,
which is not listed in bin/catalina-tasks.xml
I think that catalina-tasks.xml shall list all jars from
${catalina.home}/lib/*.jar, instead of naming just a few of those. Besides
catalina.jar others that are missing are *-i18n-*.jar ones.
--
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 57556] getServletContext().getRealPath(/) returns path not ending with /
https://issues.apache.org/bugzilla/show_bug.cgi?id=57556 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- Fixed in trunk for 9.0.x and in 8.0.x for 8.0.19 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658811 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Tue Feb 10 21:12:23 2015 New Revision: 1658811 URL: http://svn.apache.org/r1658811 Log: Correct a typo Modified: 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=1658811r1=1658810r2=1658811view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Feb 10 21:12:23 2015 @@ -170,8 +170,8 @@ (markt) /fix fix -bug57558/bug: Add missing JAR in Ant task definition rquired by the -validate task. (markt) +bug57558/bug: Add missing JAR in Ant task definition required by +the validate task. (markt) /fix /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658815 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina-tasks.xml webapps/docs/changelog.xml
Author: kkolinko Date: Tue Feb 10 21:22:44 2015 New Revision: 1658815 URL: http://svn.apache.org/r1658815 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558 Add missing JAR in Ant task definition required by the validate task. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 21:22:44 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657370,1657460,1657908,1658208,1658737 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
svn commit: r1658819 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Tue Feb 10 21:28:53 2015
New Revision: 1658819
URL: http://svn.apache.org/r1658819
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=1658819r1=1658818r2=1658819view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 10 21:28:53 2015
@@ -53,6 +53,15 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
+ Add missing JARs in Ant task definition. Expand the pattern in
+ catalina-tasks.xml to incude all jars in ${catalina.home}/lib.
+ This adds catalina.jar required by the validate task, as well as optional
+ i18n jars.
+ http://svn.apache.org/r1658815
+ +1: kkolinko
+ -1:
+
PATCHES/ISSUES THAT ARE STALLED:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658805 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java webapps/docs/changelog.xml
Author: markt Date: Tue Feb 10 20:55:27 2015 New Revision: 1658805 URL: http://svn.apache.org/r1658805 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57556 Align getRealPath() behaviour with that of earlier versions and include a trailing separator if the real path refers to a directory. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 20:55:27 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804 Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL:
[Bug 57558] validator ant task throws NoClassDefFoundError - Tomcat 8.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=57558 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Component|Jasper |Jasper Version|8.0.18 |6.0.43 Resolution|FIXED |--- Product|Tomcat 8|Tomcat 6 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- This is observed on 7.0.59 and current 6.0.x as well. I will backport the fix. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1658804 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java
2015-02-10 23:54 GMT+03:00 ma...@apache.org:
Author: markt
Date: Tue Feb 10 20:54:07 2015
New Revision: 1658804
URL: http://svn.apache.org/r1658804
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57556
Align getRealPath() behaviour with that of earlier versions and include a
trailing separator if the real path refers to a directory.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.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=1658804r1=1658803r2=1658804view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Feb
10 20:54:07 2015
@@ -4407,7 +4407,12 @@ public class StandardContext extends Con
}
if (resources != null) {
try {
-return resources.getResource(path).getCanonicalPath();
+WebResource resource = resources.getResource(path);
+if (resource.isDirectory()) {
+return resource.getCanonicalPath() + File.separatorChar;
1) I think it is better to check whether it ends with separatorChar first.
E.g. if a Windows drive root is deployed as a web application. I think
that getCanonicalPath() will end with a backslash.
T:\ is the root directory of drive T,
T: is the current directory on drive T.
2) I think that this changes the value of getRealPath(),
I have not tested whether it was ending with a slash in the old versions.
+} else {
+return resource.getCanonicalPath();
+}
} catch (IllegalArgumentException iae) {
// ServletContext.getRealPath() does not allow this to be
thrown
}
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57558] validator ant task throws NoClassDefFoundError - Tomcat 8.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=57558 --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com --- For a record: Stacktrace in Tomcat 6 is [[[ build.xml:15: java.lang.NoClassDefFoundError: org /apache/catalina/Globals at org.apache.catalina.ant.ValidatorTask.execute(ValidatorTask.java:95) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at ... ]]] The line that refers the Globals class in ValidatorTask.java: Digester digester = DigesterFactory.newDigester( true, true, null, Globals.IS_SECURITY_ENABLED); -- 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 57559] Decoded Request URI used for Asynchronous dispatch
https://issues.apache.org/bugzilla/show_bug.cgi?id=57559 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All -- 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: r1658804 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java test/org/apache/catalina/core/TestStandardContext.java
Author: markt
Date: Tue Feb 10 20:54:07 2015
New Revision: 1658804
URL: http://svn.apache.org/r1658804
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57556
Align getRealPath() behaviour with that of earlier versions and include a
trailing separator if the real path refers to a directory.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.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=1658804r1=1658803r2=1658804view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Feb 10
20:54:07 2015
@@ -4407,7 +4407,12 @@ public class StandardContext extends Con
}
if (resources != null) {
try {
-return resources.getResource(path).getCanonicalPath();
+WebResource resource = resources.getResource(path);
+if (resource.isDirectory()) {
+return resource.getCanonicalPath() + File.separatorChar;
+} else {
+return resource.getCanonicalPath();
+}
} catch (IllegalArgumentException iae) {
// ServletContext.getRealPath() does not allow this to be
thrown
}
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1658804r1=1658803r2=1658804view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Tue Feb
10 20:54:07 2015
@@ -937,6 +937,32 @@ public class TestStandardContext extends
Assert.assertNull(realPath);
}
+/*
+ * Check real path for directories ends with File.separator for consistency
+ * with previous major versions.
+ */
+@Test
+public void testBug57556() throws Exception {
+Tomcat tomcat = getTomcatInstanceTestWebapp(false, true);
+Context testContext = ((Context) tomcat.getHost().findChildren()[0]);
+doTestBug57556(testContext, /, true);
+doTestBug57556(testContext, /jsp, true);
+doTestBug57556(testContext, /jsp/, true);
+doTestBug57556(testContext, /index.html, false);
+// Doesn't exist so Tomcat will assume it is a file, not a directory.
+doTestBug57556(testContext, /foo, false);
+}
+
+private void doTestBug57556(Context testContext, String path, boolean
endsInSeparator) throws Exception {
+String realPath = testContext.getRealPath(path);
+Assert.assertNotNull(realPath);
+if (endsInSeparator) {
+Assert.assertTrue(realPath, realPath.endsWith(File.separator));
+} else {
+Assert.assertFalse(realPath, realPath.endsWith(File.separator));
+}
+}
+
@Test
public void testBug56903() {
Context context = new StandardContext();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57558] validator ant task throws NoClassDefFoundError - Tomcat 8.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
--- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com ---
Complete sample build.xml (to be put into $CATALINA_HOME):
[[[
project default=jspc
property name=tomcat.home location=${basedir} /
property name=webapp.path location=${basedir}/webapps/examples /
import file=${tomcat.home}/bin/catalina-tasks.xml/
target name=jspc
jasper
validateXml=false
uriroot=${webapp.path}
webXmlFragment=${webapp.path}/WEB-INF/generated_web.xml
outputDir=${webapp.path}/WEB-INF/src /
validator path=${webapp.path} /
/target
/project
]]]
--
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 57558] validator ant task throws NoClassDefFoundError - Tomcat 8.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=57558 --- Comment #4 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in Tomcat 7 by r1658815 and will be in 7.0.60. Proposed for Tomcat 6. -- 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: r1658796 - in /tomcat/site/trunk: docs/download-70.html xdocs/download-70.xml
Author: kkolinko Date: Tue Feb 10 20:30:21 2015 New Revision: 1658796 URL: http://svn.apache.org/r1658796 Log: Add links to SHA-1 checksum files for Tomcat 7. Modified: tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/xdocs/download-70.xml Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1658796r1=1658795r2=1658796view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Tue Feb 10 20:30:21 2015 @@ -219,9 +219,9 @@ release file. This signature should be matched against the a href=https://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a file which contains the OpenPGP keys of Tomcat's Release Managers. We also -provide an codeMD5/code checksum for every release file. After you -download the file, you should calculate a checksum for your download, and -make sure it is the same as ours. +provide codeMD5/code and codeSHA-1/code checksums for every +release file. After you download the file, you should calculate a +checksum for your download, and make sure it is the same as ours. /p /div @@ -276,42 +276,48 @@ a href=[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip rel=nofollowzip/a (a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.md5;md5/a) +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.md5;md5/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].zip.sha1;sha1/a) /li li a href=[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz rel=nofollowtar.gz/a (a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.md5;md5/a) +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.md5;md5/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].tar.gz.sha1;sha1/a) /li li a href=[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip rel=nofollow32-bit Windows zip/a (a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.md5;md5/a) +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.md5;md5/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.sha1;sha1/a) /li li a href=[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip rel=nofollow64-bit Windows zip/a (a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.md5;md5/a) +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.md5;md5/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.sha1;sha1/a) /li li a href=[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-i64.zip rel=nofollow64-bit Itanium Windows zip/a (a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-i64.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-i64.zip.md5;md5/a) +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-i64.zip.md5;md5/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v]-windows-i64.zip.sha1;sha1/a) /li li a href=[preferred]tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe rel=nofollow32-bit/64-bit Windows Service Installer/a (a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.md5;md5/a) +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.md5;md5/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v[v]/bin/apache-tomcat-[v].exe.sha1;sha1/a) /li /ul @@ -325,7 +331,8 @@
Re: svn commit: r1658799 - /tomcat/trunk/bin/catalina-tasks.xml
On 10/02/2015 20:36, Konstantin Kolinko wrote:
2015-02-10 23:32 GMT+03:00 ma...@apache.org:
Author: markt
Date: Tue Feb 10 20:32:45 2015
New Revision: 1658799
URL: http://svn.apache.org/r1658799
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
Add missing JARs
JARs in alpha order
Modified:
tomcat/trunk/bin/catalina-tasks.xml
Modified: tomcat/trunk/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1658799r1=1658798r2=1658799view=diff
==
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Tue Feb 10 20:32:45 2015
@@ -28,16 +28,20 @@
typedef resource=org/apache/catalina/ant/catalina.tasks
classpath
fileset file=${catalina.home}/bin/tomcat-juli.jar/
- fileset file=${catalina.home}/lib/tomcat-api.jar/
- fileset file=${catalina.home}/lib/tomcat-util.jar/
- fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
+ fileset file=${catalina.home}/lib/catalina-ant.jar/
+ fileset file=${catalina.home}/lib/catalina.jar/
+ fileset file=${catalina.home}/lib/el-api.jar/
fileset file=${catalina.home}/lib/jasper.jar/
fileset file=${catalina.home}/lib/jasper-el.jar/
- fileset file=${catalina.home}/lib/el-api.jar/
fileset file=${catalina.home}/lib/jsp-api.jar/
fileset file=${catalina.home}/lib/servlet-api.jar/
- fileset file=${catalina.home}/lib/catalina-ant.jar/
+ fileset file=${catalina.home}/lib/tomcat-api.jar/
fileset file=${catalina.home}/lib/tomcat-coyote.jar/
+ fileset file=${catalina.home}/lib/tomcat-util.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-es.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-fr.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-ja.jar/
+ fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
/classpath
/typedef
I suspect that the above will fail if *i18n* jars are not present. I
think one should be allowed to remove them from an installation.
See r1658802
The downside of r1658802 is if a JAR is missing it isn't immediately
obvious which one it is.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x
On 10/02/2015 18:42, Arjan Tijms wrote: Hi, On Tuesday, February 10, 2015, Fjodor Vershinin [via Tomcat] ml-node+s10n5029627...@n6.nabble.com wrote: Hello! I am CS student and it looks like that this task is quite interesting. I would take it for GSOC if ASF organization will be selected. Currently I have some time to do research in Tomcat codebase. Could you provide me some entry points? Thanks for your interest in this. An entry point could be my original JASPIC article that you can find here; http://arjan-tijms.omnifaces.org/2012/11/implementing-container-authentication.html At the end of the article you'll find a list of resources. My approach would be to investigate how Tomcat integrates authentication modules, eg look at the source of the JAAS support in Tomcat; that code has to do similar integration. You can look at JBoss 7.x for an example too, it used Tomcat and an integration Valve (WebJaspiAuthenticator seehttp:// grepcode.com/file/repository.jboss.org/nexus/content/repositories/releases/org.jboss.as/jboss-as-web/7.1.1.Final/org/jboss/as/web/security/jaspi/WebJASPIAuthenticator.java If you do look at JBoss keep in mind it is GPL licensed and we need to be very careful that we don't end up with GPL'd code in Tomcat. ) Geronimo also implemented JASPIC and used Tomcat, so that implementation would be high on the list to study too. Personally, I'd look more much more closely at Geronimo. Keep in mind that part of the goal is to replace the existing authenticators with JASPIC modules. (As suggested on the Servlet EG list.) Many implementations have a (large) part of their code dedicated to handling some xml file where jaspic auth modules are defined. Strictly speaking this is not a required part of JASPIC, but it's somewhat expected for configuring modules at the container side (as apposed to from within the app archive). Tomcat already has a lot of the infrastructure for handling this sort of thing. It could be as simple as adding a few digester rules. I did actually more or less promise to do this implementation myself, but so far havent found the time for it. I think we all know that feeling - hence why I suggested it for GSoC. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1658737 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractProcessor.java java/org/apache/coyote/http11/upgrade/LocalStrings.properties webapps/docs/changelo
Mark, On 2/10/15 10:53 AM, ma...@apache.org wrote: Author: markt Date: Tue Feb 10 15:53:06 2015 New Revision: 1658737 URL: http://svn.apache.org/r1658737 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 Ensure that a dropped connection does not leave references to the UpgradeProcessor Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 15:53:06 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,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,165 7 907,1658207 +/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,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,165 7 907,1658207,1658734 Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java URL:
[Bug 57509] maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException
https://issues.apache.org/bugzilla/show_bug.cgi?id=57509
Shelson Ferrari supo...@vitplay.com changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|FIXED |---
--- Comment #7 from Shelson Ferrari supo...@vitplay.com ---
- 4 bytes added is the correct fixe ?
The method sendHeader --
write(name);
headerBuffer[pos++] = Constants.COLON;
headerBuffer[pos++] = Constants.SP;
write(value);
headerBuffer[pos++] = Constants.CR;
headerBuffer[pos++] = Constants.LF;
call the method write(MessageBytes mb) 2 times and at the end of this method,
call the method write(mb.getByteChunk()
this method call checkLengthBeforeWrite(length)
In the first call write(name) --
this block that increments 2 positions is not called
headerBuffer[pos++] = Constants.COLON;
headerBuffer[pos++] = Constants.SP;
The class AbstractHttp11Processor method private void prepareResponse()
call the class AOB --
int size = headers.size();
for (int i = 0; i size; i++) {
getOutputBuffer().sendHeader(headers.getName(i), headers.getValue(i));
}
getOutputBuffer().endHeaders();
in other words, I believe:
the method checkLengthBeforeWrite in the first call
if (pos + length headerBuffer.length)
the method checkLengthBeforeWrite in the second call
if (pos + length + 2 headerBuffer.length)
and if have a third scan after getOutputBuffer().endHeaders() - there is no
such verification - and also would not make sense
if (pos + length + 4 headerBuffer.length)
and would be after getOutputBuffer().endHeaders()
Please check.
--
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: r1658799 - /tomcat/trunk/bin/catalina-tasks.xml
2015-02-10 23:32 GMT+03:00 ma...@apache.org:
Author: markt
Date: Tue Feb 10 20:32:45 2015
New Revision: 1658799
URL: http://svn.apache.org/r1658799
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
Add missing JARs
JARs in alpha order
Modified:
tomcat/trunk/bin/catalina-tasks.xml
Modified: tomcat/trunk/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1658799r1=1658798r2=1658799view=diff
==
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Tue Feb 10 20:32:45 2015
@@ -28,16 +28,20 @@
typedef resource=org/apache/catalina/ant/catalina.tasks
classpath
fileset file=${catalina.home}/bin/tomcat-juli.jar/
- fileset file=${catalina.home}/lib/tomcat-api.jar/
- fileset file=${catalina.home}/lib/tomcat-util.jar/
- fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
+ fileset file=${catalina.home}/lib/catalina-ant.jar/
+ fileset file=${catalina.home}/lib/catalina.jar/
+ fileset file=${catalina.home}/lib/el-api.jar/
fileset file=${catalina.home}/lib/jasper.jar/
fileset file=${catalina.home}/lib/jasper-el.jar/
- fileset file=${catalina.home}/lib/el-api.jar/
fileset file=${catalina.home}/lib/jsp-api.jar/
fileset file=${catalina.home}/lib/servlet-api.jar/
- fileset file=${catalina.home}/lib/catalina-ant.jar/
+ fileset file=${catalina.home}/lib/tomcat-api.jar/
fileset file=${catalina.home}/lib/tomcat-coyote.jar/
+ fileset file=${catalina.home}/lib/tomcat-util.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-es.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-fr.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-ja.jar/
+ fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
/classpath
/typedef
I suspect that the above will fail if *i18n* jars are not present. I
think one should be allowed to remove them from an installation.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57558] validator ant task throws NoClassDefFoundError - Tomcat 8.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=57558 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in trunk and 8.0.x for 8.0.19 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658803 - in /tomcat/tc8.0.x/trunk: ./ bin/catalina-tasks.xml
Author: markt Date: Tue Feb 10 20:40:13 2015 New Revision: 1658803 URL: http://svn.apache.org/r1658803 Log: Simplify. Use all available JARs. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 20:40:13 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802 Modified: tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml?rev=1658803r1=1658802r2=1658803view=diff == --- tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml (original) +++ tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml Tue Feb 10 20:40:13 2015 @@ -28,20 +28,7 @@ typedef
svn commit: r1658790 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: LocalStrings.properties UpgradeProcessor.java UpgradeServletInputStream.java UpgradeServletOutputStream.java
Author: markt
Date: Tue Feb 10 20:05:12 2015
New Revision: 1658790
URL: http://svn.apache.org/r1658790
Log:
Make code calling user provided listeners more robust.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1658790r1=1658789r2=1658790view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Tue Feb 10 20:05:12 2015
@@ -14,16 +14,18 @@
# limitations under the License.
upgradeProcessor.isCloseFail=Failed to close input stream associated with
upgraded connection
-upgradeProcessor.onDataAvailableFail=Failed to process data available event
-upgradeProcessor.onWritePossibleFail=Failed to process write possible event
upgradeProcessor.osCloseFail=Failed to close output stream associated with
upgraded connection
+upgrade.sis.errorCloseFail=Failed to close InputStream cleanly after a
previous error
upgrade.sis.isFinished.ise=It is illegal to call isFinished() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
upgrade.sis.isReady.ise=It is illegal to call isReady() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
+upgrade.sis.onErrorFail=onError processing for the registered ReadListener
triggered this further error which was swallowed
upgrade.sis.readListener.null=It is illegal to pass null to setReadListener()
upgrade.sis.readListener.set=It is illegal to call setReadListener() more than
once for the same upgraded connection
upgrade.sis.read.ise=It is illegal to call any of the read() methods in
non-blocking mode without first checking that there is data available by
calling isReady()
+upgrade.sos.errorCloseFail=Failed to close OutputStream cleanly after a
previous error
upgrade.sos.canWrite.ise=It is illegal to call canWrite() when the
ServletOutputStream is not in non-blocking mode (i.e. setWriteListener() must
be called first)
+upgrade.sos.onErrorFail=onError processing for the registered WriteListener
triggered this further error which was swallowed
upgrade.sos.writeListener.null=It is illegal to pass null to setWriteListener()
upgrade.sos.writeListener.set=It is illegal to call setWriteListener() more
than once for the same upgraded connection
upgrade.sis.write.ise=It is illegal to call any of the write() methods in
non-blocking mode without first checking that there is space available by
calling isReady()
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1658790r1=1658789r2=1658790view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Tue Feb 10 20:05:12 2015
@@ -98,24 +98,10 @@ public class UpgradeProcessor implements
@Override
public final SocketState upgradeDispatch(SocketStatus status) {
if (status == SocketStatus.OPEN_READ) {
-try {
-upgradeServletInputStream.onDataAvailable();
-upgradeServletOutputStream.checkWriteDispatch();
-} catch (IOException ioe) {
-// The error handling within the ServletInputStream should have
-// marked the stream for closure which will get picked up
below,
-// triggering the clean-up of this processor.
-
log.debug(sm.getString(upgradeProcessor.onDataAvailableFail), ioe);
-}
+upgradeServletInputStream.onDataAvailable();
+upgradeServletOutputStream.checkWriteDispatch();
} else if (status == SocketStatus.OPEN_WRITE) {
-try {
-upgradeServletOutputStream.onWritePossible();
-} catch (IOException ioe) {
-// The error handling within the ServletOutputStream should
have
-// marked the stream for closure which will get picked up
below,
-// triggering the clean-up of this processor.
-
log.debug(sm.getString(upgradeProcessor.onWritePossibleFail), ioe);
-}
+upgradeServletOutputStream.onWritePossible();
}
svn commit: r1658799 - /tomcat/trunk/bin/catalina-tasks.xml
Author: markt
Date: Tue Feb 10 20:32:45 2015
New Revision: 1658799
URL: http://svn.apache.org/r1658799
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
Add missing JARs
JARs in alpha order
Modified:
tomcat/trunk/bin/catalina-tasks.xml
Modified: tomcat/trunk/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1658799r1=1658798r2=1658799view=diff
==
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Tue Feb 10 20:32:45 2015
@@ -28,16 +28,20 @@
typedef resource=org/apache/catalina/ant/catalina.tasks
classpath
fileset file=${catalina.home}/bin/tomcat-juli.jar/
- fileset file=${catalina.home}/lib/tomcat-api.jar/
- fileset file=${catalina.home}/lib/tomcat-util.jar/
- fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
+ fileset file=${catalina.home}/lib/catalina-ant.jar/
+ fileset file=${catalina.home}/lib/catalina.jar/
+ fileset file=${catalina.home}/lib/el-api.jar/
fileset file=${catalina.home}/lib/jasper.jar/
fileset file=${catalina.home}/lib/jasper-el.jar/
- fileset file=${catalina.home}/lib/el-api.jar/
fileset file=${catalina.home}/lib/jsp-api.jar/
fileset file=${catalina.home}/lib/servlet-api.jar/
- fileset file=${catalina.home}/lib/catalina-ant.jar/
+ fileset file=${catalina.home}/lib/tomcat-api.jar/
fileset file=${catalina.home}/lib/tomcat-coyote.jar/
+ fileset file=${catalina.home}/lib/tomcat-util.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-es.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-fr.jar/
+ fileset file=${catalina.home}/lib/tomcat-i18n-ja.jar/
+ fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
/classpath
/typedef
typedef resource=org/apache/catalina/ant/jmx/jmxaccessor.tasks
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1658802 - /tomcat/trunk/bin/catalina-tasks.xml
Author: markt
Date: Tue Feb 10 20:39:48 2015
New Revision: 1658802
URL: http://svn.apache.org/r1658802
Log:
Simplify. Use all available JARs.
Modified:
tomcat/trunk/bin/catalina-tasks.xml
Modified: tomcat/trunk/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1658802r1=1658801r2=1658802view=diff
==
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Tue Feb 10 20:39:48 2015
@@ -28,20 +28,7 @@
typedef resource=org/apache/catalina/ant/catalina.tasks
classpath
fileset file=${catalina.home}/bin/tomcat-juli.jar/
- fileset file=${catalina.home}/lib/catalina-ant.jar/
- fileset file=${catalina.home}/lib/catalina.jar/
- fileset file=${catalina.home}/lib/el-api.jar/
- fileset file=${catalina.home}/lib/jasper.jar/
- fileset file=${catalina.home}/lib/jasper-el.jar/
- fileset file=${catalina.home}/lib/jsp-api.jar/
- fileset file=${catalina.home}/lib/servlet-api.jar/
- fileset file=${catalina.home}/lib/tomcat-api.jar/
- fileset file=${catalina.home}/lib/tomcat-coyote.jar/
- fileset file=${catalina.home}/lib/tomcat-util.jar/
- fileset file=${catalina.home}/lib/tomcat-i18n-es.jar/
- fileset file=${catalina.home}/lib/tomcat-i18n-fr.jar/
- fileset file=${catalina.home}/lib/tomcat-i18n-ja.jar/
- fileset file=${catalina.home}/lib/tomcat-util-scan.jar/
+ fileset dir=${catalina.home}/lib includes=*.jar/
/classpath
/typedef
typedef resource=org/apache/catalina/ant/jmx/jmxaccessor.tasks
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x
Hi, On Tue, Feb 10, 2015 at 8:34 PM, Mark Thomas-2 [via Tomcat] ml-node+s10n502964...@n6.nabble.com wrote: If you do look at JBoss keep in mind it is GPL licensed and we need to be very careful that we don't end up with GPL'd code in Tomcat. That's absolutely true. The code there shouldn't not be copied in any way. It's only useful as an example of how a Tomcat Valve can integrate with something like JASPIC. As for the JASPIC code there, it wouldn't make sense to copy it anyway, since A) it's JBoss specific (builds up JBoss principal, calls JBoss security service, etc) and B) there are various issues with it (it looks like JBoss pretty much rewrote everything from scratch for Undertow, which is completely different). Personally, I'd look more much more closely at Geronimo. You're right, and since that one is Apache licensed one can even copy from it if needed. Keep in mind that part of the goal is to replace the existing authenticators with JASPIC modules. (As suggested on the Servlet EG list.) It's good to have that as part of the goal indeed. Such auth modules could even be implemented by a separate (group) of students if needed, as they would not necessarily depend on the JASPIC implementation for Tomcat. As long as that one is not finished they could test it on any existing JASPIC implementation (e.g. the RI, GlassFish). I think we all know that feeling - hence why I suggested it for GSoC. Yeah, I get that, thanks! It's still something that I'd really love to do, but with the work for the startup zeef.com, open source projects OmniFaces and OmniSecurity, the work for the JSF EG and perhaps soon for the security EG, there is not always much time left. I had this on my sketchy todo list for ~end of this month, but I'll see what happens with the GSoC project now ;) Kind regards, Arjan Mark - To unsubscribe, e-mail: [hidden email] For additional commands, e-mail: [hidden email] If you reply to this email, your message will be added to the discussion below: http://tomcat.10.x6.nabble.com/Consider-support-for-the-Servlet-profile-of-JSR-196-JASPIC-in-Tomcat-7-0-x-tp4993387p5029643.html To unsubscribe from Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x, click here. NAML -- View this message in context: http://tomcat.10.x6.nabble.com/Consider-support-for-the-Servlet-profile-of-JSR-196-JASPIC-in-Tomcat-7-0-x-tp4993387p5029664.html Sent from the Tomcat - Dev mailing list archive at Nabble.com.
Re: svn commit: r1658737 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/AbstractProcessor.java java/org/apache/coyote/http11/upgrade/LocalStrings.properties webapps/docs/changelo
On 10/02/2015 19:54, Christopher Schultz wrote: Mark, On 2/10/15 10:53 AM, ma...@apache.org wrote: Author: markt Date: Tue Feb 10 15:53:06 2015 New Revision: 1658737 URL: http://svn.apache.org/r1658737 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 Ensure that a dropped connection does not leave references to the UpgradeProcessor Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 15:53:06 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,164 489 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,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682, 165 7 907,1658207 +/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,164 489 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,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682, 165 7 907,1658207,1658734 Modified:
[Bug 57509] maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException
https://issues.apache.org/bugzilla/show_bug.cgi?id=57509 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #8 from Mark Thomas ma...@apache.org --- (In reply to Shelson Ferrari from comment #7) - 4 bytes added is the correct fixe ? Yes. -- 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: r1658795 - in /tomcat/site/trunk: docs/download-60.html docs/download-70.html xdocs/download-60.xml xdocs/download-70.xml
Author: kkolinko Date: Tue Feb 10 20:23:19 2015 New Revision: 1658795 URL: http://svn.apache.org/r1658795 Log: Simplify download page by using ezt.py variable to hold a version number. Documentation for ezt.py is at https://code.google.com/p/ezt/wiki/Syntax Modified: tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/xdocs/download-60.xml tomcat/site/trunk/xdocs/download-70.xml Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1658795r1=1658794r2=1658795view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Tue Feb 10 20:23:19 2015 @@ -202,10 +202,11 @@ /div h3 id=Quick_NavigationQuick Navigation/h3 div class=text - -a href=https://www.apache.org/dist/tomcat/tomcat-6/KEYS;KEYS/a | -a href=#6.0.436.0.43/a | -a href=[preferred]tomcat/tomcat-6/v6.0.43 rel=nofollowBrowse/a | + +[define v]6.0.43[end] +a href=https://www.apache.org/dist/tomcat/tomcat-6/KEYS;KEYS/a | +a href=#[v][v]/a | +a href=[preferred]tomcat/tomcat-6/v[v] rel=nofollowBrowse/a | a href=http://archive.apache.org/dist/tomcat/tomcat-6;Archives/a /div @@ -252,12 +253,12 @@ /div -h3 id=6.0.436.0.43/h3 +h3 id=[v][v]/h3 div class=text p Please see the - a href=[preferred]tomcat/tomcat-6/v6.0.43/README.html rel=nofollowREADME/a + a href=[preferred]tomcat/tomcat-6/v[v]/README.html rel=nofollowREADME/a file for packaging information. It explains what every distribution contains. /p @@ -273,44 +274,44 @@ li -a href=[preferred]tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43.zip rel=nofollowzip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v].zip rel=nofollowzip/a +(a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v].zip.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v].zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43.tar.gz rel=nofollowtar.gz/a -(a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43.tar.gz.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43.tar.gz.md5;md5/a) +a href=[preferred]tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v].tar.gz rel=nofollowtar.gz/a +(a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v].tar.gz.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v].tar.gz.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-x86.zip rel=nofollow32-bit Windows zip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-x86.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-x86.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-windows-x86.zip rel=nofollow32-bit Windows zip/a +(a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-x64.zip rel=nofollow64-bit Windows zip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-x64.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-x64.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-windows-x64.zip rel=nofollow64-bit Windows zip/a +(a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-i64.zip rel=nofollow64-bit Itanium Windows zip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-6/v6.0.43/bin/apache-tomcat-6.0.43-windows-i64.zip.asc;pgp/a, -a
svn commit: r1658794 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/upgrade/
Author: markt Date: Tue Feb 10 20:21:38 2015 New Revision: 1658794 URL: http://svn.apache.org/r1658794 Log: Make code calling user provided listeners more robust. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 20:21:38 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790 Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java URL:
svn commit: r1658801 - in /tomcat/tc8.0.x/trunk: ./ bin/catalina-tasks.xml webapps/docs/changelog.xml
Author: markt Date: Tue Feb 10 20:35:24 2015 New Revision: 1658801 URL: http://svn.apache.org/r1658801 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558 Add missing JARs JARs in alpha order Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 10 20:35:24 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799 Modified: tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml?rev=1658801r1=1658800r2=1658801view=diff == --- tomcat/tc8.0.x/trunk/bin/catalina-tasks.xml (original) +++
Re: async and thread constraint
2015-02-10 14:16 GMT+03:00 Romain Manni-Bucau rmannibu...@gmail.com: Hi guys, in org.apache.coyote.AsyncStateMachine#asyncDispatch tomcat checks ContainerThreadMarker.isContainerThread() basically it prevents to use JAXRS 2 @Suspended without creating custom threads - which is not intended. I do not know what the above is about. Was this limitation intended or just to try to avoid to consume container threads? Looking at blame results, those lines were added in http://svn.apache.org/r1594198 Address root cause of ReadPendingException rather than swallowing it. Discussion that preceded that commit is in Re:r1593303 thread, http://tomcat.markmail.org/thread/4kwnhzwhhxi43sob quote I think I have got to the bottom of this. An async dispatch always adds the socket to the poller but if the dispatch occurs on a container thread then it will also be added to the poller when that thread exits the AbstractConnectionHandler.process() method. This looks like a bug with all the connectors but one that is more obvious with Nio2 because it triggers the ReadPendingException. Fixing this bug highlighted a minor issue on shutdown. I have a fix for that too. Commits to follow shortly. /quote Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 49785] Enabling TLS for JNDIRealm
https://issues.apache.org/bugzilla/show_bug.cgi?id=49785 Felix Schumacher felix.schumac...@internetallee.de changed: What|Removed |Added Attachment #25916|0 |1 is obsolete|| --- Comment #3 from Felix Schumacher felix.schumac...@internetallee.de --- Created attachment 32448 -- https://issues.apache.org/bugzilla/attachment.cgi?id=32448action=edit Enable starttls for JNDIRealm I integrated the functionality into JNDIRealm. There is no documentation yet and I am not sure, whether I should include the HostnameVerifier as an enum. I will extend the method, so that I can use the given string for construction of one. I will commit the code together with documentation to trunk if noone objects. -- 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: r1658827 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Author: markt
Date: Tue Feb 10 22:42:15 2015
New Revision: 1658827
URL: http://svn.apache.org/r1658827
Log:
Add test case to confirm current behaviour re BZ 57559.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1658827r1=1658826r2=1658827view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Tue
Feb 10 22:42:15 2015
@@ -2144,4 +2144,46 @@ public class TestAsyncContextImpl extend
ac.dispatch(target);
}
}
+
+// https://issues.apache.org/bugzilla/show_bug.cgi?id=57559
+@Test
+public void testAsyncRequestURI() throws Exception {
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext(, null);
+
+Servlet servlet = new AsyncRequestUriServlet();
+Wrapper wrapper1 = Tomcat.addServlet(ctx, bug57559, servlet);
+wrapper1.setAsyncSupported(true);
+ctx.addServletMapping(/, bug57559);
+
+tomcat.start();
+
+String uri = /foo/%24/bar;
+String uriDecoded = /foo/$/bar;
+
+ByteChunk body = getUrl(http://localhost:; + getPort()+ uri);
+
+Assert.assertEquals(uriDecoded, body.toString());
+}
+
+private static class AsyncRequestUriServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+
+if (DispatcherType.ASYNC.equals(req.getDispatcherType())) {
+resp.setContentType(text/plain);
+resp.setCharacterEncoding(UTF-8);
+resp.getWriter().write(req.getRequestURI());
+} else {
+req.startAsync().dispatch();
+}
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57546] Memory Leak in SecureNioChannel
https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Component|WebSocket |WebSocket Version|8.0.18 |7.0.59 Resolution|FIXED |--- Product|Tomcat 8|Tomcat 7 Target Milestone||--- --- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com --- Only the first part of the fix was applied to Tomcat 7 (r1658738). The second part was applied to Tomcat 8 (r1658794), but has not been ported to Tomcat 7 yet. Thus I am REOPENing this issue, so that it is not forgotten. The issues in the first part: - as noted by Remy (in Re: r1658734): Good find, but what happens if onDataAvailable or onWritePossible throw a runtime exception (like a NPE), since this is user code. It could also leak then ? Shouldn't the code catch everything, also call onError on the listener and close ? - as noted by Chris (in Re: r1658737): Is it worth predicating the log call with if(getLog().isDebugEnabled)? -- 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 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled
https://issues.apache.org/bugzilla/show_bug.cgi?id=57489 --- Comment #10 from wodenc...@gmail.com --- Hi Mark, I built Tomcat from Trunk and tested again. Unfortunately the issue happened again, here is the Stack Trace: 2015-02-10 16:01:13,056 CST ERROR [null] - java.io.IOException: at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessageBlock(WsRemoteEndpointImplBase.java:282) at org.apache.tomcat.websocket.WsSession.sendCloseMessage(WsSession.java:570) at org.apache.tomcat.websocket.WsSession.doClose(WsSession.java:478) at org.apache.tomcat.websocket.WsSession.close(WsSession.java:445) at org.apache.tomcat.websocket.WsSession.close(WsSession.java:439) at org.atmosphere.container.version.JSR356WebSocket.close(JSR356WebSocket.java:104) at org.atmosphere.websocket.WebSocket.close(WebSocket.java:264) at org.atmosphere.cpr.AtmosphereResponse.close(AtmosphereResponse.java:836) at org.atmosphere.cpr.AtmosphereResourceImpl.cancel(AtmosphereResourceImpl.java:720) at org.atmosphere.cpr.AtmosphereResourceImpl.close(AtmosphereResourceImpl.java:785) at com.vaadin.server.communication.AtmospherePushConnection.disconnect(AtmospherePushConnection.java:294) at com.vaadin.server.communication.AtmospherePushConnection.connect(AtmospherePushConnection.java:232) at com.vaadin.server.communication.PushHandler$2.run(PushHandler.java:135) at com.vaadin.server.communication.PushHandler.callWithUi(PushHandler.java:253) at com.vaadin.server.communication.PushHandler.access$200(PushHandler.java:56) at com.vaadin.server.communication.PushHandler$1.onRequest(PushHandler.java:74) at org.atmosphere.cpr.AsynchronousProcessor.action(AsynchronousProcessor.java:174) at org.atmosphere.cpr.AsynchronousProcessor.suspended(AsynchronousProcessor.java:95) at org.atmosphere.container.Servlet30CometSupport.service(Servlet30CometSupport.java:66) at org.atmosphere.cpr.AtmosphereFramework.doCometSupport(AtmosphereFramework.java:1802) at org.atmosphere.websocket.DefaultWebSocketProcessor.dispatch(DefaultWebSocketProcessor.java:432) at org.atmosphere.websocket.DefaultWebSocketProcessor.open(DefaultWebSocketProcessor.java:186) at org.atmosphere.container.JSR356Endpoint.onOpen(JSR356Endpoint.java:160) at org.apache.tomcat.websocket.server.WsHttpUpgradeHandler.init(WsHttpUpgradeHandler.java:138) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:687) at org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:223) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1558) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1515) at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Unknown Source) Caused by: java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled at org.apache.tomcat.websocket.FutureToSendHandler.get(FutureToSendHandler.java:102) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessageBlock(WsRemoteEndpointImplBase.java:275) ... 31 more Caused by: java.io.IOException: Key must be cancelled at org.apache.coyote.http11.upgrade.NioServletOutputStream.doWriteInternal(NioServletOutputStream.java:84) at org.apache.coyote.http11.upgrade.NioServletOutputStream.doWrite(NioServletOutputStream.java:61) at org.apache.coyote.http11.upgrade.AbstractServletOutputStream.writeInternal(AbstractServletOutputStream.java:165) at org.apache.coyote.http11.upgrade.AbstractServletOutputStream.write(AbstractServletOutputStream.java:132) at org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.onWritePossible(WsRemoteEndpointImplServer.java:99) at org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.doWrite(WsRemoteEndpointImplServer.java:81) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.writeMessagePart(WsRemoteEndpointImplBase.java:450) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessage(WsRemoteEndpointImplBase.java:338) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessageBlock(WsRemoteEndpointImplBase.java:270) ... 31 more Caused by: java.util.concurrent.ExecutionException: at org.apache.tomcat.websocket.FutureToSendHandler.get(FutureToSendHandler.java:102) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessageBlock(WsRemoteEndpointImplBase.java:275) at org.apache.tomcat.websocket.WsSession.sendCloseMessage(WsSession.java:570) at org.apache.tomcat.websocket.WsSession.doClose(WsSession.java:478) at org.apache.tomcat.websocket.WsSession.close(WsSession.java:445) at
[Bug 57559] Decoded Request URI used for Asynchronous dispatch
https://issues.apache.org/bugzilla/show_bug.cgi?id=57559 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #1 from Mark Thomas ma...@apache.org --- The specification text you quoted skips over a few things. The main one is how tricky it is to split an undecoded URI into contextPath, servletPath and pathInfo. See the getContextPath() implementation in [1] for an idea of just how messy this could get. I have no desire to see that sort of code in something that is meant to be a convenience method. Elsewhere in the Servlet spec (including for async) dispatches are handled in terms of decoded paths relative to a context root. The convenience dispatch() methods needs to be handled the same way to avoid a whole pile of unnecessary complexity. If you need the original request URI it is available via the usual request attribute. I'll raise this with the Servlet EG to see if the wording of this can be changed/improved but - as far as Tomcat is concerned - this is a WONTFIX. Note if the EG opt for the behavior you are asking for I'll re-open this issue. I've added a test case that confirms the observed behavior. [1] http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?view=annotate -- 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 57546] Memory Leak in SecureNioChannel
https://issues.apache.org/bugzilla/show_bug.cgi?id=57546 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #7 from Mark Thomas ma...@apache.org --- This wasn't forgotten it deliberately wasn't back-ported because this isn't user code in Tomcat 7. It is a Tomcat internal API only used by WebSockets and we know exactly which exceptions are thrown. Therefore the additional protection added in trunk and 8.0.x is not necessary in 7.0.x. Regarding the debug, the look-up in the StringManager is likely to be much faster than the throwing of the Exception that triggers this look-up. Performance is pretty much a lost cause once an Exception has been thrown. -- 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: async and thread constraint
On 10/02/2015 23:06, Konstantin Kolinko wrote: 2015-02-10 14:16 GMT+03:00 Romain Manni-Bucau rmannibu...@gmail.com: Hi guys, in org.apache.coyote.AsyncStateMachine#asyncDispatch tomcat checks ContainerThreadMarker.isContainerThread() basically it prevents to use JAXRS 2 @Suspended without creating custom threads - which is not intended. I do not know what the above is about. Me neither. Was this limitation intended or just to try to avoid to consume container threads? In addition to the reason Konstantin explains below, it is also a performance benefit. If we are already on a container thread and need to process a dispatch() it is much more efficient to stay on that container thread to process the dispatch() than it is to return the current container thread to the pool, monkey about with the poller (or equivalent for the connector in question) to trigger an event, wait for the event to fire and poller to allocate the socket to a container thread and then process the dispatch. Mark Looking at blame results, those lines were added in http://svn.apache.org/r1594198 Address root cause of ReadPendingException rather than swallowing it. Discussion that preceded that commit is in Re:r1593303 thread, http://tomcat.markmail.org/thread/4kwnhzwhhxi43sob quote I think I have got to the bottom of this. An async dispatch always adds the socket to the poller but if the dispatch occurs on a container thread then it will also be added to the poller when that thread exits the AbstractConnectionHandler.process() method. This looks like a bug with all the connectors but one that is more obvious with Nio2 because it triggers the ReadPendingException. Fixing this bug highlighted a minor issue on shutdown. I have a fix for that too. Commits to follow shortly. /quote 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
[Bug 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled
https://issues.apache.org/bugzilla/show_bug.cgi?id=57489 --- Comment #9 from Mark Thomas ma...@apache.org --- OK. I've made various changes to 8.0.x that should at least make this less likely and hopefully prevent. If you could test with the current 8.0.x and let us know the results that would be great. -- 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 45014] Request and Response classes should have wrappers for use in Valves
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014 --- Comment #17 from mr.oliver.hernan...@gmail.com --- I tend to agree more with Christopher, mainly because of this section of the javadoc for the Valve interface that is misleading: Consume bytes from the input stream associated with the Request, unless it is completely generating the response, **OR WRAPPING THE REQUEST** before passing it on. When I read that, I had high hopes of implementing a custom valve easily. Then it was surprising that I could only find one example, Christopher's, of how to wrap the request when a valve needs to consume data from the input stream, and that Tomcat did not provide any wrapper class. So I refactored an example servlet filter from http://architects.dzone.com/articles/debugging-soap-logging, and got it to work as a valve. The tricky part was figuring out that the HttpServletRequest is doubly wrapped inside the org.apache.catalina.connector.Request class. If the convenience of a built-in wrapper class will not be added, hopefully the attached project will suffice for any others needing to do the same thing we did. -- 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 57556] getServletContext().getRealPath(/) returns path not ending with /
https://issues.apache.org/bugzilla/show_bug.cgi?id=57556 --- Comment #2 from Mark Thomas ma...@apache.org --- This will be the new resources implementation introduced in 8.0.x. I don't see any reason not to restore the trailing separator for a directory for backwards compatibility but I say that not having looked at the code. -- 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 45014] Request and Response classes should have wrappers for use in Valves
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014 --- Comment #16 from mr.oliver.hernan...@gmail.com --- Created attachment 32446 -- https://issues.apache.org/bugzilla/attachment.cgi?id=32446action=edit Maven project for a valve that dumps the full request with the body NOTE: For our use case, we needed a valve in JBoss, so this was coded against the forked version of Tomcat within JBoss. It should be simple to refactor for use with the main trunk of Tomcat. -- 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 57534] CorsFilter.SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES check shall ignore content-type parameters
https://issues.apache.org/bugzilla/show_bug.cgi?id=57534 Mark Thomas ma...@apache.org changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas ma...@apache.org --- This has the potential to get expensive performance-wise. Parsing mime-types from a content-type header is non-trivial but we do have o.a.tomcat.util.http.parser.MediaType and MediaTypeCache -- 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 57534] CorsFilter.SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES check shall ignore content-type parameters
https://issues.apache.org/bugzilla/show_bug.cgi?id=57534 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- Parsing is needed when you need the value of a parameter (e.g. charset). In this case just trimming at the first ';' is OK. -- 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 57559] Decoded Request URI used for Asynchronous dispatch
https://issues.apache.org/bugzilla/show_bug.cgi?id=57559 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- Previous discussion of this issue, ~8 months ago (June 2014): Decoded URL set on asynchronous request http://tomcat.markmail.org/thread/e33tqu7ayp2fguh4 -- 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
