[Bug 64191] Applications not working with 7.0.100
https://bz.apache.org/bugzilla/show_bug.cgi?id=64191 --- Comment #18 from thomas.w...@gfk.com --- May I ask the question, when the next release will happen? I mean, it's kind of urgent to install an update due to the security breach ... -- 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: sources repository for taglibs-standard-impl/specs-1.2.5-migrated-0.0.1
On 15/03/2020 23:37, Olivier Lamy wrote: > Hi > I wonder if there is any source repo (git/svn) for those jars which has > been dropped with 10 release? > they contains relocation to jakarta namespace but I cannot find any > official sources? (maven metadata seems > wrong META-INF/maven/org.apache.taglibs/taglibs-standard-impl/pom.xml) They are the Apache Taglibs 1.2.5 JARs from here: https://tomcat.apache.org/download-taglibs.cgi That have been processed with the Apache Tomcat migration tool for Jakarta EE (using the 0.0.1 tag): https://github.com/apache/tomcat-jakartaee-migration Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 10.0.0-M3
The following votes were cast: binding: +1: remm, markt, mgrigorov No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_242; Windows 10 10.0)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/10.0.0-M3/tomcat-i18n-de-10.0.0-M3.pom.asc(SHA1: accb8307e6cdcddc563a8c06293e19ce56d18c8b)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M3/tomcat-i18n-de-10.0.0-M3.jar.asc(SHA1: fc712071a69ca2854777b22c53e6a6135b30dc02)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M3/tomcat-i18n-de-10.0.0-M3.pom(SHA1: 67983ee3326a5dd61bb703f47a79da3be7c8160f)/org/apache/tomcat/tomcat-i18n-de/10.0.0-M3/tomcat-i18n-de-10.0.0-M3.jar(SHA1: d03a653348946af0ebc75de6ba1fea59b453578f)/org/apache/tomcat/tomcat-jni/10.0.0-M3/tomcat-jni-10.0.0-M3.jar(SHA1: ebe449bcbd47734c5ea0ebeb3cab79bb9db05700)/org/apache/tomcat/tomcat-jni/10.0.0-M3/tomcat-jni-10.0.0-M3-sources.jar(SHA1: b4086acfabed1a5b6aa865168672f4aa057f3e03)/org/apache/tomcat/tomcat-jni/10.0.0-M3/tomcat-jni-10.0.0-M3-sources.jar.asc(SHA1: 9e59a3837b05debf4991f2e9f6c551c020f888af)/org/apache/tomcat/tomcat-jni/10.0.0-M3/tomcat-jni-10.0.0-M3.jar.asc(SHA1: e5313dcefaa44673dfa32a240e1640eddf66cb77)/org/apache/tomcat/tomcat-jni/10.0.0-M3/tomcat-jni-10.0.0-M3.pom(SHA1: 546871170c8f6f62b39aae304c181e1112565520)/org/apache/tomcat/tomcat-jni/10.0.0-M3/tomcat-jni-10.0.0-M3.pom.asc(SHA1: a8e15d92f3137acc935e5996ac457e3f83c5fdae)/org/apache/tomcat/tomcat-juli/10.0.0-M3/tomcat-juli-10.0.0-M3.jar(SHA1: d1bcc490ef0f1c55c88d2b72d95346d39a6f4ed9)/org/apache/tomcat/tomcat-juli/10.0.0-M3/tomcat-juli-10.0.0-M3-sources.jar(SHA1: d62b61dfe43ed62be727fb521a60acdbcb10b783)/org/apache/tomcat/tomcat-juli/10.0.0-M3/tomcat-juli-10.0.0-M3-sources.jar.asc(SHA1: fd0e020565b4ba826508b87636a41f0c83036efa)/org/apache/tomcat/tomcat-juli/10.0.0-M3/tomcat-juli-10.0.0-M3.pom.asc(SHA1: 1d1e3ed66ad86cf48a7a43f1fe44ae6eb60c5e05)/org/apache/tomcat/tomcat-juli/10.0.0-M3/tomcat-juli-10.0.0-M3.jar.asc(SHA1: 3f1cd62ef23960247561fb48f7eb8b7fd601b354)/org/apache/tomcat/tomcat-juli/10.0.0-M3/tomcat-juli-10.0.0-M3.pom(SHA1: f6c1846759a7decd3bcb625e65875f9f77607aae)/org/apache/tomcat/tomcat-util/10.0.0-M3/tomcat-util-10.0.0-M3.pom.asc(SHA1: 567f97c88010f45eb43186dd07e0182410855ff1)/org/apache/tomcat/tomcat-util/10.0.0-M3/tomcat-util-10.0.0-M3.jar.asc(SHA1: 10c2374059ce65ecebf4745f0d9f4d98029b93ec)/org/apache/tomcat/tomcat-util/10.0.0-M3/tomcat-util-10.0.0-M3-sources.jar(SHA1: 6f4781cf83fd28b08d6c185667af7ff70f1b5ba6)/org/apache/tomcat/tomcat-util/10.0.0-M3/tomcat-util-10.0.0-M3.jar(SHA1: e48d3a633ec28fc7a7fd7402dffd5d3259596b8c)/org/apache/tomcat/tomcat-util/10.0.0-M3/tomcat-util-10.0.0-M3-sources.jar.asc(SHA1: 23dc97f30f54b2a4bbee3dc82f426cc94b86883e)/org/apache/tomcat/tomcat-util/10.0.0-M3/tomcat-util-10.0.0-M3.pom(SHA1: 52261d15db6cb424527b7fcc0f751b05f8b19a9a)/org/apache/tomcat/tomcat-catalina/10.0.0-M3/tomcat-catalina-10.0.0-M3.pom.asc(SHA1: 3b2a60a9ac3069526ae166d3ffdfc9ab66e65e2d)/org/apache/tomcat/tomcat-catalina/10.0.0-M3/tomcat-catalina-10.0.0-M3-sources.jar(SHA1: e0d565b073fbf05fd2c41195b8267c4bf32be752)/org/apache/tomcat/tomcat-catalina/10.0.0-M3/tomcat-catalina-10.0.0-M3.jar.asc(SHA1: b6ebeac8fbc284f223f6c274a8a717ebbaecc104)/org/apache/tomcat/tomcat-catalina/10.0.0-M3/tomcat-catalina-10.0.0-M3-sources.jar.asc(SHA1: 3f21014f2eb448c020dcb4000cad10483d8fccfa)/org/apache/tomcat/tomcat-catalina/10.0.0-M3/tomcat-catalina-10.0.0-M3.pom(SHA1: 3f2626416bea03042c9d1047656fab4e3190f04d)/org/apache/tomcat/tomcat-catalina/10.0.0-M3/tomcat-catalina-10.0.0-M3.jar(SHA1: a646c7c6f54dbd49943fa6810cf80c336751295f)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M3/tomcat-i18n-fr-10.0.0-M3.jar.asc(SHA1: 46afd7c89d3b97fadc9f2562a2fab268b091d46a)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M3/tomcat-i18n-fr-10.0.0-M3.pom(SHA1: ca23b5bf0392a21fa226db28808be065d6357e57)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M3/tomcat-i18n-fr-10.0.0-M3.pom.asc(SHA1: 65ced770c4a067a46fdbeca5dbbccc2f8f9a34d2)/org/apache/tomcat/tomcat-i18n-fr/10.0.0-M3/tomcat-i18n-fr-10.0.0-M3.jar(SHA1: 0d093a57d569f55a0c5d2a14a1bf2d64117097e2)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M3/tomcat-i18n-cs-10.0.0-M3.pom.asc(SHA1: 1fefeb1b4a03d2ac6439455225516a5af1fc315a)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M3/tomcat-i18n-cs-10.0.0-M3.jar(SHA1: 7c7b16e25847ed0dd150187040be115365819177)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M3/tomcat-i18n-cs-10.0.0-M3.jar.asc(SHA1: e22d59834be5c941d6577253347a2e4d9a7b3955)/org/apache/tomcat/tomcat-i18n-cs/10.0.0-M3/tomcat-i18n-cs-10.0.0-M3.pom(SHA1: 8dd2b367c1463f6bb590dffd95174c0c95ab7044)/org/apache/tomcat/tomcat-jdbc/10.0.0-M3/tomcat-jdbc-10.0.0-M3-sources.jar.asc(SHA1: 5f60ed578585862deb58f88ab5dbc15ad04d906c)/org/apache/tomcat/tomcat-jdbc/10.0.0-M3/tomcat-jdbc-10.0.0-M3-sources.jar(SHA1: 9b65daa7ec3a172c63eb9bbeb61436cecefd)/org/apache/tomcat/tomcat-jdbc/10.0.0-M3/tomcat-jdbc-10.0.0-M3.pom.asc(SHA1: a2fb9eb36305768ab9bfca2d16543359b1ea833a)/org/apache/tomcat/
[tomcat] tag 7.0.103 created (now c4e59ac)
This is an automated email from the ASF dual-hosted git repository. violetagg pushed a change to tag 7.0.103 in repository https://gitbox.apache.org/repos/asf/tomcat.git. at c4e59ac (commit) This tag includes the following new commits: new c4e59ac Tag 7.0.103 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/01: Tag 7.0.103
This is an automated email from the ASF dual-hosted git repository. violetagg pushed a commit to tag 7.0.103 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c4e59ac215eebff2de5fd9d23fb37fe222bc99c5 Author: Violeta Georgieva AuthorDate: Mon Mar 16 08:10:46 2020 + Tag 7.0.103 --- build.properties.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties.default b/build.properties.default index 852ab41..f843490 100644 --- a/build.properties.default +++ b/build.properties.default @@ -27,7 +27,7 @@ version.major=7 version.minor=0 version.build=103 version.patch=0 -version.suffix=-dev +version.suffix= # - Source control flags - git.branch=7.0.x - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64222] Getting User from SSO using SPNEGO returns Tomcat Linux user instead of Windows user above Tomcat9.0.8 - Update documentation
https://bz.apache.org/bugzilla/show_bug.cgi?id=64222 b...@wigeogis.com changed: What|Removed |Added Summary|Getting User from SSO using |Getting User from SSO using |SPNEGO returns Tomcat Linux |SPNEGO returns Tomcat Linux |user instead of Windows |user instead of Windows |user above Tomcat9.0.8 |user above Tomcat9.0.8 - ||Update documentation Resolution|INVALID |--- Status|RESOLVED|REOPENED --- Comment #2 from b...@wigeogis.com --- OK, I have asked there, see But could you please give me an example how I should configure an AuthenticatedUserRealm in a correct way? (I don't get it from https://tomcat.apache.org/tomcat-9.0-doc/windows-auth-howto.html#Tomcat_instance_(Windows_server) -- 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 64191] Applications not working with 7.0.100
https://bz.apache.org/bugzilla/show_bug.cgi?id=64191 --- Comment #19 from mgrigorov --- The new release has been voted last week, but it has been canceled due to a problem. 7.0.103 has been just cut and a new vote will start in few minutes. Check the dev@ mailing list for details. -- 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 64222] Getting User from SSO using SPNEGO returns Tomcat Linux user instead of Windows user above Tomcat9.0.8 - Update documentation
https://bz.apache.org/bugzilla/show_bug.cgi?id=64222 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #3 from Mark Thomas --- Bugzilla is not a support forum. Support for using Apache Tomcat is available from the Apache Tomcat users mailing list. -- 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 64191] Applications not working with 7.0.100
https://bz.apache.org/bugzilla/show_bug.cgi?id=64191 --- Comment #20 from Mark Thomas --- (In reply to Thomas from comment #18) > May I ask the question, when the next release will happen? I mean, it's kind > of urgent to install an update due to the security breach ... No, it isn't. I assume you are referring to CVE-2020-1938. That can be mitigated entirely with appropriate configuration. Further assistance is available on the Apache Tomcat users mailing list if required. -- 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
Nexus: Staging Completed
Message from: https://repository.apache.orgDescription:Close for voting Tomcat 7.0.103Deployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "violetagg""ip" = "78.83.99.114"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/7.0.103/tomcat-i18n-de-7.0.103.pom(SHA1: ded64d740088e8505f3a863c9dd542afb14660ed)/org/apache/tomcat/tomcat-i18n-de/7.0.103/tomcat-i18n-de-7.0.103.pom.asc(SHA1: 299c5cd7406b5c632ebf838cebf6cc6a36f66daa)/org/apache/tomcat/tomcat-i18n-de/7.0.103/tomcat-i18n-de-7.0.103.jar(SHA1: 0a0877676dda7222345a960bf22d1fae52cc04a3)/org/apache/tomcat/tomcat-i18n-de/7.0.103/tomcat-i18n-de-7.0.103.jar.asc(SHA1: 8365d94b72f2b976876f1d56ed743c239781f345)/org/apache/tomcat/tomcat-juli/7.0.103/tomcat-juli-7.0.103-sources.jar.asc(SHA1: 8a94de4f0b916a87d0787f1db4bacdd69a7180c6)/org/apache/tomcat/tomcat-juli/7.0.103/tomcat-juli-7.0.103.pom(SHA1: 74a71ac7adcc632d7ddd237c082269fd74e8311e)/org/apache/tomcat/tomcat-juli/7.0.103/tomcat-juli-7.0.103.jar.asc(SHA1: 063f4006ae925eae5b8de8d0ad719b40f08d72f0)/org/apache/tomcat/tomcat-juli/7.0.103/tomcat-juli-7.0.103-sources.jar(SHA1: 895186be311f9f0ddf2b602bbf2e76ed83c14ed0)/org/apache/tomcat/tomcat-juli/7.0.103/tomcat-juli-7.0.103.jar(SHA1: b943d808faacef5a892350a50ea8d5899d0cf059)/org/apache/tomcat/tomcat-juli/7.0.103/tomcat-juli-7.0.103.pom.asc(SHA1: 763498ea5e346b694d70cbc5e66ec6e3352ee7d9)/org/apache/tomcat/tomcat-util/7.0.103/tomcat-util-7.0.103-sources.jar(SHA1: 37d175bdbb55708a6343a1b764cccf76ba5de1b3)/org/apache/tomcat/tomcat-util/7.0.103/tomcat-util-7.0.103.pom(SHA1: ec2e47c6dd922e4ac1e62db6bcb2b5f5d50439cf)/org/apache/tomcat/tomcat-util/7.0.103/tomcat-util-7.0.103-sources.jar.asc(SHA1: 49aa450186498cdfc392ea48e2f2507c1cd9d391)/org/apache/tomcat/tomcat-util/7.0.103/tomcat-util-7.0.103.pom.asc(SHA1: c7b23f7a6738c70e3099ef8b338743dec9d4b5a7)/org/apache/tomcat/tomcat-util/7.0.103/tomcat-util-7.0.103.jar(SHA1: bf0c54f15a4d94743c9c0ff0344b0e6248f0cb3b)/org/apache/tomcat/tomcat-util/7.0.103/tomcat-util-7.0.103.jar.asc(SHA1: 67cfe8faeb99ea3efe84557782b9ffa5953c5ff0)/org/apache/tomcat/tomcat-catalina/7.0.103/tomcat-catalina-7.0.103-sources.jar(SHA1: f76f4c07f89739d331d88beb20ec0f6af9fd6548)/org/apache/tomcat/tomcat-catalina/7.0.103/tomcat-catalina-7.0.103.pom(SHA1: 1ff6f075ad0a49accc62451f48b1e8f03c068d84)/org/apache/tomcat/tomcat-catalina/7.0.103/tomcat-catalina-7.0.103-sources.jar.asc(SHA1: a64928a836ff56c62ba0ae26263d72bd5d322e87)/org/apache/tomcat/tomcat-catalina/7.0.103/tomcat-catalina-7.0.103.jar(SHA1: b81203ac194a9922600fd6c253d862fd31747fc5)/org/apache/tomcat/tomcat-catalina/7.0.103/tomcat-catalina-7.0.103.jar.asc(SHA1: e8f4b61ebd444c3bc2612cd0fa91689c34780652)/org/apache/tomcat/tomcat-catalina/7.0.103/tomcat-catalina-7.0.103.pom.asc(SHA1: 3a5371fad44b2c95cb4afb852358adbe2613)/org/apache/tomcat/tomcat-catalina-ws/7.0.103/tomcat-catalina-ws-7.0.103.jar.asc(SHA1: e42f694d320ef5ae78ac8c85f4e26cb37a804746)/org/apache/tomcat/tomcat-catalina-ws/7.0.103/tomcat-catalina-ws-7.0.103-sources.jar(SHA1: 75639161248db25419b3cdae99cc43fb33bb0060)/org/apache/tomcat/tomcat-catalina-ws/7.0.103/tomcat-catalina-ws-7.0.103.jar(SHA1: 2594f4266237d17ad217026d331108f5c9f7c8da)/org/apache/tomcat/tomcat-catalina-ws/7.0.103/tomcat-catalina-ws-7.0.103.pom.asc(SHA1: f158a5cba575c5a66f64dfb5b3eea18dfe42)/org/apache/tomcat/tomcat-catalina-ws/7.0.103/tomcat-catalina-ws-7.0.103-sources.jar.asc(SHA1: 1dbbb6e7fff14a631bb21f67d9caba3d99db2f9d)/org/apache/tomcat/tomcat-catalina-ws/7.0.103/tomcat-catalina-ws-7.0.103.pom(SHA1: 80a080e3b375958446dbdd02cda3845ca3c397f4)/org/apache/tomcat/tomcat-i18n-fr/7.0.103/tomcat-i18n-fr-7.0.103.pom(SHA1: 8dce8a6d1f410411eae7af540e0f3f9141094554)/org/apache/tomcat/tomcat-i18n-fr/7.0.103/tomcat-i18n-fr-7.0.103.jar(SHA1: 4df971cc5823720565dab4bffab8b4eb51836357)/org/apache/tomcat/tomcat-i18n-fr/7.0.103/tomcat-i18n-fr-7.0.103.jar.asc(SHA1: 0d3816854954b02d785e130c2f6674cad8bb95d8)/org/apache/tomcat/tomcat-i18n-fr/7.0.103/tomcat-i18n-fr-7.0.103.pom.asc(SHA1: a5a9f30fd0fed44507f6cd9339e14244bb13f1cd)/org/apache/tomcat/tomcat-jdbc/7.0.103/tomcat-jdbc-7.0.103.pom(SHA1: 35f1e5b22917f238ffeab1f73750138698304780)/org/apache/tomcat/tomcat-jdbc/7.0.103/tomcat-jdbc-7.0.103-sources.jar(SHA1: b0b5f1b83808c158073bdcaa4f1c1928ad3a7632)/org/apache/tomcat/tomcat-jdbc/7.0.103/tomcat-jdbc-7.0.103.jar(SHA1: c78e0666b5de99cb6ca0c5193232ccf536044688)/org/apache/tomcat/tomcat-jdbc/7.0.103/tomcat-jdbc-7.0.103-sources.jar.asc(SHA1: 34e952edcaaab97423df90d38fb763536fc8bb80)/org/apache/tomcat/tomcat-jdbc/7.0.103/tomcat-jdbc-7.0.103.jar.asc(SHA1: 055498cd188952b6408d8af5720cad4db1717ae6)/org/apache/tomcat/tomcat-jdbc/7.0.103/tomcat-jdbc-7.0.103.pom.asc(SHA1: 13f13ef19563b79c996dedf23576bc1bf4d23fb2)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.103/tomcat-embed-logging-log4j-7.0.103.jar.asc(SHA1: a597709f50224dc3e8061581d9c2b1ec60c199dd)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.103/tomcat-
[tomcat] branch master updated: Update release date
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 986c51e Update release date 986c51e is described below commit 986c51eaeb1429059b9d5d122eb8af3514cc7185 Author: Mark Thomas AuthorDate: Mon Mar 16 09:09:04 2020 + Update release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 5212908..92114c6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -61,7 +61,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r38516 [2/2] - in /dev/tomcat/tomcat-7/v7.0.103: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli-adapters.jar.sha512 == --- dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli-adapters.jar.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli-adapters.jar.sha512 Mon Mar 16 09:12:10 2020 @@ -0,0 +1 @@ +4672b5578a9309dd0a115243336df89647f895b69c6a6326b7add054756066ed9f8cf5b9ef9ceff4ee0dc8670dfdce3cb1aa05dca9e71943e7c9cb75b0c75f7a *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.asc Mon Mar 16 09:12:10 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAl5vOk0ACgkQIIsKsdYw +EcfCuRAArsIo7hl0SUZkPbDXfUVnCJSlpoPuFuOvl6H++40N1gLOZPEFFUmuJD6K +FpYN0xWgEdo88KtDFFnYRxLp4Bd7c9ILWzxoYYPLnB9ofPvVQSq+5cNQbviL2EgW +EY2JmV/l2eF+ZFgIrzA2JWqy43xcQpWNhPWLWvuMXX8p3/ODZmk8tqcxpWgrXYH+ +tY5sluEzQTrEe0CK9Zkcp3Hgo95iu6rHUM+NPBamt1VwygHfhJ6a2M+nEiaRuMpl +25OpePixI0lmjxCLeCuqiK2CEg0if4aY5K6vYR+SHdR7YrBpJog2WrPRSkluIT7N +xfFq1IDz3cX9w49JI1yXTGD/Od1of/kq+3WRHeMNCyq6h8CUqQF6ogJEIsP2ZqPF +0Gdu3V+s+HRZkLLVUUjkaelsNGZE0+BacdqQwzNnC+aHoE2/mxpCyqrUL0D0JwBc +RwotIPVC6MNBuyRLpK1lHDj59tpDUCRdhc8Bog9CWDBeIiyB4KC7km1ayMj5F2ME +kppNG0lxfNaVJCdHn+RtcUnx4LHCQRMaJDChTcb+bxIB7/T1qT3Bsh1zigBCx4Mf +lv9uLYTDYTuc6n0k1TDLAzE3dRnnPLGUMcNSco/GyY77O/QFSlj+syTAcONCZpJw +lUkmjySlGUIdi3mF3zNJMwJJRGk/xZaoNzSfYtpMH1anLThbo5Y= +=5cir +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.sha512 == --- dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.sha512 Mon Mar 16 09:12:10 2020 @@ -0,0 +1 @@ +027e82c919c60f670727f5d6ac69de57b651d6624021138f9e77479ea15333e76954ad71463fbd8fc509145dd0dd22bade9a77ce61bf94a9e582fa70d529c1e0 *tomcat-juli.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.asc == --- dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.asc Mon Mar 16 09:12:10 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAl5vO8IACgkQIIsKsdYw +Ecc4jBAAzE2fNT3wiqMK0Qq3EkHQfh46Z/gSMfWpfckb7zGPz1/S+CLjmWiv+F++ +DxVCfIUTPy9hvIDNVvXaFJap26hi7wbi4dIJ9dzVCmjsveZnSDYUBVAqvOrs61Ri +izQxIHtqgKhwhfmDkM7kCbdjYstQ7uYq/HYronbK6amZi8LB+DQmPyFXdL/vOvYJ ++Qj210jhwxRCpQxdVTpmORgGqHy8i0A6XnW3YHzFHRZgC5E6jt+3rgQiw+Es/LGh +z5uXQbFnc8kJ8L/9X4AsPTq5xGMGsEx2K633+ZYZNbM29pzB++EO28FFRceSLhNj +QqOE9Cvo+69IAEnvQhVG4vjWAdG3eG0duZwnIeu3nM2w0hOxIGgzfMQ8WnkVCTwD +lcniHHZFtE8H6XSp48czctwbm567WSQL7BU2qBH+OgMCtNSO8JXEElux2bmCADnk +qYPwLRFY2HNuZD8moma+nhaRwgDEWX+u793iK5oyPRL5gLrtI6vEbHZY3L2EWuRM +wJKQI2+eh7UbQSO8Q2DlKOBRQFTfTuVfXVbk4WzJPERnydmF1p+JX/6hSfpp9bbr ++vdUGaMjMeZ6wPZTFe+GMp/lmqE6pfthtu4svI+2ve74Cp1QiLUTpw+Y+UvnJWch +IPY2EwjfjfVYDn4phEG5pVgwpClZmbSFZBuyVeFNySNiBRAISfg= +=+xGA +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.sha512 == --- dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.sha512 Mon Mar 16 09:12:10 2020 @@ -0,0 +1 @@ +812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b *apache-tomcat-7.0.103-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-s
svn commit: r38516 [1/2] - in /dev/tomcat/tomcat-7/v7.0.103: ./ bin/ bin/embed/ bin/extras/ src/
Author: violetagg Date: Mon Mar 16 09:12:10 2020 New Revision: 38516 Log: Stage Tomcat 7.0.103 Added: dev/tomcat/tomcat-7/v7.0.103/ dev/tomcat/tomcat-7/v7.0.103/KEYS dev/tomcat/tomcat-7/v7.0.103/README.html dev/tomcat/tomcat-7/v7.0.103/RELEASE-NOTES dev/tomcat/tomcat-7/v7.0.103/bin/ dev/tomcat/tomcat-7/v7.0.103/bin/README.html dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-deployer.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-deployer.tar.gz.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-deployer.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-deployer.zip (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-deployer.zip.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-deployer.zip.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-fulldocs.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-fulldocs.tar.gz.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-windows-x64.zip (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-windows-x64.zip.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-windows-x64.zip.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-windows-x86.zip (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-windows-x86.zip.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103-windows-x86.zip.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.exe (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.exe.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.exe.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.zip (with props) dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.zip.asc dev/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.zip.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/embed/ dev/tomcat/tomcat-7/v7.0.103/bin/embed/apache-tomcat-7.0.103-embed.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.103/bin/embed/apache-tomcat-7.0.103-embed.tar.gz.asc dev/tomcat/tomcat-7/v7.0.103/bin/embed/apache-tomcat-7.0.103-embed.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/embed/apache-tomcat-7.0.103-embed.zip (with props) dev/tomcat/tomcat-7/v7.0.103/bin/embed/apache-tomcat-7.0.103-embed.zip.asc dev/tomcat/tomcat-7/v7.0.103/bin/embed/apache-tomcat-7.0.103-embed.zip.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/extras/ dev/tomcat/tomcat-7/v7.0.103/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-7/v7.0.103/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-7/v7.0.103/bin/extras/catalina-jmx-remote.jar.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-7/v7.0.103/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-7/v7.0.103/bin/extras/catalina-ws.jar.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli-adapters.jar.sha512 dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-7/v7.0.103/bin/extras/tomcat-juli.jar.sha512 dev/tomcat/tomcat-7/v7.0.103/src/ dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.asc dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.zip (with props) dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.zip.asc dev/tomcat/tomcat-7/v7.0.103/src/apache-tomcat-7.0.103-src.zip.sha512 Added: dev/tomcat/tomcat-7/v7.0.103/KEYS == --- dev/tomcat/tomcat-7/v7.0.103/KEYS (added) +++ dev/tomcat/tomcat-7/v7.0.103/KEYS Mon Mar 16 09:12:10 2020 @@ -0,0 +1,650 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +Type Bits/KeyIDD
[VOTE][RESULT] Release Apache Tomcat 9.0.33
The following votes were cast: binding: +1: remm, markt, mgrigorov No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark - 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.103
The proposed Apache Tomcat 7.0.103 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.103/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1260/ The git tag is: https://github.com/apache/tomcat/tree/7.0.103 c4e59ac215eebff2de5fd9d23fb37fe222bc99c5 The proposed 7.0.103 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.103 Stable Regards, Violeta
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_242; Windows 10 10.0)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/9.0.33/tomcat-i18n-de-9.0.33.pom.asc(SHA1: 991341b6a2884852ac9c5d0013b1b85631fe5061)/org/apache/tomcat/tomcat-i18n-de/9.0.33/tomcat-i18n-de-9.0.33.jar(SHA1: a1c65a3c1d132d1dbfd6a2f7e8a9612f147baef5)/org/apache/tomcat/tomcat-i18n-de/9.0.33/tomcat-i18n-de-9.0.33.jar.asc(SHA1: 7a1ace94a00ed08eee2fec27d6eff5f31af490a4)/org/apache/tomcat/tomcat-i18n-de/9.0.33/tomcat-i18n-de-9.0.33.pom(SHA1: f5d74073161ec72bee530a2bc60ec50dbad67844)/org/apache/tomcat/tomcat-jni/9.0.33/tomcat-jni-9.0.33.jar(SHA1: a1a1bcab8d26aabe9580ba585d4a37c3039fcc4f)/org/apache/tomcat/tomcat-jni/9.0.33/tomcat-jni-9.0.33.pom.asc(SHA1: 1f8bd5fb7343e9ff99bf4ac8e0e10b13b43dab41)/org/apache/tomcat/tomcat-jni/9.0.33/tomcat-jni-9.0.33.pom(SHA1: a8ce6e9299659a3e59c84c9a6eb7917eaff53e62)/org/apache/tomcat/tomcat-jni/9.0.33/tomcat-jni-9.0.33-sources.jar.asc(SHA1: 977f52f47aba4207d8844dbcb67867fb3350cf3a)/org/apache/tomcat/tomcat-jni/9.0.33/tomcat-jni-9.0.33.jar.asc(SHA1: e80fc90b1b0ee5e4fd21e8899699e4f5fabd9ca1)/org/apache/tomcat/tomcat-jni/9.0.33/tomcat-jni-9.0.33-sources.jar(SHA1: 2eb92a67f3512159259fff8c81760e8a9dad913f)/org/apache/tomcat/tomcat-juli/9.0.33/tomcat-juli-9.0.33.jar.asc(SHA1: f51715f12a9d50c2da54d9e423bca55f64cbf06b)/org/apache/tomcat/tomcat-juli/9.0.33/tomcat-juli-9.0.33-sources.jar(SHA1: 49735f31425012dc708b40e10197d4f2b50cffb5)/org/apache/tomcat/tomcat-juli/9.0.33/tomcat-juli-9.0.33.pom(SHA1: 3501df6a7f875f6a719bb71243686b251067e125)/org/apache/tomcat/tomcat-juli/9.0.33/tomcat-juli-9.0.33.pom.asc(SHA1: 9817bcee2327981dee78ee6398d66d6c55913b13)/org/apache/tomcat/tomcat-juli/9.0.33/tomcat-juli-9.0.33-sources.jar.asc(SHA1: bdc86e72296bcc56337a903bba538983076485b9)/org/apache/tomcat/tomcat-juli/9.0.33/tomcat-juli-9.0.33.jar(SHA1: f6941166d20593ca1c11ccd3d7f31b0ac1ab3dc6)/org/apache/tomcat/tomcat-util/9.0.33/tomcat-util-9.0.33-sources.jar.asc(SHA1: 4d71caa9eadcb746997127098c6cd2434aa9d7c0)/org/apache/tomcat/tomcat-util/9.0.33/tomcat-util-9.0.33.pom(SHA1: 97d3bfeb9fa838c09b34a231d92be218e8e2ba86)/org/apache/tomcat/tomcat-util/9.0.33/tomcat-util-9.0.33.pom.asc(SHA1: be3298ade261b305a5ddfd1ee42784b281781e1d)/org/apache/tomcat/tomcat-util/9.0.33/tomcat-util-9.0.33.jar.asc(SHA1: 57bd23a51721ef54b66c3dfdeb77c3151b2bd220)/org/apache/tomcat/tomcat-util/9.0.33/tomcat-util-9.0.33-sources.jar(SHA1: 65eb44d831faa2db34100823ddf3e30caba4f8ae)/org/apache/tomcat/tomcat-util/9.0.33/tomcat-util-9.0.33.jar(SHA1: c0a2780baec463aa5b5732a9e545fe8c574e44e8)/org/apache/tomcat/tomcat-catalina/9.0.33/tomcat-catalina-9.0.33.jar(SHA1: f94ba22817b2cc46b2b52948dab6f3e89a62fa2d)/org/apache/tomcat/tomcat-catalina/9.0.33/tomcat-catalina-9.0.33.jar.asc(SHA1: b5b7e716464fd110066ff98e34755636d5e45e22)/org/apache/tomcat/tomcat-catalina/9.0.33/tomcat-catalina-9.0.33.pom.asc(SHA1: f3ba3e56e027d104840472a9ddb1fb1780200be4)/org/apache/tomcat/tomcat-catalina/9.0.33/tomcat-catalina-9.0.33-sources.jar.asc(SHA1: b11a5800446d0209c7b989eff91c69282c2f9951)/org/apache/tomcat/tomcat-catalina/9.0.33/tomcat-catalina-9.0.33.pom(SHA1: ea75ec758ccb8c0f409aca4034d7f416118b09b8)/org/apache/tomcat/tomcat-catalina/9.0.33/tomcat-catalina-9.0.33-sources.jar(SHA1: 3094299de93461b54af37c2107fbad81444101c3)/org/apache/tomcat/tomcat-i18n-fr/9.0.33/tomcat-i18n-fr-9.0.33.jar.asc(SHA1: 7842b5974bdbdfaf887ec4289652978293a9ef8a)/org/apache/tomcat/tomcat-i18n-fr/9.0.33/tomcat-i18n-fr-9.0.33.jar(SHA1: c5560c7b7f740e7328aca7c5f4527b5293378b02)/org/apache/tomcat/tomcat-i18n-fr/9.0.33/tomcat-i18n-fr-9.0.33.pom(SHA1: 382472398071899816fe6e0c06b8145a571f24a2)/org/apache/tomcat/tomcat-i18n-fr/9.0.33/tomcat-i18n-fr-9.0.33.pom.asc(SHA1: 9cee1b0a42ea1a26601c4c859be1f201035a7d20)/org/apache/tomcat/tomcat-i18n-cs/9.0.33/tomcat-i18n-cs-9.0.33.pom.asc(SHA1: 0fb0ee083272529c87592791405a7be485d2cece)/org/apache/tomcat/tomcat-i18n-cs/9.0.33/tomcat-i18n-cs-9.0.33.jar.asc(SHA1: 94daa674a082f21bcdd395c3aada25f77119e209)/org/apache/tomcat/tomcat-i18n-cs/9.0.33/tomcat-i18n-cs-9.0.33.jar(SHA1: eb7a2da13080ba503ff00a7e7ab8ab9e244b9dc9)/org/apache/tomcat/tomcat-i18n-cs/9.0.33/tomcat-i18n-cs-9.0.33.pom(SHA1: 75b0eed60e08480a23007bcd635aa1bfecd8ffc9)/org/apache/tomcat/tomcat-jdbc/9.0.33/tomcat-jdbc-9.0.33.jar.asc(SHA1: 7088808ca1f4f1798330a58ed76aebc5dd994fdb)/org/apache/tomcat/tomcat-jdbc/9.0.33/tomcat-jdbc-9.0.33-sources.jar(SHA1: 1babc83f3ed142a701d1ab391334f5e66f80ac2c)/org/apache/tomcat/tomcat-jdbc/9.0.33/tomcat-jdbc-9.0.33.pom(SHA1: 6520afbd1a5cef5937432e10dab110b9a182889d)/org/apache/tomcat/tomcat-jdbc/9.0.33/tomcat-jdbc-9.0.33-sources.jar.asc(SHA1: ae3c4c0e5e40c50bc9be69427d44f2a37554b9e8)/org/apache/tomcat/tomcat-jdbc/9.0.33/tomcat-jdbc-9.0.33.pom.asc(SHA1: f6f13b6d1286ea901311b4f5c075133c5a5848f5)/org/apache/tomcat/tomcat-jdbc/9.
[tomcat] branch 9.0.x updated: Add release date for 9.0.33
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new d058d14 Add release date for 9.0.33 d058d14 is described below commit d058d14c86eeea25be95bc6edfa86768579900d5 Author: Mark Thomas AuthorDate: Mon Mar 16 09:14:30 2020 + Add release date for 9.0.33 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e526259..1f5d266 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -46,7 +46,7 @@ --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 8.5.53
The following votes were cast: binding: +1: remm, markt, mgrigorov No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "markt""ip" = "86.190.55.221"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-i18n-de/8.5.53/tomcat-i18n-de-8.5.53.jar.asc(SHA1: cb77219278ac347bdef0d4b76d22e2f5ec575000)/org/apache/tomcat/tomcat-i18n-de/8.5.53/tomcat-i18n-de-8.5.53.jar(SHA1: 652fe0b0c6b69f32684d92acd461392f6aa26cf7)/org/apache/tomcat/tomcat-i18n-de/8.5.53/tomcat-i18n-de-8.5.53.pom.asc(SHA1: 9e8b326f43d870152ff6d3b5970198b2018a9f87)/org/apache/tomcat/tomcat-i18n-de/8.5.53/tomcat-i18n-de-8.5.53.pom(SHA1: 118371dde7b9d450c808ae4866d908a96fbd50bc)/org/apache/tomcat/tomcat-jni/8.5.53/tomcat-jni-8.5.53.jar.asc(SHA1: a254ba2cfc68aa048f22918a9a9d85395ab7294b)/org/apache/tomcat/tomcat-jni/8.5.53/tomcat-jni-8.5.53.pom(SHA1: 2f9b6b21478bf027f07bfd423060d034a2b38e2d)/org/apache/tomcat/tomcat-jni/8.5.53/tomcat-jni-8.5.53-sources.jar(SHA1: 8b93d38fcdca98a4f0789aab19429dc35147d13f)/org/apache/tomcat/tomcat-jni/8.5.53/tomcat-jni-8.5.53.pom.asc(SHA1: 94bcea5196f3628d1afdf4193be9ed239f011aa1)/org/apache/tomcat/tomcat-jni/8.5.53/tomcat-jni-8.5.53.jar(SHA1: df4304c55e3a21c9f3d2f2d116496a6449aa43d3)/org/apache/tomcat/tomcat-jni/8.5.53/tomcat-jni-8.5.53-sources.jar.asc(SHA1: 48f46a299ee28c1061e1ccad4d58adf38cbee280)/org/apache/tomcat/tomcat-juli/8.5.53/tomcat-juli-8.5.53.pom.asc(SHA1: 3845553c7f0571d6fe9fda7158561bb35150330f)/org/apache/tomcat/tomcat-juli/8.5.53/tomcat-juli-8.5.53.jar(SHA1: 057d37b5d7ed1270910ae59575b7c724bdf2d9f1)/org/apache/tomcat/tomcat-juli/8.5.53/tomcat-juli-8.5.53.jar.asc(SHA1: 4bcf250a33fef735c616426a90826b68642e282b)/org/apache/tomcat/tomcat-juli/8.5.53/tomcat-juli-8.5.53-sources.jar(SHA1: 396ef32726d66e02cf3884f912167616ea9f6856)/org/apache/tomcat/tomcat-juli/8.5.53/tomcat-juli-8.5.53.pom(SHA1: e322596f3e2c7c3446b56024fa77fe43547d0254)/org/apache/tomcat/tomcat-juli/8.5.53/tomcat-juli-8.5.53-sources.jar.asc(SHA1: 3f5f2bc8b9018f9e347e18a5f72fbeb6918fa1a4)/org/apache/tomcat/tomcat-util/8.5.53/tomcat-util-8.5.53-sources.jar.asc(SHA1: cb1f74eef96d85e4a412e090c4616db0809760c0)/org/apache/tomcat/tomcat-util/8.5.53/tomcat-util-8.5.53-sources.jar(SHA1: 9edb00ba8242122158a29f48e329a2cd3fa31b0f)/org/apache/tomcat/tomcat-util/8.5.53/tomcat-util-8.5.53.jar(SHA1: 868e95b06bafae38578f0f5832dc3e2439fb8681)/org/apache/tomcat/tomcat-util/8.5.53/tomcat-util-8.5.53.pom.asc(SHA1: 722af0ee0cd7d6446b51844e81da7b57730b5095)/org/apache/tomcat/tomcat-util/8.5.53/tomcat-util-8.5.53.pom(SHA1: 52a16de6b729cf6a684a4060b5fe7504882ef8d4)/org/apache/tomcat/tomcat-util/8.5.53/tomcat-util-8.5.53.jar.asc(SHA1: 747c461b97a7cc751b3087bc15bfa95402c26164)/org/apache/tomcat/tomcat-catalina/8.5.53/tomcat-catalina-8.5.53.jar.asc(SHA1: 06404651713e693ce32877753cda7c4d68878aab)/org/apache/tomcat/tomcat-catalina/8.5.53/tomcat-catalina-8.5.53.pom(SHA1: 26dc0701e8541f6108fd9f67ac44e2ddf4d762d5)/org/apache/tomcat/tomcat-catalina/8.5.53/tomcat-catalina-8.5.53.jar(SHA1: b1bbc91150a33d9c7a94432c5f36dbe3faf11497)/org/apache/tomcat/tomcat-catalina/8.5.53/tomcat-catalina-8.5.53-sources.jar.asc(SHA1: 2519c8527fed0830af82af9766c73c67e7c430b3)/org/apache/tomcat/tomcat-catalina/8.5.53/tomcat-catalina-8.5.53.pom.asc(SHA1: efc45472a5e4f29f9633453f3a2f5c10a7b88174)/org/apache/tomcat/tomcat-catalina/8.5.53/tomcat-catalina-8.5.53-sources.jar(SHA1: d78de82d550e2f8fb694ec10744d1f51890d2e99)/org/apache/tomcat/tomcat-catalina-ws/8.5.53/tomcat-catalina-ws-8.5.53.pom(SHA1: 5cc6d14489adbe024f928d3650902d16abeb59f7)/org/apache/tomcat/tomcat-catalina-ws/8.5.53/tomcat-catalina-ws-8.5.53.pom.asc(SHA1: 1b9d583debf0e6870a6b67a99cd3bc27bbd10ea5)/org/apache/tomcat/tomcat-catalina-ws/8.5.53/tomcat-catalina-ws-8.5.53.jar.asc(SHA1: 998f5c75ff242a4a728a8ee80285dfc8ad569a78)/org/apache/tomcat/tomcat-catalina-ws/8.5.53/tomcat-catalina-ws-8.5.53-sources.jar(SHA1: 4b1727e2c523d12db0abccc996df43ee6f083514)/org/apache/tomcat/tomcat-catalina-ws/8.5.53/tomcat-catalina-ws-8.5.53.jar(SHA1: fb090b3a862787c34c0a4d34090496c4cfdb0c30)/org/apache/tomcat/tomcat-catalina-ws/8.5.53/tomcat-catalina-ws-8.5.53-sources.jar.asc(SHA1: 595f724776f206d2a0933549ee55b8ba67f4e7ea)/org/apache/tomcat/tomcat-i18n-fr/8.5.53/tomcat-i18n-fr-8.5.53.pom(SHA1: a3a65ea4b701c9e9b6b515c5ded71e309e3d6ebf)/org/apache/tomcat/tomcat-i18n-fr/8.5.53/tomcat-i18n-fr-8.5.53.pom.asc(SHA1: 4131233ab53314406f74c2d353768a992d686fe5)/org/apache/tomcat/tomcat-i18n-fr/8.5.53/tomcat-i18n-fr-8.5.53.jar.asc(SHA1: d46b307041a8000ed439b4e1cea828fef2496688)/org/apache/tomcat/tomcat-i18n-fr/8.5.53/tomcat-i18n-fr-8.5.53.jar(SHA1: a5ad25120412fd411987d0cfd3fb19f9fa16d0ed)/org/apache/tomcat/tomcat-jdbc/8.5.53/tomcat-jdbc-8.5.53-sources.jar(SHA1: 49346ecb68a92004260a848838a1e2a3f5a263b1)/org/apache/tomcat/tomcat-jdbc/8.5.53/tomcat-jdbc-8.5.53.pom.asc(SHA1: 77b7f1d8c913ee330f9e5a6ab0d051fa4b4eb41e)/org/apache/tomcat/tomcat-jdbc/8.5.53/tomcat-jdbc-8.5.53.jar.asc(SHA1: 5232773
[tomcat] branch 7.0.x updated: Prep for next version
This is an automated email from the ASF dual-hosted git repository. violetagg pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new cce88d4 Prep for next version cce88d4 is described below commit cce88d485588283897511aefd5e13896b39891ca Author: Violeta Georgieva AuthorDate: Mon Mar 16 11:17:53 2020 +0200 Prep for next version --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.properties.default b/build.properties.default index 852ab41..65acae2 100644 --- a/build.properties.default +++ b/build.properties.default @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=103 +version.build=104 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 32ea13f..73ec24a 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.103 +maven.asf.release.deploy.version=7.0.104 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index df46472..5ae6894 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -59,6 +59,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: r38518 - /dev/tomcat/tomcat-10/v10.0.0-M3/ /release/tomcat/tomcat-10/v10.0.0-M3/
Author: markt Date: Mon Mar 16 09:37:04 2020 New Revision: 38518 Log: Release Apache Tomcat 10.0.0-M3 Added: release/tomcat/tomcat-10/v10.0.0-M3/ - copied from r38517, dev/tomcat/tomcat-10/v10.0.0-M3/ Removed: dev/tomcat/tomcat-10/v10.0.0-M3/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r38519 - /dev/tomcat/tomcat-9/v9.0.33/ /release/tomcat/tomcat-9/v9.0.33/
Author: markt Date: Mon Mar 16 09:37:33 2020 New Revision: 38519 Log: Release Apache Tomcat 9.0.33 Added: release/tomcat/tomcat-9/v9.0.33/ - copied from r38518, dev/tomcat/tomcat-9/v9.0.33/ Removed: dev/tomcat/tomcat-9/v9.0.33/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r38520 - /dev/tomcat/tomcat-8/v8.5.53/ /release/tomcat/tomcat-8/v8.5.53/
Author: markt Date: Mon Mar 16 09:38:00 2020 New Revision: 38520 Log: Release Apache Tomcat 8.5.53 Added: release/tomcat/tomcat-8/v8.5.53/ - copied from r38519, dev/tomcat/tomcat-8/v8.5.53/ Removed: dev/tomcat/tomcat-8/v8.5.53/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Proposed changes to UDecoder.ALLOW_ENCODED_SLASH
On 14/03/2020 10:08, Oleg Kalnichevski wrote: > I am not really qualified to comment on the proposal but as far as I > can see it makes sense. > > Client side libraries however have an extra problem to contend with. > > Most of the time HttpClient just passes the request URI to server as > is, exactly as specified by the user. > > There is a catch though. Absolute request URIs need to be parsed and > split into respective authority and path/query components. > > http://host:8080/stuff/123 > > --- > GET /stuff/123 HTTP/1.1 > Host: host:8080 > --- > > However there is a fringe case that can cause creation of ambiguous or > illegal request messages. > > What is one supposed to do with absolute request URIs like this one? > > http://host:8080//stuff///123 > > There does not appear to be any statement in the RFC7230 as to what the > expected behavior should be. In discussion with the httpd folks it appears that the consensus view there is that "/a//b/" != "/a/b/" The definitions in RFC 3986 allow a URI of "/a//". For two reasons Tomcat takes a different view: 1. Applications constructing URIs often get it wrong and add an extra "/" where it is not necessary. If Tomcat didn't collapse these, those applications would break. 2. When serving static resources, file systems will collapse "//" to "/". > What we presently do in both 4.x and 5.x release lines is normalizing > such request URIs by collapsing multiple consecutive forward slashes in > the path component into a single one. Tomcat will do that as well for URIs it receives. It could be argued that Tomcat should not do this. If we ever have a user with a use case for not collapsing them then I suspect we'll add an option to make that behaviour optional. > By default HttpClient would generate this request as > --- > GET /stuff/123 HTTP/1.1 > Host: host:8080 > --- > > and not as > --- > GET //stuff///123 HTTP/1.1 > Host: host:8080 > --- > > That should not be relevant as far as this proposal is concerned but I > thought I should mention it just in case as handling of consecutive > forward slashes in the path component of request URIs had caused us a > lot of grief in the past. Thanks. It is useful to see where difficulties have occurred in the past. Tomcat would treat the above 2 requests as the same but I understand that httpd would not. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1640 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] cce88d485588283897511aefd5e13896b39891ca Blamelist: Violeta Georgieva BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update to M3
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 8410142 Update to M3 8410142 is described below commit 841014220b7883355cd1fe5f655284bf320802d8 Author: remm AuthorDate: Mon Mar 16 11:05:41 2020 +0100 Update to M3 --- modules/owb/pom.xml | 2 +- res/tomcat-maven/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index 4f512c1..cd8033b 100644 --- a/modules/owb/pom.xml +++ b/modules/owb/pom.xml @@ -36,7 +36,7 @@ 1.0 1.0 1.0.1 -10.0.0-M1 +10.0.0-M3 diff --git a/res/tomcat-maven/pom.xml b/res/tomcat-maven/pom.xml index a48c2f0..9b37614 100644 --- a/res/tomcat-maven/pom.xml +++ b/res/tomcat-maven/pom.xml @@ -29,7 +29,7 @@ UTF-8 org.apache.catalina.startup.Tomcat -10.0.0-M1 +10.0.0-M3 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (d058d14 -> 3b86521)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d058d14 Add release date for 9.0.33 add 3b86521 Update to 9.0.33 No new revisions were added by this update. Summary of changes: modules/owb/pom.xml | 2 +- res/tomcat-maven/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (3b86521 -> ab347cb)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 3b86521 Update to 9.0.33 add ab347cb Add a check that the URIEncoding is a superset of US-ASCII. No new revisions were added by this update. Summary of changes: java/org/apache/catalina/connector/Connector.java | 10 ++- .../catalina/connector/LocalStrings.properties | 1 + java/org/apache/tomcat/util/buf/CharsetUtil.java | 58 ++ .../apache/tomcat/util/buf/TestCharsetUtil.java| 89 ++ webapps/docs/changelog.xml | 9 +++ 5 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 java/org/apache/tomcat/util/buf/CharsetUtil.java create mode 100644 test/org/apache/tomcat/util/buf/TestCharsetUtil.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add a check that the URIEncoding is a superset of US-ASCII.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f9ddfe9 Add a check that the URIEncoding is a superset of US-ASCII.
f9ddfe9 is described below
commit f9ddfe9e378bb31dc458b1c814ea9ca440580a9a
Author: Mark Thomas
AuthorDate: Fri Mar 13 11:36:54 2020 +
Add a check that the URIEncoding is a superset of US-ASCII.
This is a requirement of RFC7230, section 3.
---
java/org/apache/catalina/connector/Connector.java | 10 ++-
.../catalina/connector/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/buf/CharsetUtil.java | 58 ++
.../apache/tomcat/util/buf/TestCharsetUtil.java| 89 ++
webapps/docs/changelog.xml | 9 +++
5 files changed, 164 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 518893c..23488a9 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -41,6 +41,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.buf.CharsetUtil;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
import org.apache.tomcat.util.res.StringManager;
@@ -805,10 +806,13 @@ public class Connector extends LifecycleMBeanBase {
*/
public void setURIEncoding(String URIEncoding) {
try {
-uriCharset = B2CConverter.getCharset(URIEncoding);
+ Charset charset = B2CConverter.getCharset(URIEncoding);
+ if (!CharsetUtil.isAsciiSuperset(charset)) {
+ log.error(sm.getString("coyoteConnector.notAsciiSuperset",
URIEncoding));
+ }
+ uriCharset = charset;
} catch (UnsupportedEncodingException e) {
-log.error(sm.getString("coyoteConnector.invalidEncoding",
-URIEncoding, uriCharset.name()), e);
+log.error(sm.getString("coyoteConnector.invalidEncoding",
URIEncoding, uriCharset.name()), e);
}
setProperty("uRIEncoding", URIEncoding);
}
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties
b/java/org/apache/catalina/connector/LocalStrings.properties
index 97e284c..364fd66 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -24,6 +24,7 @@ coyoteAdapter.nullRequest=An asynchronous dispatch may only
happen on an existin
coyoteConnector.invalidEncoding=The encoding [{0}] is not recognised by the
JRE. The Connector will continue to use [{1}]
coyoteConnector.invalidPort=The connector cannot start since the specified
port value of [{0}] is invalid
+coyoteConnector.notAsciiSuperset=The encoding [{0}] is not a superset of ASCII
as required by RFC 7230. This may have unexpected side effects
coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity
(see RFC 2616 Section 9.6)
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler
initialization failed
diff --git a/java/org/apache/tomcat/util/buf/CharsetUtil.java
b/java/org/apache/tomcat/util/buf/CharsetUtil.java
new file mode 100644
index 000..fc0a09e
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/CharsetUtil.java
@@ -0,0 +1,58 @@
+/*
+ * 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 copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.buf;
+
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+
+public class CharsetUtil {
+
+private CharsetUtil() {
+// Utility class. Hide default constructor.
+}
+
[tomcat] branch 7.0.x updated: Add a check that the URIEncoding is a superset of US-ASCII.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new fcf3697 Add a check that the URIEncoding is a superset of US-ASCII.
fcf3697 is described below
commit fcf369777467532f093197657caf12005f590931
Author: Mark Thomas
AuthorDate: Fri Mar 13 11:36:54 2020 +
Add a check that the URIEncoding is a superset of US-ASCII.
This is a requirement of RFC7230, section 3.
---
java/org/apache/catalina/connector/Connector.java | 13 +++-
.../catalina/connector/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/buf/CharsetUtil.java | 58 +
.../apache/tomcat/util/buf/TestCharsetUtil.java| 73 ++
webapps/docs/changelog.xml | 9 +++
5 files changed, 153 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 7d7d11d..28ad468 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -16,7 +16,9 @@
*/
package org.apache.catalina.connector;
+import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
+import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -35,6 +37,8 @@ import org.apache.coyote.ProtocolHandler;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.buf.CharsetUtil;
import org.apache.tomcat.util.http.mapper.Mapper;
import org.apache.tomcat.util.res.StringManager;
@@ -793,7 +797,14 @@ public class Connector extends LifecycleMBeanBase {
*/
public void setURIEncoding(String URIEncoding) {
this.URIEncoding = URIEncoding;
-setProperty("uRIEncoding", URIEncoding);
+try {
+ Charset charset = B2CConverter.getCharset(URIEncoding);
+ if (!CharsetUtil.isAsciiSuperset(charset)) {
+ log.error(sm.getString("coyoteConnector.notAsciiSuperset",
URIEncoding));
+ }
+} catch (UnsupportedEncodingException e) {
+// Ignore. A warning will be logged in the CoyoteAdapter
+}
}
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties
b/java/org/apache/catalina/connector/LocalStrings.properties
index e8f9f46..1336726 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -28,6 +28,7 @@ coyoteAdapter.parsePathParam=Unable to parse the path
parameters using encoding
coyoteConnector.MapperRegistration=register Mapper: [{0}]
coyoteConnector.cannotRegisterProtocol=Cannot register MBean for the Protocol
coyoteConnector.invalidPort=The connector cannot start since the specified
port value of [{0}] is invalid
+coyoteConnector.notAsciiSuperset=The encoding [{0}] is not a superset of ASCII
as required by RFC 7230. This may have unexpected side effects
coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity
(see RFC 2616 Section 9.6)
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler
initialization failed
diff --git a/java/org/apache/tomcat/util/buf/CharsetUtil.java
b/java/org/apache/tomcat/util/buf/CharsetUtil.java
new file mode 100644
index 000..fc0a09e
--- /dev/null
+++ b/java/org/apache/tomcat/util/buf/CharsetUtil.java
@@ -0,0 +1,58 @@
+/*
+ * 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 copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.buf;
+
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+
+public class CharsetUtil {
+
+private CharsetUtil() {
+// Utility class. Hide defau
[Bug 64222] Getting User from SSO using SPNEGO returns Tomcat Linux user instead of Windows user above Tomcat9.0.8 - Update documentation
https://bz.apache.org/bugzilla/show_bug.cgi?id=64222
b...@wigeogis.com changed:
What|Removed |Added
Resolution|INVALID |WORKSFORME
--- Comment #4 from b...@wigeogis.com ---
Sorry for reopening. I already described my problem also at the SPNEGO help
forum https://sourceforge.net/p/spnego/discussion/1003769/thread/aa1abb0551/
This is just a comment with the complete documentation of how to solve it and
to help improving the documentation.
Looking for examples I finally managed to configure SSO successfully using the
hints of
http://tomcat.10.x6.nabble.com/Help-with-SPNEGO-Pass-Through-td5073933.html
(Also
https://blogs.nologin.es/rickyepoderi/index.php?/archives/160-Configuring-kerberosspnego-login-in-tomcat.html
seems to be a good and actual instruction.)
What I was missing in the fine documentation Windows authentication How-To
https://tomcat.apache.org/tomcat-9.0-doc/windows-auth-howto.html#Tomcat_instance_(Windows_server)
Here my example of how to configure an AuthenticatedUserRealm (Tomcat > 9.0.9)
in a correct way:
1. Follow the instructions under Domain Controller and Tomcat instance (Windows
server) concerning the $CATALINA_BASE/conf/tomcat.keytab,
$CATALINA_BASE/conf/krb5.ini and $CATALINA_BASE/conf/jaas.conf
2. Add a file $CATALINA_BASE/conf/Catalina/localhost/ROOT.xml with this
content:
This is the example for "If only the authenticated user name is required then
the AuthenticatedUserRealm may be used that will simply return a Principal
based on the authenticated user name that does not have any roles." sentence of
the documentation.
3. Configure $CATALINA_BASE/webapps/ROOT/WEB-INF/web.xml with this content:
http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5">
WepApp with a Login Configuration to allow request.getRemoteUser() in a
jsp
WebApp with SSO (via Tomcat built-in SPNEGO)
SPNEGO
SPNGEO realm
all
ALL
Require user authentication only
Everything
*.jsp
**
This is the example for the Web application part of
https://tomcat.apache.org/tomcat-9.0-doc/windows-auth-howto.html#Web_application
4. Configure the client
I like the instructions from
https://support.pingidentity.com/s/article/How-to-configure-supported-browsers-for-Kerberos-NTLM
5. Test the configuration using a $CATALINA_BASE/webapps/getremoteuser.jsp with
the following content (idea very similar to hello_spnego.jsp from
http://spnego.sourceforge.net/spnego_tomcat.html )
<%@page import="java.io.PrintWriter" %>
<%@ page import="java.security.Principal" %>
<%
String userName = request.getRemoteUser();
Principal currentAuthenticatedUser = request.getUserPrincipal();
response.setContentType("text/plain; charset=UTF-8");
PrintWriter writer = new PrintWriter(response.getWriter());
writer.println("This is the username: ");
writer.println(userName);
writer.println("This is the principal: ");
if (currentAuthenticatedUser != null) {
writer.println(currentAuthenticatedUser.getName());
} else {
writer.println("no user currently authenticated");
}
%>
calling it using
http://localhost:8080/getremoteuser.jsp
returning
(from request.getRemoteUser())
(from request.getUserPrincipal().getName())
And maybe in the Apache documentation about the Windows authentication How-To
linking the 3rd party library SPNEGO you could add a hint that the documented
configuration from the "install guide - tomcat"
http://spnego.sourceforge.net/spnego_tomcat.html does not work any longer with
Tomcat >9.0.9
--
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 64222] Getting User from SSO using SPNEGO returns Tomcat Linux user instead of Windows user above Tomcat9.0.8 - Update documentation
https://bz.apache.org/bugzilla/show_bug.cgi?id=64222 --- Comment #5 from Michael Osipov --- spnego.sf.net is ancient. You should either go with basic features provided by Tomcat or use my Tomcat extension (http://tomcatspnegoad.sourceforge.net/) which covers a lot of cases. In both cases, use the users@ list. -- 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 63993] Fatal error EXCEPTION_ACCESS_VIOLATION are thrown while the load test scenario includes multiple concurrent connections
https://bz.apache.org/bugzilla/show_bug.cgi?id=63993 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WONTFIX --- Comment #2 from Mark Thomas --- No updates for 2 months. I am going to assume that the changes in the Poller between 7.0.94 and 7.0.99 addressed this issue. If you still see this issue with the latest 7.0.x release then please feel to re-open this issue. You will need to provide the steps necessary to reproduce the issue from a clean install of the latest 7.0.x release available at that time. -- 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 64061] sendMessageBlock throws NPE and it results in IllegalStateException of TEXT_PARTIAL_WRITING
https://bz.apache.org/bugzilla/show_bug.cgi?id=64061 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #5 from Mark Thomas --- No update for more than 2 months. I am going to assume that this issue is resolved in the latest 9.0.x release. If you still experience this problem please re-open this issue and provide the step necessary to reproduce the problem from a clean install of the latest 9.0.x release. -- 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
[GitHub] [tomcat] gazzyt commented on issue #262: Fix and tests for tomcat bug #64226
gazzyt commented on issue #262: Fix and tests for tomcat bug #64226 URL: https://github.com/apache/tomcat/pull/262#issuecomment-599569619 > IMO for the branches where Java 8 is minimum we should switch to Java 8 DateTime APIs. > java.time.format.DateTimeFormatter is thread-safe. Would you think to do this now or would that switch be better left to Tomcat 10 branch? There is some legacy stuff in FastHttpDateFormat marked for removal in Tomcat 10. I don't mind having a go at this but it is a bigger change than the fix I submitted and there are no unit tests to fall back on. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] gazzyt commented on issue #262: Fix and tests for tomcat bug #64226
gazzyt commented on issue #262: Fix and tests for tomcat bug #64226 URL: https://github.com/apache/tomcat/pull/262#issuecomment-599570575 Can someone fix the CI please? The error isn't related to my code: > The command "wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz" failed and exited with 4 during . This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on issue #262: Fix and tests for tomcat bug #64226
martin-g commented on issue #262: Fix and tests for tomcat bug #64226 URL: https://github.com/apache/tomcat/pull/262#issuecomment-599575635 > Can someone fix the CI please? The error isn't related to my code: I've restarted it. It runs fine so far! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on issue #262: Fix and tests for tomcat bug #64226
martin-g commented on issue #262: Fix and tests for tomcat bug #64226 URL: https://github.com/apache/tomcat/pull/262#issuecomment-599576538 > Would you think to do this now or would that switch be better left to Tomcat 10 branch? Let's see what the other devs think about this idea first. I could do it in a separate PR if there is interest. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Ensure URL patterns provided via web.xml are %nn decoded consistently
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 93d471e Ensure URL patterns provided via web.xml are %nn decoded
consistently
93d471e is described below
commit 93d471e95d83ba8c86fd2909e1ecefac1680c939
Author: Mark Thomas
AuthorDate: Mon Mar 16 14:46:50 2020 +
Ensure URL patterns provided via web.xml are %nn decoded consistently
Use the encoding of the web.xml file where specified and UTF-8 where no
explicit encoding is specified.
---
.../tomcat/util/descriptor/web/ErrorPage.java | 8 ++--
.../tomcat/util/descriptor/web/FilterMap.java | 2 +-
.../tomcat/util/descriptor/web/LoginConfig.java| 9 ++---
.../util/descriptor/web/SecurityCollection.java| 2 +-
.../util/descriptor/web/SecurityConstraint.java| 10 +
.../apache/tomcat/util/descriptor/web/WebXml.java | 3 ++
.../tomcat/util/descriptor/web/TestWebXml.java | 43 ++
webapps/docs/changelog.xml | 9 +
8 files changed, 75 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
b/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
index f55dc5a..bf0920d 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
@@ -27,12 +27,12 @@ import org.apache.tomcat.util.buf.UDecoder;
*
* @author Craig R. McClanahan
*/
-public class ErrorPage implements Serializable {
+public class ErrorPage extends XmlEncodingBase implements Serializable {
-private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 2L;
-// - Instance Variables
+// - Instance Variables
/**
* The error (status) code for which this error page is active. Note that
@@ -125,7 +125,7 @@ public class ErrorPage implements Serializable {
//if ((location == null) || !location.startsWith("/"))
//throw new IllegalArgumentException
//("Error Page Location must start with a '/'");
-this.location = UDecoder.URLDecode(location);
+this.location = UDecoder.URLDecode(location, getCharset());
}
diff --git a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
index 868ef66..b78b975 100644
--- a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
+++ b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
@@ -136,7 +136,7 @@ public class FilterMap extends XmlEncodingBase implements
Serializable {
} else {
String[] results = new String[urlPatterns.length + 1];
System.arraycopy(urlPatterns, 0, results, 0, urlPatterns.length);
-results[urlPatterns.length] = UDecoder.URLDecode(urlPattern);
+results[urlPatterns.length] = UDecoder.URLDecode(urlPattern,
getCharset());
urlPatterns = results;
}
}
diff --git a/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
b/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
index e1c6952..053eb80 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
+++ b/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
@@ -27,15 +27,14 @@ import org.apache.tomcat.util.buf.UDecoder;
*
* @author Craig R. McClanahan
*/
-public class LoginConfig implements Serializable {
+public class LoginConfig extends XmlEncodingBase implements Serializable {
-private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 2L;
// --- Constructors
-
/**
* Construct a new LoginConfig with default properties.
*/
@@ -97,7 +96,7 @@ public class LoginConfig implements Serializable {
//if ((errorPage == null) || !errorPage.startsWith("/"))
//throw new IllegalArgumentException
//("Error Page resource path must start with a '/'");
-this.errorPage = UDecoder.URLDecode(errorPage);
+this.errorPage = UDecoder.URLDecode(errorPage, getCharset());
}
@@ -114,7 +113,7 @@ public class LoginConfig implements Serializable {
//if ((loginPage == null) || !loginPage.startsWith("/"))
//throw new IllegalArgumentException
//("Login Page resource path must start with a '/'");
-this.loginPage = UDecoder.URLDecode(loginPage);
+this.loginPage = UDecoder.URLDecode(loginPage, getCharset());
}
diff --git a/java/org/apache/tomcat/util/descriptor/web/S
[tomcat] branch 9.0.x updated (ab347cb -> bc2c7f8)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from ab347cb Add a check that the URIEncoding is a superset of US-ASCII. add bc2c7f8 Ensure URL patterns provided via web.xml are %nn decoded consistently No new revisions were added by this update. Summary of changes: .../tomcat/util/descriptor/web/ErrorPage.java | 8 ++-- .../tomcat/util/descriptor/web/FilterMap.java | 2 +- .../tomcat/util/descriptor/web/LoginConfig.java| 9 ++--- .../util/descriptor/web/SecurityCollection.java| 2 +- .../util/descriptor/web/SecurityConstraint.java| 10 + .../apache/tomcat/util/descriptor/web/WebXml.java | 3 ++ .../tomcat/util/descriptor/web/TestWebXml.java | 43 ++ webapps/docs/changelog.xml | 9 + 8 files changed, 75 insertions(+), 11 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Ensure URL patterns provided via web.xml are %nn decoded consistently
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 550af3c Ensure URL patterns provided via web.xml are %nn decoded
consistently
550af3c is described below
commit 550af3c7d6f3b278a41bc14244fddac20b67d77b
Author: Mark Thomas
AuthorDate: Mon Mar 16 14:46:50 2020 +
Ensure URL patterns provided via web.xml are %nn decoded consistently
Use the encoding of the web.xml file where specified and UTF-8 where no
explicit encoding is specified.
---
.../tomcat/util/descriptor/web/ErrorPage.java | 8 ++--
.../tomcat/util/descriptor/web/FilterMap.java | 2 +-
.../tomcat/util/descriptor/web/LoginConfig.java| 9 ++---
.../util/descriptor/web/SecurityCollection.java| 8 ++--
.../util/descriptor/web/SecurityConstraint.java| 10 +
.../apache/tomcat/util/descriptor/web/WebXml.java | 3 ++
.../tomcat/util/descriptor/web/TestWebXml.java | 43 ++
webapps/docs/changelog.xml | 9 +
8 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
b/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
index f55dc5a..bf0920d 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
@@ -27,12 +27,12 @@ import org.apache.tomcat.util.buf.UDecoder;
*
* @author Craig R. McClanahan
*/
-public class ErrorPage implements Serializable {
+public class ErrorPage extends XmlEncodingBase implements Serializable {
-private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 2L;
-// - Instance Variables
+// - Instance Variables
/**
* The error (status) code for which this error page is active. Note that
@@ -125,7 +125,7 @@ public class ErrorPage implements Serializable {
//if ((location == null) || !location.startsWith("/"))
//throw new IllegalArgumentException
//("Error Page Location must start with a '/'");
-this.location = UDecoder.URLDecode(location);
+this.location = UDecoder.URLDecode(location, getCharset());
}
diff --git a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
index 5ece6a0..a8d6b89 100644
--- a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
+++ b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
@@ -135,7 +135,7 @@ public class FilterMap extends XmlEncodingBase implements
Serializable {
} else {
String[] results = new String[urlPatterns.length + 1];
System.arraycopy(urlPatterns, 0, results, 0, urlPatterns.length);
-results[urlPatterns.length] = UDecoder.URLDecode(urlPattern);
+results[urlPatterns.length] = UDecoder.URLDecode(urlPattern,
getCharset());
urlPatterns = results;
}
}
diff --git a/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
b/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
index e1c6952..053eb80 100644
--- a/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
+++ b/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
@@ -27,15 +27,14 @@ import org.apache.tomcat.util.buf.UDecoder;
*
* @author Craig R. McClanahan
*/
-public class LoginConfig implements Serializable {
+public class LoginConfig extends XmlEncodingBase implements Serializable {
-private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 2L;
// --- Constructors
-
/**
* Construct a new LoginConfig with default properties.
*/
@@ -97,7 +96,7 @@ public class LoginConfig implements Serializable {
//if ((errorPage == null) || !errorPage.startsWith("/"))
//throw new IllegalArgumentException
//("Error Page resource path must start with a '/'");
-this.errorPage = UDecoder.URLDecode(errorPage);
+this.errorPage = UDecoder.URLDecode(errorPage, getCharset());
}
@@ -114,7 +113,7 @@ public class LoginConfig implements Serializable {
//if ((loginPage == null) || !loginPage.startsWith("/"))
//throw new IllegalArgumentException
//("Login Page resource path must start with a '/'");
-this.loginPage = UDecoder.URLDecode(loginPage);
+this.loginPage = UDecoder.URLDecode(loginPage, getCharset());
}
diff --git a/java/org/apache/tomcat/util/descriptor/web/S
[tomcat] branch master updated: Be explicit that UTF-8 is used for encoded dispatcher paths
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new dabf497 Be explicit that UTF-8 is used for encoded dispatcher paths
dabf497 is described below
commit dabf497c0a0b7f12a05e50d861c12d3b659964e4
Author: Mark Thomas
AuthorDate: Mon Mar 16 15:21:35 2020 +
Be explicit that UTF-8 is used for encoded dispatcher paths
Be consistent with AsyncContext and getRequestDispatcher()
---
java/org/apache/catalina/core/ApplicationContext.java | 2 +-
webapps/docs/config/context.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 026a763..3de49c2 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -429,7 +429,7 @@ public class ApplicationContext implements ServletContext {
if (getContext().getDispatchersUseEncodedPaths()) {
// Decode
-String decodedUri = UDecoder.URLDecode(normalizedUri);
+String decodedUri = UDecoder.URLDecode(normalizedUri,
StandardCharsets.UTF_8);
// Security check to catch attempts to encode /../ sequences
normalizedUri = RequestUtil.normalize(decodedUri);
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index bb7c303..d4ea9e9 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -374,7 +374,8 @@
ares expected to be encoded. This affects both how Tomcat handles calls
to obtain a request dispatcher as well as how Tomcat generates paths
used to obtain request dispatchers internally. If not specified, the
-default value of true is used.
+default value of true is used. When encoding/decoding
paths
+for a request dispatcher, UTF-8 is always used.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (bc2c7f8 -> f61a255)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from bc2c7f8 Ensure URL patterns provided via web.xml are %nn decoded consistently add f61a255 Be explicit that UTF-8 is used for encoded dispatcher paths No new revisions were added by this update. Summary of changes: java/org/apache/catalina/core/ApplicationContext.java | 2 +- webapps/docs/config/context.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Be explicit that UTF-8 is used for encoded dispatcher paths
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new cccb520 Be explicit that UTF-8 is used for encoded dispatcher paths
cccb520 is described below
commit cccb520b2bb4f4f22f66071118349681544d95d2
Author: Mark Thomas
AuthorDate: Mon Mar 16 15:21:35 2020 +
Be explicit that UTF-8 is used for encoded dispatcher paths
Be consistent with AsyncContext and getRequestDispatcher()
---
java/org/apache/catalina/core/ApplicationContext.java | 2 +-
webapps/docs/config/context.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 3561324..d44ef02 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -429,7 +429,7 @@ public class ApplicationContext implements ServletContext {
if (getContext().getDispatchersUseEncodedPaths()) {
// Decode
-String decodedUri = UDecoder.URLDecode(normalizedUri);
+String decodedUri = UDecoder.URLDecode(normalizedUri,
StandardCharsets.UTF_8);
// Security check to catch attempts to encode /../ sequences
normalizedUri = RequestUtil.normalize(decodedUri);
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 767aefe..873ff75 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -374,7 +374,8 @@
ares expected to be encoded. This affects both how Tomcat handles calls
to obtain a request dispatcher as well as how Tomcat generates paths
used to obtain request dispatchers internally. If not specified, the
-default value of true is used.
+default value of true is used. When encoding/decoding
paths
+for a request dispatcher, UTF-8 is always used.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Be explicit that UTF-8 is used for encoded dispatcher paths
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new a72847f Be explicit that UTF-8 is used for encoded dispatcher paths
a72847f is described below
commit a72847f8adda9692c7688454407c36b7a12b2448
Author: Mark Thomas
AuthorDate: Mon Mar 16 15:21:35 2020 +
Be explicit that UTF-8 is used for encoded dispatcher paths
Be consistent with AsyncContext and getRequestDispatcher()
---
java/org/apache/catalina/core/ApplicationContext.java | 2 +-
webapps/docs/config/context.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index ff9ba95..881d513 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -446,7 +446,7 @@ public class ApplicationContext implements ServletContext {
if (getContext().getDispatchersUseEncodedPaths()) {
// Decode
-String decodedUri = UDecoder.URLDecode(normalizedUri);
+String decodedUri = UDecoder.URLDecode(normalizedUri,
StandardCharsets.UTF_8);
// Security check to catch attempts to encode /../ sequences
normalizedUri = RequestUtil.normalize(decodedUri);
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index d5e1fcb..a0d27ca 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -374,7 +374,8 @@
ares expected to be encoded. This affects both how Tomcat handles calls
to obtain a request dispatcher as well as how Tomcat generates paths
used to obtain request dispatchers internally. If not specified, the
-default value of true is used.
+default value of true is used. When encoding/decoding
paths
+for a request dispatcher, UTF-8 is always used.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64231] New: Tomcat jdbc pool behaviour
https://bz.apache.org/bugzilla/show_bug.cgi?id=64231 Bug ID: 64231 Summary: Tomcat jdbc pool behaviour Product: Tomcat Modules Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: le...@redhat.com Target Milestone: --- If a connection fails and is evicted during testAllIdle(), should something be replacing it automatically to maintain the min-idle? Our finding is that the pool drops below min-idle over time and eventually we are seeing connections needing to be created as load is going up which we desire to avoid (we would rather connections be created asynchronously to avoid slow response when we actually need connections). Is this a bug? We are using Apache Tomcat 9.0.21 and jdbc pool configuration is as follows factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" initialSize="100" minIdle="100" maxIdle="150" maxActive="200" maxWait="1" maxAge="360" validationQuery="SELECT sysdate FROM dual" validationQueryTimeout="1" testOnBorrow="true" testWhileIdle="true" timeBetweenEvictionRunsMillis="60" minEvictableIdleTimeMillis="6" softMinEvictableIdleTimeMillis="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
[tomcat-jakartaee-migration] branch master updated: Add configuration for patterns
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/master by this push:
new 5050d9c Add configuration for patterns
5050d9c is described below
commit 5050d9c48f35b3fd226378ad1cce797073694972
Author: remm
AuthorDate: Mon Mar 16 17:51:39 2020 +0100
Add configuration for patterns
This allows configuring the list of javax packages that will be migrated
to jakarta. The names and pattern names will be updated according to
what makes sense.
---
.../org/apache/tomcat/jakartaee/Migration.java | 28 ++
.../java/org/apache/tomcat/jakartaee/Util.java | 26 ++--
.../tomcat/jakartaee/LocalStrings.properties | 4 ++--
3 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 1140f26..a7e2f0c 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -73,7 +73,7 @@ public class Migration {
public boolean execute() throws IOException {
logger.log(Level.INFO, sm.getString("migration.execute",
source.getAbsolutePath(),
-destination.getAbsolutePath()));
+destination.getAbsolutePath(),
Util.getEESpecLevel().toString()));
boolean result = true;
long t1 = System.nanoTime();
if (source.isDirectory()) {
@@ -232,13 +232,33 @@ public class Migration {
public static void main(String[] args) {
-if (args.length != 2) {
+boolean valid = false;
+String source = null;
+String dest = null;
+Util.EESpecLevel level = Util.EESpecLevel.TOMCAT;
+if (args.length == 3) {
+if (args[0].startsWith("-level")) {
+level =
Util.EESpecLevel.valueOf(args[0].substring("-level".length()));
+if (level != null) {
+source = args[1];
+dest = args[2];
+valid = true;
+}
+}
+}
+if (args.length == 2) {
+source = args[0];
+dest = args[1];
+valid = true;
+}
+if (!valid) {
usage();
System.exit(1);
}
+Util.setEESpecLevel(level);
Migration migration = new Migration();
-migration.setSource(new File(args[0]));
-migration.setDestination(new File(args[1]));
+migration.setSource(new File(source));
+migration.setDestination(new File(dest));
boolean result = false;
try {
result = migration.execute();
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Util.java
b/src/main/java/org/apache/tomcat/jakartaee/Util.java
index 21e0fbf..9bc0712 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Util.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Util.java
@@ -22,9 +22,31 @@ import java.util.regex.Pattern;
public class Util {
-private static Pattern PATTERN = Pattern.compile(
+public enum EESpecLevel { TOMCAT, EE };
+
+private static final Pattern TOMCAT_PATTERN = Pattern.compile(
"javax([/\\.](annotation|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction|websocket))");
+private static final Pattern EE_PATTERN = Pattern.compile(
+
"javax([/\\.](annotation|decorator|ejb|el|enterprise|inject|mail|persistence|security[/\\.]auth[/\\"
++ ".]message|servlet|transaction|websocket))");
+
+private static EESpecLevel level = EESpecLevel.TOMCAT;
+private static Pattern pattern = TOMCAT_PATTERN;
+
+public static void setEESpecLevel(EESpecLevel level) {
+Util.level = level;
+if (level == EESpecLevel.TOMCAT) {
+pattern = TOMCAT_PATTERN;
+} else if (level == EESpecLevel.EE) {
+pattern = EE_PATTERN;
+}
+}
+
+public static EESpecLevel getEESpecLevel() {
+return level;
+}
+
/**
* Get the extension of a filename
*
@@ -43,7 +65,7 @@ public class Util {
public static String convert(String name) {
-Matcher m = PATTERN.matcher(name);
+Matcher m = pattern.matcher(name);
return m.replaceAll("jakarta$1");
}
diff --git
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index d13091f..f7b8e03 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -18,10 +18,10 @@ migration.cannotReadSource=Cannot read source location [{0}]
migration.done=Migration completed suc
[Bug 64232] New: 40x exception on POST
https://bz.apache.org/bugzilla/show_bug.cgi?id=64232 Bug ID: 64232 Summary: 40x exception on POST Product: Tomcat 9 Version: 9.0.31 Hardware: Other OS: Linux Status: NEW Severity: blocker Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: krishnan...@gmail.com Target Milestone: - After tomcat 9.0.31 update we are getting below exception for POST request intermittently and below is the only exception we can see in log. Setup : HaProxy which listen on 443 and route traffic to backed tomcat running on https protocol. [ WARN][org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver] Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported] Note: Same POST is working in old tomcat version till 9.0.30 without issue. -- 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 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31
https://bz.apache.org/bugzilla/show_bug.cgi?id=64195 Mark Thomas changed: What|Removed |Added CC||krishnan...@gmail.com --- Comment #13 from Mark Thomas --- *** Bug 64232 has been marked as a duplicate of this bug. *** -- 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 64232] 40x exception on POST
https://bz.apache.org/bugzilla/show_bug.cgi?id=64232 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Mark Thomas --- *** This bug has been marked as a duplicate of bug 64195 *** -- 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
[tomcat] 02/06: Deprecated unused method
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 17a0d32012b202c1049fc18254ff777897bce1f4
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:03:12 2020 +
Deprecated unused method
---
java/org/apache/tomcat/util/buf/UDecoder.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index 6237dd3..712e869 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -298,7 +298,10 @@ public final class UDecoder {
* @return the decoded string
* @exception IllegalArgumentException if a '%' character is not followed
* by a valid 2-digit hexadecimal number
+ *
+ * @deprecated Unused. This will be removed in Tomcat 10 onwards
*/
+@Deprecated
public static String URLDecode(String str) {
return URLDecode(str, StandardCharsets.UTF_8);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Remove deprecated methods
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit adf4d35169baf102048ebfa13b516e96501451a6
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:29:57 2020 +
Remove deprecated methods
---
java/org/apache/tomcat/util/buf/UDecoder.java | 180 --
1 file changed, 180 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index f37aa73..73c7238 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -130,186 +130,6 @@ public final class UDecoder {
// Additional methods
/**
- * In-buffer processing - the buffer will be modified.
- *
- * WARNING: This method assumes US-ASCII encoding.
- *
- * @param mb The URL encoded chars
- * @param query true if this is a query string
- * @throws IOException Invalid %xx URL encoding
- *
- * @deprecated Unused. Will be removed in Tomcat 10
- */
-@Deprecated
-public void convert( CharChunk mb, boolean query )
-throws IOException
-{
-//log( "Converting a char chunk ");
-int start=mb.getOffset();
-char buff[]=mb.getBuffer();
-int cend=mb.getEnd();
-
-int idx= CharChunk.indexOf( buff, start, cend, '%' );
-int idx2=-1;
-if( query ) {
-idx2= CharChunk.indexOf( buff, start, (idx >= 0 ? idx : cend), '+'
);
-}
-if( idx<0 && idx2<0 ) {
-return;
-}
-
-// idx will be the smallest positive index ( first % or + )
-if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
-idx=idx2;
-}
-
-final boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
-
-for( int j=idx; j= cend ) {
-// invalid
-throw EXCEPTION_EOF;
-}
-char b1= buff[j+1];
-char b2=buff[j+2];
-if( !isHexDigit( b1 ) || ! isHexDigit(b2 )) {
-throw EXCEPTION_NOT_HEX_DIGIT;
-}
-
-j+=2;
-int res=x2c( b1, b2 );
-if (noSlash && (res == '/')) {
-throw EXCEPTION_SLASH;
-}
-buff[idx]=(char)res;
-}
-}
-mb.setEnd( idx );
-}
-
-/**
- * URLDecode, will modify the source.
- *
- * WARNING: This method assumes US-ASCII encoding.
- *
- * @param mb The URL encoded String, bytes or chars
- * @param query true if this is a query string
- * @throws IOException Invalid %xx URL encoding
- *
- * @deprecated Unused. Will be removed in Tomcat 10
- */
-@Deprecated
-public void convert(MessageBytes mb, boolean query)
-throws IOException
-{
-
-switch (mb.getType()) {
-case MessageBytes.T_STR:
-String strValue=mb.toString();
-if( strValue==null ) {
-return;
-}
-try {
-mb.setString( convert( strValue, query ));
-} catch (RuntimeException ex) {
-throw new DecodeException(ex.getMessage());
-}
-break;
-case MessageBytes.T_CHARS:
-CharChunk charC=mb.getCharChunk();
-convert( charC, query );
-break;
-case MessageBytes.T_BYTES:
-ByteChunk bytesC=mb.getByteChunk();
-convert( bytesC, query );
-break;
-}
-}
-
-/**
- * %xx decoding of a string.
- *
- * WARNING: This method assumes US-ASCII encoding.
- *
- * FIXME: this is inefficient.
- *
- * @param str The URL encoded string
- * @param query true if this is a query string
- * @return the decoded string
- *
- * @deprecated Unused. Will be removed in Tomcat 10
- */
-@Deprecated
-public final String convert(String str, boolean query)
-{
-if (str == null) {
-return null;
-}
-
-if( (!query || str.indexOf( '+' ) < 0) && str.indexOf( '%' ) < 0 ) {
-return str;
-}
-
-final boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
-
-StringBuilder dec = new StringBuilder();// decoded string output
-int strPos = 0;
-int strLen = str.length();
-
-dec.ensureCapacity(str.length());
-while (strPos < strLen) {
-int laPos;// lookahead position
-
-// look ahead to next URLencoded metacharacter, if any
-for (laPos = strPos; laPos < strLen; laPos++) {
-char laChar = str.charAt(laPos);
-if ((laChar == '+' && query) || (laChar == '%')) {
-break;
-}
-
[tomcat] 05/06: Deprecate unused methods
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 763cc04f7d1c16c611b02b8e3ec8436339145d0a
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:23:15 2020 +
Deprecate unused methods
---
java/org/apache/tomcat/util/buf/UDecoder.java | 29 +++
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index 3e063c1..f37aa73 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -69,7 +69,9 @@ public final class UDecoder {
}
/**
- * URLDecode, will modify the source.
+ * URLDecode, will modify the source. Assumes source bytes are encoded
using
+ * a superset of US-ASCII as per RFC 7230.
+ *
* @param mb The URL encoded bytes
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
@@ -126,14 +128,19 @@ public final class UDecoder {
}
// Additional methods
-// XXX What do we do about charset
/**
* In-buffer processing - the buffer will be modified.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
* @param mb The URL encoded chars
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public void convert( CharChunk mb, boolean query )
throws IOException
{
@@ -187,11 +194,17 @@ public final class UDecoder {
}
/**
- * URLDecode, will modify the source
+ * URLDecode, will modify the source.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
* @param mb The URL encoded String, bytes or chars
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public void convert(MessageBytes mb, boolean query)
throws IOException
{
@@ -220,11 +233,19 @@ public final class UDecoder {
}
/**
- * %xx decoding of a string. FIXME: this is inefficient.
+ * %xx decoding of a string.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
+ * FIXME: this is inefficient.
+ *
* @param str The URL encoded string
* @param query true if this is a query string
* @return the decoded string
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public final String convert(String str, boolean query)
{
if (str == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Make all calls to URLDecode use an explicit character set
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0c2bd665850ae54532584b2ad0ad46f33fbcdd02
Author: Mark Thomas
AuthorDate: Mon Mar 16 15:57:13 2020 +
Make all calls to URLDecode use an explicit character set
---
java/org/apache/catalina/loader/WebappLoader.java | 5 +++--
test/org/apache/tomcat/util/buf/TestUDecoder.java | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index 75bb589..604d133 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.lang.reflect.Constructor;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
import javax.management.ObjectName;
@@ -573,9 +574,9 @@ public class WebappLoader extends LifecycleMBeanBase
for (int i = 0; i < repositories.length; i++) {
String repository = repositories[i].toString();
if (repository.startsWith("file://"))
-repository =
UDecoder.URLDecode(repository.substring(7));
+repository =
UDecoder.URLDecode(repository.substring(7), StandardCharsets.UTF_8);
else if (repository.startsWith("file:"))
-repository =
UDecoder.URLDecode(repository.substring(5));
+repository =
UDecoder.URLDecode(repository.substring(5), StandardCharsets.UTF_8);
else
continue;
if (repository == null)
diff --git a/test/org/apache/tomcat/util/buf/TestUDecoder.java
b/test/org/apache/tomcat/util/buf/TestUDecoder.java
index d3264c2..ca7dd23 100644
--- a/test/org/apache/tomcat/util/buf/TestUDecoder.java
+++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java
@@ -28,7 +28,7 @@ public class TestUDecoder {
// %n rather than %nn should throw an IAE according to the Javadoc
Exception exception = null;
try {
-UDecoder.URLDecode("%5x");
+UDecoder.URLDecode("%5x", StandardCharsets.UTF_8);
} catch (Exception e) {
exception = e;
}
@@ -37,7 +37,7 @@ public class TestUDecoder {
// Edge case trying to trigger ArrayIndexOutOfBoundsException
exception = null;
try {
-UDecoder.URLDecode("%5");
+UDecoder.URLDecode("%5", StandardCharsets.UTF_8);
} catch (Exception e) {
exception = e;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (dabf497 -> adf4d35)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from dabf497 Be explicit that UTF-8 is used for encoded dispatcher paths new 0c2bd66 Make all calls to URLDecode use an explicit character set new 17a0d32 Deprecated unused method new 12e4d8e Remove deprecated code new 5f5e375 Simplify comment. Call byte decode method directly. new 763cc04 Deprecate unused methods new adf4d35 Remove deprecated methods The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/catalina/connector/CoyoteAdapter.java | 6 +- java/org/apache/catalina/loader/WebappLoader.java | 5 +- java/org/apache/tomcat/util/buf/UDecoder.java | 181 + test/org/apache/tomcat/util/buf/TestUDecoder.java | 4 +- 4 files changed, 10 insertions(+), 186 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 12e4d8e17e7628deaabb7f2a433d465ce7dcaa01
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:03:33 2020 +
Remove deprecated code
---
java/org/apache/tomcat/util/buf/UDecoder.java | 19 ---
1 file changed, 19 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index 712e869..3e063c1 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -289,25 +289,6 @@ public final class UDecoder {
/**
- * Decode and return the specified URL-encoded String.
- * When the byte array is converted to a string, UTF-8 is used. This may
- * be different than some other servers. It is assumed the string is not a
- * query string.
- *
- * @param str The url-encoded string
- * @return the decoded string
- * @exception IllegalArgumentException if a '%' character is not followed
- * by a valid 2-digit hexadecimal number
- *
- * @deprecated Unused. This will be removed in Tomcat 10 onwards
- */
-@Deprecated
-public static String URLDecode(String str) {
-return URLDecode(str, StandardCharsets.UTF_8);
-}
-
-
-/**
* Decode and return the specified URL-encoded String. It is assumed the
* string is not a query string.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Simplify comment. Call byte decode method directly.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5f5e3756f47b043f3f0112a362772c3e156681ac
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:18:53 2020 +
Simplify comment. Call byte decode method directly.
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 1d21a24..3b6f7e9 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -624,15 +624,13 @@ public class CoyoteAdapter implements Adapter {
// Copy the raw URI to the decodedURI
decodedURI.duplicate(undecodedURI);
-// Parse the path parameters. This will:
-// - strip out the path parameters
-// - convert the decodedURI to bytes
+// Parse (and strip out) the path parameters
parsePathParameters(req, request);
// URI decoding
// %xx decoding of the URL
try {
-req.getURLDecoder().convert(decodedURI, false);
+req.getURLDecoder().convert(decodedURI.getByteChunk(), false);
} catch (IOException ioe) {
response.sendError(400, "Invalid URI: " + ioe.getMessage());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (f61a255 -> 19ab3fc)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from f61a255 Be explicit that UTF-8 is used for encoded dispatcher paths add 8b048fe Make all calls to URLDecode use an explicit character set add c515f52 Deprecated unused method add 272fba8 Simplify comment. Call byte decode method directly. add 19ab3fc Deprecate unused methods No new revisions were added by this update. Summary of changes: .../apache/catalina/connector/CoyoteAdapter.java | 6 ++-- java/org/apache/catalina/loader/WebappLoader.java | 5 ++-- java/org/apache/tomcat/util/buf/UDecoder.java | 32 +++--- test/org/apache/tomcat/util/buf/TestUDecoder.java | 4 +-- 4 files changed, 35 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Make all calls to URLDecode use an explicit character set
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8fcd0518d443ba67f76352adc2b28a62b4e8c460
Author: Mark Thomas
AuthorDate: Mon Mar 16 15:57:13 2020 +
Make all calls to URLDecode use an explicit character set
---
java/org/apache/catalina/loader/WebappLoader.java | 5 +++--
test/org/apache/tomcat/util/buf/TestUDecoder.java | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index 8ddf716..8d93226 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.lang.reflect.Constructor;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
import javax.management.ObjectName;
import javax.servlet.ServletContext;
@@ -612,9 +613,9 @@ public class WebappLoader extends LifecycleMBeanBase
for (int i = 0; i < repositories.length; i++) {
String repository = repositories[i].toString();
if (repository.startsWith("file://"))
-repository =
UDecoder.URLDecode(repository.substring(7));
+repository =
UDecoder.URLDecode(repository.substring(7), StandardCharsets.ISO_8859_1);
else if (repository.startsWith("file:"))
-repository =
UDecoder.URLDecode(repository.substring(5));
+repository =
UDecoder.URLDecode(repository.substring(5), StandardCharsets.ISO_8859_1);
else
continue;
if (repository == null)
diff --git a/test/org/apache/tomcat/util/buf/TestUDecoder.java
b/test/org/apache/tomcat/util/buf/TestUDecoder.java
index d3264c2..ca7dd23 100644
--- a/test/org/apache/tomcat/util/buf/TestUDecoder.java
+++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java
@@ -28,7 +28,7 @@ public class TestUDecoder {
// %n rather than %nn should throw an IAE according to the Javadoc
Exception exception = null;
try {
-UDecoder.URLDecode("%5x");
+UDecoder.URLDecode("%5x", StandardCharsets.UTF_8);
} catch (Exception e) {
exception = e;
}
@@ -37,7 +37,7 @@ public class TestUDecoder {
// Edge case trying to trigger ArrayIndexOutOfBoundsException
exception = null;
try {
-UDecoder.URLDecode("%5");
+UDecoder.URLDecode("%5", StandardCharsets.UTF_8);
} catch (Exception e) {
exception = e;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Deprecate unused methods
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9f2174f7061f79b5ea99a2bd1d68d73fb357a752
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:23:15 2020 +
Deprecate unused methods
---
java/org/apache/tomcat/util/buf/UDecoder.java | 29 +++
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index 40ae275..c7ff567 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -74,7 +74,9 @@ public final class UDecoder {
}
/**
- * URLDecode, will modify the source.
+ * URLDecode, will modify the source. Assumes source bytes are encoded
using
+ * a superset of US-ASCII as per RFC 7230.
+ *
* @param mb The URL encoded bytes
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
@@ -132,14 +134,19 @@ public final class UDecoder {
}
// Additional methods
-// XXX What do we do about charset
/**
* In-buffer processing - the buffer will be modified.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
* @param mb The URL encoded chars
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public void convert( CharChunk mb, boolean query )
throws IOException
{
@@ -193,11 +200,17 @@ public final class UDecoder {
}
/**
- * URLDecode, will modify the source
+ * URLDecode, will modify the source.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
* @param mb The URL encoded String, bytes or chars
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public void convert(MessageBytes mb, boolean query)
throws IOException
{
@@ -226,11 +239,19 @@ public final class UDecoder {
}
/**
- * %xx decoding of a string. FIXME: this is inefficient.
+ * %xx decoding of a string.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
+ * FIXME: this is inefficient.
+ *
* @param str The URL encoded string
* @param query true if this is a query string
* @return the decoded string
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public final String convert(String str, boolean query)
{
if (str == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Deprecated unused method
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7ee3a5c90ed75c4147690aaf10d356f13d41c834
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:03:12 2020 +
Deprecated unused method
---
java/org/apache/tomcat/util/buf/UDecoder.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index fa0523a..40ae275 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -304,7 +304,10 @@ public final class UDecoder {
* @return the decoded string
* @exception IllegalArgumentException if a '%' character is not followed
* by a valid 2-digit hexadecimal number
+ *
+ * @deprecated Unused. This will be removed in Tomcat 10 onwards
*/
+@Deprecated
public static String URLDecode(String str) {
return URLDecode(str, StandardCharsets.ISO_8859_1);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Simplify comment. Call byte decode method directly.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 26ff6f723213730b6802df30c76ba37d24141fce
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:18:53 2020 +
Simplify comment. Call byte decode method directly.
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 0d81f6d..e7cc9ed 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -624,15 +624,13 @@ public class CoyoteAdapter implements Adapter {
// Copy the raw URI to the decodedURI
decodedURI.duplicate(undecodedURI);
-// Parse the path parameters. This will:
-// - strip out the path parameters
-// - convert the decodedURI to bytes
+// Parse (and strip out) the path parameters
parsePathParameters(req, request);
// URI decoding
// %xx decoding of the URL
try {
-req.getURLDecoder().convert(decodedURI, false);
+req.getURLDecoder().convert(decodedURI.getByteChunk(), false);
} catch (IOException ioe) {
response.sendError(400, "Invalid URI: " + ioe.getMessage());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (cccb520 -> 9f2174f)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from cccb520 Be explicit that UTF-8 is used for encoded dispatcher paths new 8fcd051 Make all calls to URLDecode use an explicit character set new 7ee3a5c Deprecated unused method new 26ff6f7 Simplify comment. Call byte decode method directly. new 9f2174f Deprecate unused methods The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/catalina/connector/CoyoteAdapter.java | 6 ++-- java/org/apache/catalina/loader/WebappLoader.java | 5 ++-- java/org/apache/tomcat/util/buf/UDecoder.java | 32 +++--- test/org/apache/tomcat/util/buf/TestUDecoder.java | 4 +-- 4 files changed, 35 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Make all calls to URLDecode use an explicit character set
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3bb4e130fc1a44c24b6efcd23f6c4e23733f4eda
Author: Mark Thomas
AuthorDate: Mon Mar 16 15:57:13 2020 +
Make all calls to URLDecode use an explicit character set
---
java/org/apache/catalina/core/ApplicationContext.java | 3 ++-
java/org/apache/catalina/loader/WebappLoader.java | 8
test/org/apache/catalina/util/TestRequestUtil.java| 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 881d513..e76c54c 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -74,6 +74,7 @@ import org.apache.catalina.util.URLEncoder;
import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.naming.resources.Resource;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.buf.UDecoder;
@@ -446,7 +447,7 @@ public class ApplicationContext implements ServletContext {
if (getContext().getDispatchersUseEncodedPaths()) {
// Decode
-String decodedUri = UDecoder.URLDecode(normalizedUri,
StandardCharsets.UTF_8);
+String decodedUri = UDecoder.URLDecode(normalizedUri,
B2CConverter.UTF_8);
// Security check to catch attempts to encode /../ sequences
normalizedUri = RequestUtil.normalize(decodedUri);
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index d2d2751..b39e9c1 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -55,6 +55,7 @@ import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.naming.resources.DirContextURLStreamHandlerFactory;
import org.apache.naming.resources.Resource;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.compat.JreCompat;
import org.apache.tomcat.util.modeler.Registry;
@@ -1107,12 +1108,11 @@ public class WebappLoader extends LifecycleMBeanBase
for (int i = 0; i < repositories.length; i++) {
String repository = repositories[i].toString();
if (repository.startsWith("file://"))
-repository =
UDecoder.URLDecode(repository.substring(7));
+repository =
UDecoder.URLDecode(repository.substring(7), B2CConverter.ISO_8859_1);
else if (repository.startsWith("file:"))
-repository =
UDecoder.URLDecode(repository.substring(5));
+repository =
UDecoder.URLDecode(repository.substring(5), B2CConverter.ISO_8859_1);
else if (repository.startsWith("jndi:"))
-repository =
-
servletContext.getRealPath(repository.substring(5));
+repository =
servletContext.getRealPath(repository.substring(5));
else
continue;
if (repository == null)
diff --git a/test/org/apache/catalina/util/TestRequestUtil.java
b/test/org/apache/catalina/util/TestRequestUtil.java
index a566737..1974587 100644
--- a/test/org/apache/catalina/util/TestRequestUtil.java
+++ b/test/org/apache/catalina/util/TestRequestUtil.java
@@ -26,7 +26,7 @@ public class TestRequestUtil {
// %n rather than %nn should throw an IAE according to the Javadoc
Exception exception = null;
try {
-RequestUtil.URLDecode("%5x");
+RequestUtil.URLDecode("%5x", "UTF-8");
} catch (Exception e) {
exception = e;
}
@@ -35,7 +35,7 @@ public class TestRequestUtil {
// Edge case trying to trigger ArrayIndexOutOfBoundsException
exception = null;
try {
-RequestUtil.URLDecode("%5");
+RequestUtil.URLDecode("%5", "UTF-8");
} catch (Exception e) {
exception = e;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Call byte decode method directly.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7255cd488d9fadce8b473daa803dee7eb31a64da
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:18:53 2020 +
Call byte decode method directly.
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index fc0fdd0..783fc24 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -721,13 +721,14 @@ public class CoyoteAdapter implements Adapter {
// Parse the path parameters. This will:
// - strip out the path parameters
-// - convert the decodedURI to bytes
+// - convert the decodedURI to bytes (if it isn't already)
parsePathParameters(req, request);
// URI decoding
// %xx decoding of the URL
try {
-req.getURLDecoder().convert(decodedURI, false);
+// Will always by in bytes at this point
+req.getURLDecoder().convert(decodedURI.getByteChunk(), false);
} catch (IOException ioe) {
res.setStatus(400);
res.setMessage("Invalid URI: " + ioe.getMessage());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (a72847f -> 60d3ab3)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from a72847f Be explicit that UTF-8 is used for encoded dispatcher paths new 3bb4e13 Make all calls to URLDecode use an explicit character set new 7717f86 Deprecated unused method new 7255cd4 Call byte decode method directly. new 60d3ab3 Deprecate unused methods / methods that will be removed later The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/catalina/connector/CoyoteAdapter.java | 5 ++-- .../apache/catalina/core/ApplicationContext.java | 3 ++- java/org/apache/catalina/loader/WebappLoader.java | 8 +++--- java/org/apache/tomcat/util/buf/UDecoder.java | 30 +++--- test/org/apache/catalina/util/TestRequestUtil.java | 4 +-- 5 files changed, 38 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Deprecated unused method
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7717f860271c3a44044eeb6a859eef4a5e85aaf5
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:03:12 2020 +
Deprecated unused method
---
java/org/apache/tomcat/util/buf/UDecoder.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index 0689d1e..6d123ea 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -350,7 +350,10 @@ public final class UDecoder {
* @return the decoded string
* @exception IllegalArgumentException if a '%' character is not followed
* by a valid 2-digit hexadecimal number
+ *
+ * @deprecated Unused. This will be removed in Tomcat 10 onwards
*/
+@Deprecated
public static String URLDecode(String str) {
return URLDecode(str, B2CConverter.UTF_8);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Deprecate unused methods / methods that will be removed later
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 60d3ab3636f0efe94b6e01a48dd6949585cd63d2
Author: Mark Thomas
AuthorDate: Mon Mar 16 16:23:15 2020 +
Deprecate unused methods / methods that will be removed later
---
java/org/apache/tomcat/util/buf/UDecoder.java | 27 ---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java
b/java/org/apache/tomcat/util/buf/UDecoder.java
index 6d123ea..44696f2 100644
--- a/java/org/apache/tomcat/util/buf/UDecoder.java
+++ b/java/org/apache/tomcat/util/buf/UDecoder.java
@@ -68,7 +68,9 @@ public final class UDecoder {
}
/**
- * URLDecode, will modify the source.
+ * URLDecode, will modify the source. Assumes source bytes are encoded
using
+ * a superset of US-ASCII as per RFC 7230.
+ *
* @param mb The URL encoded bytes
* @throws IOException Invalid %xx URL encoding
* @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
@@ -138,10 +140,12 @@ public final class UDecoder {
}
// Additional methods
-// XXX What do we do about charset
/**
* In-buffer processing - the buffer will be modified.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
* @param mb The URL encoded chars
* @throws IOException Invalid %xx URL encoding
* @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
@@ -158,7 +162,10 @@ public final class UDecoder {
* @param mb The URL encoded chars
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public void convert( CharChunk mb, boolean query )
throws IOException
{
@@ -226,10 +233,16 @@ public final class UDecoder {
/**
* URLDecode, will modify the source
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
* @param mb The URL encoded String, bytes or chars
* @param query true if this is a query string
* @throws IOException Invalid %xx URL encoding
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10
*/
+@Deprecated
public void convert(MessageBytes mb, boolean query)
throws IOException
{
@@ -272,11 +285,19 @@ public final class UDecoder {
}
/**
- * %xx decoding of a string. FIXME: this is inefficient.
+ * %xx decoding of a string.
+ *
+ * WARNING: This method assumes US-ASCII encoding.
+ *
+ * FIXME: this is inefficient.
+ *
* @param str The URL encoded string
* @param query true if this is a query string
* @return the decoded string
+ *
+ * @deprecated Will be removed in Tomcat 10
*/
+@Deprecated
public final String convert(String str, boolean query)
{
if (str == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] fhanik opened a new pull request #263: graal support for embedded jars
fhanik opened a new pull request #263: graal support for embedded jars URL: https://github.com/apache/tomcat/pull/263 Don't merge yet, opening PR for purpose of review. I will bring this up on the mailing list. _include Graal files so that the native-image compiler picks it up automatically_ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
