[Bug 57626] IllegalStateException: zip file closed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57626 Vishal Mahajan changed: What|Removed |Added CC||vmaha...@zimbra.com -- 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
[VOTE] Release Apache Tomcat 7.0.63
The proposed Apache Tomcat 7.0.63 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.63/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1046/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_63/ The proposed 7.0.63 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.63 Stable Regards, Violeta
svn commit: r9565 [1/2] - in /dev/tomcat/tomcat-7/v7.0.63: ./ bin/ bin/embed/ bin/extras/ src/
Author: violetagg Date: Tue Jun 30 09:00:47 2015 New Revision: 9565 Log: Stage 7.0.63RC Added: dev/tomcat/tomcat-7/v7.0.63/ dev/tomcat/tomcat-7/v7.0.63/KEYS (with props) dev/tomcat/tomcat-7/v7.0.63/README.html (with props) dev/tomcat/tomcat-7/v7.0.63/RELEASE-NOTES dev/tomcat/tomcat-7/v7.0.63/bin/ dev/tomcat/tomcat-7/v7.0.63/bin/README.html (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.tar.gz.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.zip (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.zip.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.zip.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-deployer.zip.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-fulldocs.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-fulldocs.tar.gz.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-fulldocs.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-i64.zip (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-i64.zip.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-i64.zip.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-i64.zip.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x64.zip (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x64.zip.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x64.zip.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x64.zip.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x86.zip (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x86.zip.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x86.zip.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63-windows-x86.zip.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.exe (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.exe.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.exe.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.exe.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.tar.gz.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.zip (with props) dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.zip.asc dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.zip.md5 dev/tomcat/tomcat-7/v7.0.63/bin/apache-tomcat-7.0.63.zip.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/embed/ dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.tar.gz.asc dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip (with props) dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.asc dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.md5 dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/extras/ dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli-adapters.jar.md5 dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli-adapters.jar.sha1 dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli.jar.md5 dev/tomcat/tomcat-7/v7.0.63/bin/extras/tomcat-juli.jar.sha1
svn commit: r9565 [2/2] - in /dev/tomcat/tomcat-7/v7.0.63: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.md5 == --- dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.md5 Tue Jun 30 09:00:47 2015 @@ -0,0 +1 @@ +49e99ef33cd01297a258be9bc2da7a92 *apache-tomcat-7.0.63-embed.zip \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.sha1 == --- dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.sha1 (added) +++ dev/tomcat/tomcat-7/v7.0.63/bin/embed/apache-tomcat-7.0.63-embed.zip.sha1 Tue Jun 30 09:00:47 2015 @@ -0,0 +1 @@ +7ca1f187dc95c1435fca02283c375670a886cc86 *apache-tomcat-7.0.63-embed.zip \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.asc == --- dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.asc Tue Jun 30 09:00:47 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCgAGBQJVkk95AAoJECCLCrHWMBHHlWwP+wfHLHxVCSKH4MIbJYdhMUyj +8YHJosSjI9pUhl9FDIKk/qVbin9lqE9C1hw1l3zMT+Znr2RS/XM+TKM3/B0m5sbP +ofZIxxqT7IubBOH8zI7jkPZinuhyg013+CnJtYSDJYMW1sdDsBeC9wWKTbP14Qcn ++tAjAQ3K9o1V7rhVYe9wgguS2uyr0e5oJ2Hd/S8Pm2tablZOT7p61ex2X/o4PaTa +HC4EfRAXgqfhJ+Kfr1ltpnQ1698pUuCJneeSiObi81zTQ1n947rnQQN0+4BKOLFH +y39TZkT/E2oZrIQqSP1+wi2Licb6tLEeZ9aZU6VNTx/m1NvGMGPb5jab/5ecfR4V +GUHJVf2jGXV1DtuzvyHig6T2Ey15ti4CR7PgdcThELn7HFicb0m3U/PqgPH4FTOw +pC5FDufKAUj0EL5JlAoeJ2d8nHPJoM4Yz7QHXw89F16qxUy4iL5l4NhlUx/dFysS +OPzCu+We4ZPvO+69ieX6Dy/dJE25+CzSdHecmQT/iaPIsjBZDlk8Yj/W6LAix7Gp +UL/4r7s0atunLJ+E85OeMdkcSzoeHM2dK1A80m7DKUHJaq2wWjsB41rwBUbPQJcc +6Gh1H+JdULyBy17EoSpvPlwHJI0Adoq+/awda1i7HXKYiBmEdXRz/HvP03dYX1zq +bSWrohC6xUfdpFYthSWn +=QtDn +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.md5 Tue Jun 30 09:00:47 2015 @@ -0,0 +1 @@ +c813e6055d877eb1429a484114d72611 *catalina-jmx-remote.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.sha1 == --- dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.sha1 (added) +++ dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-jmx-remote.jar.sha1 Tue Jun 30 09:00:47 2015 @@ -0,0 +1 @@ +9e012dc53d530c17fa3eb2596ee5ee49106b3acd *catalina-jmx-remote.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar.asc == --- dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar.asc Tue Jun 30 09:00:47 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCgAGBQJVkk95AAoJECCLCrHWMBHHvRYP/2UZemZRfyXrb5DFBu88ouog +vfQLfdQlCbHqEeC0Hn/cEmR5GDuUVUtWUloFUILbbL08dDceK5CoggHbzm0vCsiz +WFrhuuZFkRvvJZD3M8pXXs7rdVCQeM7HxKHOC7ZiQygfOuhUMPVVs45qWi/ReSO9 +GqiTcoU+amSCGTa+KsqJytozHcznopntQgbxWvxmXUCPgJRhEovttH4N5ze/htBi +saC10y+ohjutGYLjxqjVDo84SPjjhhKbQhzIDGZMa2bLh4cLaUFVlcdpMThCtqRe +vd08E8zneNVb2dRog/C1mKX94nSFYGz07GyWPVqbhARpV2N1uwOVRrR+2aeAdhKm +mDLtJvjpM0TVk1HVASSGNJhKvxx9Tm/qT8t1cRFFv17IRr/wD65t7MiPASDr531M +9Pbrlh7oEMKWT9unwcz6XkvICa7bMFPklHxQh9F1XjTH/1OANnnrzrtTxpIrrGkx +yonEGsI3HN1rxRQx4jBp8Lt6DWwfL+iFMhHEx3gHs7lDzSPm+eZ3yU4Q+lZV+NJY +ckrXGP9JB73FraBeKpWTGd3nMTttAcyaF67GqeV+2Uzp7HnryStgdhstk1uXLfZr +T+Dgmp+443WOFqnBkwidoPjAlkW6a/FoRj8VsE0aMOnZQ5ps6u1ijZOTNvNUH1+4 +oYkku6RWF0F/FqU1B7j5 +=KxfB +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.63/bin/extras/catalina-ws.jar.md5 ===
svn commit: r1688407 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: violetagg Date: Tue Jun 30 09:06:21 2015 New Revision: 1688407 URL: http://svn.apache.org/r1688407 Log: Prep for next version Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1688407&r1=1688406&r2=1688407&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Tue Jun 30 09:06:21 2015 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=63 +version.build=64 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1688407&r1=1688406&r2=1688407&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Tue Jun 30 09:06:21 2015 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.63 +maven.asf.release.deploy.version=7.0.64 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1688407&r1=1688406&r2=1688407&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jun 30 09:06:21 2015 @@ -57,6 +57,8 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1688424 - /tomcat/trunk/build.properties.default
Author: markt Date: Tue Jun 30 11:05:48 2015 New Revision: 1688424 URL: http://svn.apache.org/r1688424 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58083 Remove duplicates (these are defined in build.xml) Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1688424&r1=1688423&r2=1688424&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Tue Jun 30 11:05:48 2015 @@ -71,8 +71,6 @@ base.path=/usr/share/java #base.path=C:/path/to/the/repository #base.path=/usr/local -compile.source=1.8 -compile.target=1.8 compile.debug=true # Do not pass -deprecation (-Xlint:deprecation) flag to javac - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58083] Duplicate property definitions compile.[source|target] in build.properties.default and build.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=58083 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1688439 - /tomcat/trunk/java/org/apache/catalina/Context.java
Author: markt Date: Tue Jun 30 12:14:25 2015 New Revision: 1688439 URL: http://svn.apache.org/r1688439 Log: Trivial commit to test CI system Modified: tomcat/trunk/java/org/apache/catalina/Context.java Modified: tomcat/trunk/java/org/apache/catalina/Context.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1688439&r1=1688438&r2=1688439&view=diff == --- tomcat/trunk/java/org/apache/catalina/Context.java (original) +++ tomcat/trunk/java/org/apache/catalina/Context.java Tue Jun 30 12:14:25 2015 @@ -348,6 +348,8 @@ public interface Context extends Contain /** * Return the deny-uncovered-http-methods flag for this web application. + * + * @return The current value of the flag */ public boolean getDenyUncoveredHttpMethods(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1688442 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Author: remm
Date: Tue Jun 30 12:41:16 2015
New Revision: 1688442
URL: http://svn.apache.org/r1688442
Log:
Remove spaces.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1688442&r1=1688441&r2=1688442&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Tue Jun 30 12:41:16 2015
@@ -72,7 +72,7 @@ public class SSLHostConfigCertificate {
// Common
-public Type getType() {
+public Type getType() {
return type;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1688445 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java LocalStrings.properties
Author: markt
Date: Tue Jun 30 13:13:43 2015
New Revision: 1688445
URL: http://svn.apache.org/r1688445
Log:
Fix some i18n TODOs
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1688445&r1=1688444&r2=1688445&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Jun
30 13:13:43 2015
@@ -186,8 +186,8 @@ public class Http2UpgradeHandler extends
remoteSettings.set(id, value);
}
} catch (Http2Exception | IOException ioe) {
-// TODO i18n
-throw new ProtocolException();
+throw new ProtocolException(
+sm.getString("upgradeHandler.upgrade.fail",
connectionId));
}
}
@@ -204,8 +204,8 @@ public class Http2UpgradeHandler extends
try {
parser.readConnectionPreface();
} catch (Http2Exception e) {
-// TODO i18n
-throw new ProtocolException();
+throw new ProtocolException(
+sm.getString("upgradeHandler.invalidPreface",
connectionId));
}
if (webConnection != null) {
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1688445&r1=1688444&r2=1688445&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue Jun
30 13:13:43 2015
@@ -78,6 +78,7 @@ upgradeHandler.allocate.recipient=Connec
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], RST
(closing stream)
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
upgradeHandler.init=Connection [{0}]
+upgradeHandler.invalidPreface=Connection [{0}], Invalid connection preface
upgradeHandler.ioerror=Connection [{0}]
upgradeHandler.pause.entry=Connection [{0}] Pausing
upgradeHandler.sendPrefaceFail=Failed to send preface to client
@@ -89,6 +90,7 @@ upgradeHandler.tooManyRemoteStreams=The
upgradeHandler.unexpectedEos=Unexpected end of stream
upgradeHandler.unexpectedStatus=An unexpected value of status ([{0}]) was
passed to this method
upgradeHandler.upgrade=Connection [{0}], HTTP/1.1 upgrade to stream [1]
+upgradeHandler.upgrade.fail=Connection [{0}], HTTP/1.1 upgrade failed
upgradeHandler.upgradeDispatch.entry=Entry, Connection [{0}], SocketStatus
[{1}]
upgradeHandler.upgradeDispatch.exit=Exit, Connection [{0}], SocketState [{1}]
upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1688478 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/storeconfig/ coyote/ coyote/ajp/ coyote/http11/ tomcat/util/net/
Author: remm
Date: Tue Jun 30 16:06:24 2015
New Revision: 1688478
URL: http://svn.apache.org/r1688478
Log:
Add new Connector children to storeconfig (with utility methods to allow
accessing the configuration). Some work remains on attributes.
Added:
tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1688478&r1=1688477&r2=1688478&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Jun 30
16:06:24 2015
@@ -858,10 +858,17 @@ public class Connector extends Lifecycle
protocolHandler.addSslHostConfig(sslHostConfig);
}
+public SSLHostConfig[] findSslHostConfigs() {
+return protocolHandler.findSslHostConfigs();
+}
+
public void addUpgradeProtocol(UpgradeProtocol upgradeProtocol) {
protocolHandler.addUpgradeProtocol(upgradeProtocol);
}
+public UpgradeProtocol[] findUpgradeProtocols() {
+return protocolHandler.findUpgradeProtocols();
+}
// - Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java?rev=1688478&r1=1688477&r2=1688478&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java Tue Jun
30 16:06:24 2015
@@ -21,6 +21,8 @@ import java.io.PrintWriter;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.connector.Connector;
+import org.apache.coyote.UpgradeProtocol;
+import org.apache.tomcat.util.net.SSLHostConfig;
/**
* Store Connector and Listeners
@@ -44,6 +46,12 @@ public class ConnectorSF extends StoreFa
// Store nested elements
LifecycleListener listeners[] = connector.findLifecycleListeners();
storeElementArray(aWriter, indent, listeners);
+// Store nested elements
+UpgradeProtocol[] upgradeProtocols =
connector.findUpgradeProtocols();
+storeElementArray(aWriter, indent, upgradeProtocols);
+// Store nested elements
+SSLHostConfig[] hostConfigs = connector.findSslHostConfigs();
+storeElementArray(aWriter, indent, hostConfigs);
}
}
@@ -60,15 +68,6 @@ public class ConnectorSF extends StoreFa
if (aDesc.isAttributes()) {
getStoreAppender().printAttributes(aWriter, indent, false, bean,
aDesc);
-/*
- * if (bean instanceof Connector) { StoreDescription elementDesc =
- * getRegistry().findDescription( bean.getClass().getName() +
- * ".[ProtocolHandler]"); if (elementDesc != null) {
ProtocolHandler
- * protocolHandler = ((Connector) bean) .getProtocolHandler(); if
- * (protocolHandler != null)
- * getStoreAppender().printAttributes(aWriter, indent, false,
- * protocolHandler, elementDesc); } }
- */
}
}
Added: tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java?rev=1688478&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
(added)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java Tue
Jun 30 16:06:24 2015
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a
svn commit: r1688483 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Author: remm
Date: Tue Jun 30 16:50:26 2015
New Revision: 1688483
URL: http://svn.apache.org/r1688483
Log:
Fix protocol when using APR but the NIO connector (to be able to use OpenSSL),
which fixes storeconfig attribute handling.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1688483&r1=1688482&r2=1688483&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Jun 30
16:50:26 2015
@@ -539,13 +539,13 @@ public class Connector extends Lifecycle
*/
public String getProtocol() {
-if ("org.apache.coyote.http11.Http11NioProtocol".equals
-(getProtocolHandlerClassName())
+if (("org.apache.coyote.http11.Http11NioProtocol".equals
+(getProtocolHandlerClassName()) &&
!AprLifecycleListener.isAprAvailable())
|| "org.apache.coyote.http11.Http11AprProtocol".equals
(getProtocolHandlerClassName())) {
return "HTTP/1.1";
-} else if ("org.apache.coyote.ajp.AjpNioProtocol".equals
- (getProtocolHandlerClassName())
+} else if (("org.apache.coyote.ajp.AjpNioProtocol".equals
+ (getProtocolHandlerClassName()) &&
!AprLifecycleListener.isAprAvailable())
|| "org.apache.coyote.ajp.AjpAprProtocol".equals
(getProtocolHandlerClassName())) {
return "AJP/1.3";
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58086] New: Deploy WAR file using http:// throws FileNotFoundException
https://bz.apache.org/bugzilla/show_bug.cgi?id=58086 Bug ID: 58086 Summary: Deploy WAR file using http:// throws FileNotFoundException Product: Tomcat 7 Version: unspecified Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Manager Assignee: dev@tomcat.apache.org Reporter: ljader...@gmail.com Hi all. I have an Ant target which deploys WAR file to Tomcat7 instance using taskdef for DeployTask class. WAR file is passed as URL - http:// I'm executing this on Windows 7 64bit with JDK 1.7 Sample part of failing target: http://localhost:8080/manager/text"; path="/testdeploy" war="http://server.pl/app.war"; username="user" password="pass" failOnError="true" logerror="true"/> This execution fails and exception is thrown (sorry for Polish message): test_deploy.xml:37: java.io.FileNotFoundException: http:\server.pl\app.war (Nazwa pliku, nazwa katalogu lub skladnia etykiety woluminu jest niepoprawna) at java.io.FileInputStream.open(Native Method) at java.io.FileInputStream.(FileInputStream.java:146) at java.io.FileInputStream.(FileInputStream.java:101) at org.apache.catalina.ant.DeployTask.execute(DeployTask.java:155) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106) at org.apache.tools.ant.Task.perform(Task.java:348) at org.apache.tools.ant.Target.execute(Target.java:435) at org.apache.tools.ant.Target.performTasks(Target.java:456) at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1393) at org.apache.tools.ant.Project.executeTarget(Project.java:1364) at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41) at org.apache.tools.ant.Project.executeTargets(Project.java:1248) at org.apache.tools.ant.Main.runBuild(Main.java:851) at org.apache.tools.ant.Main.startAnt(Main.java:235) at org.apache.tools.ant.launch.Launcher.run(Launcher.java:280) at org.apache.tools.ant.launch.Launcher.main(Launcher.java:109) == Question == Does implementation of DeployTask is incorrect? I think there is error in content of this "if" - I think it should be replaced with "else" code: https://github.com/apache/tomcat/blob/trunk/java/org/apache/catalina/ant/DeployTask.java#L143 Or I am using this task the wrong way? -- 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: r1688521 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt
Date: Tue Jun 30 21:19:19 2015
New Revision: 1688521
URL: http://svn.apache.org/r1688521
Log:
Replace initialized flag with simple state machine
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1688521&r1=1688520&r2=1688521&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Jun
30 21:19:19 2015
@@ -95,6 +95,11 @@ public class Http2UpgradeHandler extends
private static final byte[] HTTP2_UPGRADE_ACK = ("HTTP/1.1 101 Switching
Protocols\r\n" +
"Connection: Upgrade\r\nUpgrade:
h2c\r\n\r\n").getBytes(StandardCharsets.ISO_8859_1);
+private static final int STATE_NEW = 0;
+private static final int STATE_CONNECTED = 1;
+private static final int STATE_PAUSED = 2;
+private static final int STATE_CLOSED =3;
+
private final String connectionId;
private final Adapter adapter;
@@ -103,7 +108,9 @@ public class Http2UpgradeHandler extends
private volatile Http2Parser parser;
-private volatile boolean initialized = false;
+// Simple state machine (sequence of states)
+
+private AtomicInteger connectionState = new AtomicInteger(STATE_NEW);
private final ConnectionSettings remoteSettings = new ConnectionSettings();
private final ConnectionSettings localSettings = new ConnectionSettings();
@@ -155,9 +162,12 @@ public class Http2UpgradeHandler extends
log.debug(sm.getString("upgradeHandler.init", connectionId));
}
+if (!connectionState.compareAndSet(STATE_NEW, STATE_CONNECTED)) {
+return;
+}
+
parser = new Http2Parser(connectionId, this, this);
-initialized = true;
Stream stream = null;
socketWrapper.setReadTimeout(getReadTimeout());
@@ -235,10 +245,9 @@ public class Http2UpgradeHandler extends
log.debug(sm.getString("upgradeHandler.upgradeDispatch.entry",
connectionId, status));
}
-if (!initialized) {
-// WebConnection is not used so passing null here is fine
-init(null);
-}
+// WebConnection is not used so passing null here is fine
+// Might not be necessary. init() will handle that.
+init(null);
SocketState result = SocketState.CLOSED;
@@ -323,7 +332,8 @@ public class Http2UpgradeHandler extends
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.pause.entry",
connectionId));
}
-// TODO: Stop accepting new streams
+
+connectionState.compareAndSet(STATE_CONNECTED, STATE_PAUSED);
}
@@ -686,6 +696,7 @@ public class Http2UpgradeHandler extends
private void close() {
+connectionState.set(STATE_CLOSED);
try {
socketWrapper.close();
} catch (IOException ioe) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58083] Duplicate property definitions compile.[source|target] in build.properties.default and build.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=58083 --- Comment #1 from Sebb --- For completeness: URL: http://svn.apache.org/r1688424 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58083 Remove duplicates (these are defined in build.xml) -- 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: r1688563 - /tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
Author: violetagg
Date: Wed Jul 1 06:57:22 2015
New Revision: 1688563
URL: http://svn.apache.org/r1688563
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58086
Fixed wrong if clause that causes FileNotFoundException. Based on a patch
provided by Lukasz Jader.
Modified:
tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java?rev=1688563&r1=1688562&r2=1688563&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/DeployTask.java Wed Jul 1
06:57:22 2015
@@ -140,7 +140,7 @@ public class DeployTask extends Abstract
String contentType = null;
int contentLength = -1;
if (war != null) {
-if (war.startsWith("file:")) {
+if (!war.startsWith("file:")) {
try {
URL url = new URL(war);
URLConnection conn = url.openConnection();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
