[tomcat-jakartaee-migration] branch main updated: Fix handling of javax.annotation package in 1.0.5

2022-12-02 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new 46467c0  Fix handling of javax.annotation package in 1.0.5
46467c0 is described below

commit 46467c0a0942a70b5b011de321147362eca83c72
Author: remm 
AuthorDate: Fri Dec 2 09:35:42 2022 +0100

Fix handling of javax.annotation package in 1.0.5

PR#40 submitted by Danny Thomas
---
 CHANGES.md |  2 +-
 .../java/org/apache/tomcat/jakartaee/EESpecProfiles.java   | 14 +++---
 .../org/apache/tomcat/jakartaee/EESpecProfileTest.java |  4 
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 08ecc7c..21e85b9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@
 
 ## 1.0.6
 
-- TBD
+- Fix handling of javax.annotation package in 1.0.5. PR 
[#40](https://github.com/apache/tomcat-jakartaee-migration/pull/40) provided by 
Danny Thomas (remm)
 
 ## 1.0.5
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java 
b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
index ff8c3a3..054a73c 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
@@ -64,17 +64,17 @@ public enum EESpecProfiles implements EESpecProfile {
 "Priority",
 "Resource",
 "Resources",
-"security/DeclareRoles",
-"security/DenyAll",
-"security/PermitAll",
-"security/RolesAllowed",
-"security/RunAs",
-"sql/DataSourceDefinition"
+"security[/\\.]DeclareRoles",
+"security[/\\.]DenyAll",
+"security[/\\.]PermitAll",
+"security[/\\.]RolesAllowed",
+"security[/\\.]RunAs",
+"sql[/\\.]DataSourceDefinition"
 ));
 static final String EE = String.join("|",
 Arrays.asList(
 "([/\\.](activation",
-"annotation(" + ANNOTATION_CLASSES + ")",
+"annotation[/\\.](" + ANNOTATION_CLASSES + ")",
 "batch",
 "decorator",
 "ejb",
diff --git a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
index 94d56d7..61bc2ae 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -27,6 +27,8 @@ public class EESpecProfileTest {
 public void testProfileTomcat() {
 EESpecProfile profile = EESpecProfiles.TOMCAT;
 
+assertEquals("jakarta.annotation.PostConstruct", 
profile.convert("javax.annotation.PostConstruct"));
+assertEquals("jakarta.annotation.security.DeclareRoles", 
profile.convert("javax.annotation.security.DeclareRoles"));
 assertEquals("jakarta.ejb", profile.convert("javax.ejb"));
 assertEquals("jakarta.el", profile.convert("javax.el"));
 assertEquals("jakarta.mail", profile.convert("javax.mail"));
@@ -86,6 +88,8 @@ public class EESpecProfileTest {
 EESpecProfile profile = EESpecProfiles.EE;
 
 assertEquals("jakarta.activation.Generated", 
profile.convert("javax.activation.Generated"));
+assertEquals("jakarta.annotation.PostConstruct", 
profile.convert("javax.annotation.PostConstruct"));
+assertEquals("jakarta.annotation.security.DeclareRoles", 
profile.convert("javax.annotation.security.DeclareRoles"));
 assertEquals("jakarta.batch", profile.convert("javax.batch"));
 assertEquals("jakarta.decorator", profile.convert("javax.decorator"));
 assertEquals("jakarta.ejb", profile.convert("javax.ejb"));


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-jakartaee-migration] rmaucher commented on pull request #40: Fix issues with annotations packages

2022-12-02 Thread GitBox 


rmaucher commented on PR #40:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/pull/40#issuecomment-1334909213

   Thanks for the PR. Merged manually and this will be in 1.0.6.


-- 
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.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-jakartaee-migration] rmaucher closed pull request #40: Fix issues with annotations packages

2022-12-02 Thread GitBox 


rmaucher closed pull request #40: Fix issues with annotations packages
URL: https://github.com/apache/tomcat-jakartaee-migration/pull/40


-- 
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.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch main updated: Allow parallel use of ClassConverter

2022-12-02 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new 781453d  Allow parallel use of ClassConverter
781453d is described below

commit 781453d466fb6b749359885ae0477c930074a0cb
Author: remm 
AuthorDate: Fri Dec 2 09:45:31 2022 +0100

Allow parallel use of ClassConverter

Initialize map in BCEL.
PR#41 submitted by Danny Thomas
---
 CHANGES.md| 1 +
 src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 21e85b9..8b31d08 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 ## 1.0.6
 
 - Fix handling of javax.annotation package in 1.0.5. PR 
[#40](https://github.com/apache/tomcat-jakartaee-migration/pull/40) provided by 
Danny Thomas (remm)
+- Allow parallel use of ClassConverter. PR 
[#41](https://github.com/apache/tomcat-jakartaee-migration/pull/41) provided by 
Danny Thomas (remm)
 
 ## 1.0.5
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 47fae3c..46e1a02 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -31,6 +31,7 @@ import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.Constant;
 import org.apache.bcel.classfile.ConstantUtf8;
 import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.util.SyntheticRepository;
 import org.apache.commons.io.IOUtils;
 
 /**
@@ -38,6 +39,11 @@ import org.apache.commons.io.IOUtils;
  */
 public class ClassConverter implements Converter, ClassFileTransformer {
 
+static {
+// Avoid ConcurrentModificationException from SyntheticRepository when 
migrations are run concurrently
+SyntheticRepository.getInstance();
+}
+
 private static final Logger logger = 
Logger.getLogger(ClassConverter.class.getCanonicalName());
 private static final StringManager sm = 
StringManager.getManager(ClassConverter.class);
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-jakartaee-migration] rmaucher commented on pull request #41: Avoid bcel thread safety issue

2022-12-02 Thread GitBox 


rmaucher commented on PR #41:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/pull/41#issuecomment-1334920596

   Nice trick. I didn't try to reproduce it, but given the stack trace it seems 
useful. Thanks for the PR. This will be in 1.0.6.


-- 
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.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat-jakartaee-migration] rmaucher closed pull request #41: Avoid bcel thread safety issue

2022-12-02 Thread GitBox 


rmaucher closed pull request #41: Avoid bcel thread safety issue
URL: https://github.com/apache/tomcat-jakartaee-migration/pull/41


-- 
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.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 11.0.0-M1

2022-12-02 Thread Rémy Maucherat 
On Thu, Dec 1, 2022 at 12:58 PM Mark Thomas  wrote:
>
> The proposed Apache Tomcat 11.0.0-M1 release is now available for
> voting.
>
> Apache Tomcat 11.0.0-M1 is the first milestone release of the 11.0.x
> branch and has been made to provide users with early access to the new
> features in Apache Tomcat 11.0.x so that they may provide feedback. The
> notable changes compared to 10.1.x include:
>
> - Alignment with the current development versions of the Jakarta
>Servlet, Pages and Expression Language specifications. This includes
>removal of deprecated code and addition of the
>jakarta.servlet.error.query_string attribute for error dispatches
>
> - BASIC authentication now uses UTF-8 by default
>
> - Conversions from bytes to characters now trigger exceptions rather
>than replacement for invalid byte sequences for the given encoding
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory. Applications using deprecated APIs may require
> further changes.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M1/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1408
>
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M1
> 59c81e30e2f64f5e8c1db78c4860c51850dfb0bd
>
> The proposed 11.0.0-M1 release is:
> [ ] Broken - do not release
> [X] Alpha - go ahead and release as 11.0.0-M1

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.1.3

2022-12-02 Thread Rémy Maucherat 
On Thu, Dec 1, 2022 at 2:47 PM Mark Thomas  wrote:
>
> The proposed Apache Tomcat 10.1.3 release is now available for
> voting.
>
> The notable changes compared to 10.1.2 are:
>
> - Refactor WebappLoader so it only has a runtime dependency on the
>migration tool for Jakarta EE if configured to use the converter as
>classes are loaded.
>
> - When an HTTP/2 stream was reset, the current active stream count was
>not reduced. If enough resets occurred on a connection, the current
>active stream count limit was reached and no new streams could be
>created on that connection.
>
> - Update to Commons Daemon 1.3.3
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.3/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1409
>
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.3
> 492a27099f43f1ae20b8b8a8ef4625d15e826113
>
>
> The proposed 10.1.3 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 10.1.3

https://github.com/apache/tomcat-jakartaee-migration/pull/40 (reported
only a few hours after the tag, bad luck ...) looks to be an issue for
this branch. For 11 it doesn't matter at this stage.
Maybe a 1.0.6 release of the tool should occur first before a new 10.1.4 tag.

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 9.0.70

2022-12-02 Thread Rémy Maucherat 
On Thu, Dec 1, 2022 at 3:27 PM Rémy Maucherat  wrote:
>
> The proposed Apache Tomcat 9.0.70 release is now available for voting.
>
> The notable changes compared to 9.0.69 are:
>
> - When an HTTP/2 stream was reset, the current active stream count was
>not reduced. If enough resets occurred on a connection, the current
>active stream count limit was reached and no new streams could be
>created on that connection.
>
> - Update to Commons Daemon 1.3.3
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.70/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1410
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.70
> 55a52d8475b8b3ec8ebda739f8c6b4fdeac173d9
>
> The proposed 9.0.70 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.70

Tests pass and no Jakarta tool in that branch.

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 10.1.3

2022-12-02 Thread Mark Thomas 

On 02/12/2022 09:04, Rémy Maucherat wrote:

On Thu, Dec 1, 2022 at 2:47 PM Mark Thomas  wrote:



The proposed 10.1.3 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 10.1.3


https://github.com/apache/tomcat-jakartaee-migration/pull/40 (reported
only a few hours after the tag, bad luck ...) looks to be an issue for
this branch. For 11 it doesn't matter at this stage.
Maybe a 1.0.6 release of the tool should occur first before a new 10.1.4 tag.


I think that seems reasonable. I'll cancel the 10.1.3 VOTE and start on 
a new release of the migration tool.


Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE][CANCELLED] Release Apache Tomcat 10.1.3

2022-12-02 Thread Mark Thomas 
The 10.1.3 release vote has been cancelled due to a regression found the 
the migration tool for Jakarta EE.


Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch main updated: Fix auto-boxing warning

2022-12-02 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new 6be7b97  Fix auto-boxing warning
6be7b97 is described below

commit 6be7b9774b02c7e27e8dcb3bf158a327b1aff02d
Author: Mark Thomas 
AuthorDate: Fri Dec 2 10:01:49 2022 +

Fix auto-boxing warning
---
 src/main/java/org/apache/tomcat/jakartaee/Migration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 4f11e66..74d32a3 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -244,7 +244,7 @@ public class Migration {
 }
 state = State.COMPLETE;
 logger.log(Level.INFO, sm.getString("migration.done",
-TimeUnit.MILLISECONDS.convert(System.nanoTime() - t1, 
TimeUnit.NANOSECONDS)));
+Long.valueOf(TimeUnit.MILLISECONDS.convert(System.nanoTime() - 
t1, TimeUnit.NANOSECONDS;
 }
 
 private void migrateDirectory(File src, File dest) throws IOException {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] annotated tag 1.0.6 created (now 5d9af3e)

2022-12-02 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to annotated tag 1.0.6
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


  at 5d9af3e  (tag)
 tagging 3339fc418974bd5ce3432ea9503abda52d96a435 (commit)
 replaces 1.0.5
  by Mark Thomas
  on Fri Dec 2 10:11:17 2022 +

- Log -
[maven-release-plugin] copy for tag 1.0.6
---

This annotated tag includes the following new commits:

 new 3339fc4  [maven-release-plugin] prepare release 1.0.6

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-jakartaee-migration] 01/01: [maven-release-plugin] prepare release 1.0.6

2022-12-02 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to annotated tag 1.0.6
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 3339fc418974bd5ce3432ea9503abda52d96a435
Author: Mark Thomas 
AuthorDate: Fri Dec 2 10:10:18 2022 +

[maven-release-plugin] prepare release 1.0.6
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b882ab9..6289624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  1.0.6-SNAPSHOT
+  1.0.6
   Apache Tomcat Migration Tool for Jakarta EE
 
   The aim of the tool is to take a web application written for 
Java EE 8 that
@@ -62,7 +62,7 @@
   
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
-main
+1.0.6
 
https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] 01/01: [maven-release-plugin] prepare for next development iteration

2022-12-02 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 0e21b054e81aba8f28a55d43f5b9252e786053b3
Author: Mark Thomas 
AuthorDate: Fri Dec 2 10:11:31 2022 +

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6289624..df48118 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  1.0.6
+  1.0.7-SNAPSHOT
   Apache Tomcat Migration Tool for Jakarta EE
 
   The aim of the tool is to take a web application written for 
Java EE 8 that


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-jakartaee-migration] branch main updated (6be7b97 -> 0e21b05)

2022-12-02 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


from 6be7b97  Fix auto-boxing warning
 add 3339fc4  [maven-release-plugin] prepare release 1.0.6
 new 0e21b05  [maven-release-plugin] prepare for next development iteration

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.


Summary of changes:
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r58411 - in /dev/tomcat/jakartaee-migration/v1.0.6: ./ binaries/ source/

2022-12-02 Thread markt 
Author: markt
Date: Fri Dec  2 10:20:34 2022
New Revision: 58411

Log:
Upload 1.0.6 for voting

Added:
dev/tomcat/jakartaee-migration/v1.0.6/
dev/tomcat/jakartaee-migration/v1.0.6/binaries/

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz
   (with props)

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.asc

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.sha512

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip
   (with props)

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip.asc

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip.sha512

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-shaded.jar
   (with props)

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-shaded.jar.asc

dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-shaded.jar.sha512
dev/tomcat/jakartaee-migration/v1.0.6/source/

dev/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.tar.gz
   (with props)

dev/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.tar.gz.asc

dev/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.tar.gz.sha512

dev/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.zip  
 (with props)

dev/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.zip.asc

dev/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.zip.sha512

Added: 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.asc
==
--- 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.asc
 (added)
+++ 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.asc
 Fri Dec  2 10:20:34 2022
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmOJ0UgACgkQEMAcWi9g
+WedRehAAnmtvjjxGf+SPKlhl0gUP6aWQXeKqkJ/7jl6c+1YKe/mkXNPz+VzuvZgC
+faTzNXKhaJjdnOqRyfjMyQYF+05qbKYlY9ES+dCJKkiueuFmLB4KSqjYp9lNO74k
+lCfJHRwS0/YdVIF+E5HihTUrREL2gvyKANjhcrKtpuu0gkAEzvnHdb2tc2Mg7A/a
+G6W94OBljU7mYS8xwz0PPyUQaO+A9gjOQGulGQqJtx/Sl37gjL7dpYenITlhneQx
+uyPfPs1W/jMPr86dlx2ObNwCJ8ADp9/bIrYuIJY6460VakbcfiDXuT3W9o56aHku
+/64r8Ai+GiNuJJ8A/88oNFbRN0EjiqRaSrmGe7z+7TkItbPA9VlVsHFm02kN93Bw
+85m/SzXISyvl3Te1D2FQ+vZ4Y0dHMiBiBp15UeWR+1XR0o+5+CsiePGPRsoqhNMm
+lRC6eJ+tLP8YaX68tXBSwnp/lEB4fAqewR5yLeZ+OgQf4N/D7A6rkDArZRjXjNpi
+yM1bi6NsCy/XsHxYiURrCL/C7yuce2iTn4fKUFdPBbZ+0qJZy0K6FRcT+YZTal6y
+BXWn83iU/tZ3kbXwL6/PN4R6eylKcoylhMET1gia/E8Pe2VZcLaZhfwXCqWyrJpY
+DurhtcEUEM0N6MuZ5hbS50uiP1TTm67lthrIchVdirwKAmU2c6Q=
+=ZsFd
+-END PGP SIGNATURE-

Added: 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.sha512
==
--- 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.sha512
 (added)
+++ 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.tar.gz.sha512
 Fri Dec  2 10:20:34 2022
@@ -0,0 +1 @@
+34bdd213e1e4352d61435800b21eb2beffdf2ded3bcad475ee7a3fcc6bc56313cb8cbb8fc5273f71f7cfbb0c9b5cac16b27c20328148fae3cbd12581e2ba7281
 *jakartaee-migration-1.0.6-bin.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip.asc
==
--- 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip.asc
 (added)
+++ 
dev/tomcat/jakartaee-migration/v1.0.6/binaries/jakartaee-migration-1.0.6-bin.zip.asc
 Fri Dec  2 10:20:34 2022
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmOJ0UgACgkQEMAcWi

svn commit: r58412 - /dev/tomcat/tomcat-10/v10.1.3/

2022-12-02 Thread markt 
Author: markt
Date: Fri Dec  2 10:21:13 2022
New Revision: 58412

Log:
Drop 10.1.3 - vote cancelled

Removed:
dev/tomcat/tomcat-10/v10.1.3/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.6

2022-12-02 Thread Mark Thomas 

The proposed Apache Tomcat migration tool for Jakarta EE 1.0.6 is now
available for voting.

The significant changes since 1.0.5 are:

- Correct regression in handling of javax.annotation package introduced
  in 1.0.5. PR provided by Danny Thomas.

- Allow parallel use of ClassConverter. PR provided by Danny Thomas.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.6/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1411/

The tag is:
https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.6
3339fc418974bd5ce3432ea9503abda52d96a435

The proposed 1.0.6 release is:

[ ] -1: Broken. Do not release because...
[ ] +1: Acceptable. Go ahead and release.

Thanks,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 10.1.x updated: No release date for 10.1.3

2022-12-02 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 30062f53a1 No release date for 10.1.3
30062f53a1 is described below

commit 30062f53a177f489fd0faaf1f10823cc76a7533c
Author: Mark Thomas 
AuthorDate: Fri Dec 2 10:25:11 2022 +

No release date for 10.1.3
---
 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 e70c9fd1f3..fd40472cb1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,7 +106,7 @@
 -->
 
 
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.6

2022-12-02 Thread Rémy Maucherat 
On Fri, Dec 2, 2022 at 11:24 AM Mark Thomas  wrote:
>
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.6 is now
> available for voting.
>
> The significant changes since 1.0.5 are:
>
> - Correct regression in handling of javax.annotation package introduced
>in 1.0.5. PR provided by Danny Thomas.
>
> - Allow parallel use of ClassConverter. PR provided by Danny Thomas.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.6/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1411/
>
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.6
> 3339fc418974bd5ce3432ea9503abda52d96a435
>
> The proposed 1.0.6 release is:
>
> [ ] -1: Broken. Do not release because...
> [X] +1: Acceptable. Go ahead and release.

Tested with examples webapp from Tomcat 9.

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.6

2022-12-02 Thread Han Li 



> On Dec 2, 2022, at 18:24, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.6 is now
> available for voting.
> 
> The significant changes since 1.0.5 are:
> 
> - Correct regression in handling of javax.annotation package introduced
>  in 1.0.5. PR provided by Danny Thomas.
> 
> - Allow parallel use of ClassConverter. PR provided by Danny Thomas.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.6/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1411/
> 
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.6
> 3339fc418974bd5ce3432ea9503abda52d96a435
> 
> The proposed 1.0.6 release is:
> 
> [ ] -1: Broken. Do not release because…
> [X ] +1: Acceptable. Go ahead and release.

Han
> 
> Thanks,
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 9.0.70

2022-12-02 Thread Han Li 



> On Dec 1, 2022, at 22:27, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.70 release is now available for voting.
> 
> The notable changes compared to 9.0.69 are:
> 
> - When an HTTP/2 stream was reset, the current active stream count was
>   not reduced. If enough resets occurred on a connection, the current
>   active stream count limit was reached and no new streams could be
>   created on that connection.
> 
> - Update to Commons Daemon 1.3.3
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.70/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1410
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.70
> 55a52d8475b8b3ec8ebda739f8c6b4fdeac173d9
> 
> The proposed 9.0.70 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 9.0.70

Han
> 
> Rémy
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 11.0.0-M1

2022-12-02 Thread Han Li 



> On Dec 1, 2022, at 19:58, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M1 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M1 is the first milestone release of the 11.0.x
> branch and has been made to provide users with early access to the new
> features in Apache Tomcat 11.0.x so that they may provide feedback. The
> notable changes compared to 10.1.x include:
> 
> - Alignment with the current development versions of the Jakarta
>  Servlet, Pages and Expression Language specifications. This includes
>  removal of deprecated code and addition of the
>  jakarta.servlet.error.query_string attribute for error dispatches
> 
> - BASIC authentication now uses UTF-8 by default
> 
> - Conversions from bytes to characters now trigger exceptions rather
>  than replacement for invalid byte sequences for the given encoding
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M1/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1408
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M1
> 59c81e30e2f64f5e8c1db78c4860c51850dfb0bd
> 
> The proposed 11.0.0-M1 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 11.0.0-M1

Tests pass.

Han
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 11.0.0-M1

2022-12-02 Thread Romain Manni-Bucau 
[X] Stable (non binding)

tested on a few downstream projects (like Yupiik Uship or Apache
OpenWebBeans Meecrowave - based on 10.x as of today) and detected no issue.

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le ven. 2 déc. 2022 à 13:01, Han Li  a écrit :

>
>
> > On Dec 1, 2022, at 19:58, Mark Thomas  wrote:
> >
> > The proposed Apache Tomcat 11.0.0-M1 release is now available for
> > voting.
> >
> > Apache Tomcat 11.0.0-M1 is the first milestone release of the 11.0.x
> > branch and has been made to provide users with early access to the new
> > features in Apache Tomcat 11.0.x so that they may provide feedback. The
> > notable changes compared to 10.1.x include:
> >
> > - Alignment with the current development versions of the Jakarta
> >  Servlet, Pages and Expression Language specifications. This includes
> >  removal of deprecated code and addition of the
> >  jakarta.servlet.error.query_string attribute for error dispatches
> >
> > - BASIC authentication now uses UTF-8 by default
> >
> > - Conversions from bytes to characters now trigger exceptions rather
> >  than replacement for invalid byte sequences for the given encoding
> >
> > For full details, see the change log:
> > https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> >
> > Applications that run on Tomcat 9 and earlier will not run on Tomcat 11
> without changes. Java EE applications designed for Tomcat 9 and earlier may
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will
> automatically convert them to Jakarta EE and copy them to the webapps
> directory. Applications using deprecated APIs may require further changes.
> >
> > It can be obtained from:
> > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M1/
> >
> > The Maven staging repo is:
> > https://repository.apache.org/content/repositories/orgapachetomcat-1408
> >
> > The tag is:
> > https://github.com/apache/tomcat/tree/11.0.0-M1
> > 59c81e30e2f64f5e8c1db78c4860c51850dfb0bd
> >
> > The proposed 11.0.0-M1 release is:
> > [ ] Broken - do not release
> > [X ] Stable - go ahead and release as 11.0.0-M1
>
> Tests pass.
>
> Han
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 9.0.70

2022-12-02 Thread Mladen Turk 

+1 for Stable
Tested on win server 2019 and 2022


On 01/12/2022 15:27, Rémy Maucherat wrote:

The proposed Apache Tomcat 9.0.70 release is now available for voting.

The notable changes compared to 9.0.69 are:

- When an HTTP/2 stream was reset, the current active stream count was
not reduced. If enough resets occurred on a connection, the current
active stream count limit was reached and no new streams could be
created on that connection.

- Update to Commons Daemon 1.3.3

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.70/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1410
The tag is:
https://github.com/apache/tomcat/tree/9.0.70
55a52d8475b8b3ec8ebda739f8c6b4fdeac173d9

The proposed 9.0.70 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.70

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 11.0.0-M1

2022-12-02 Thread Mladen Turk 

+1 for Stable release

Tested on win server 2019 and 2022 and centos 8


On 01/12/2022 12:58, Mark Thomas wrote:

The proposed Apache Tomcat 11.0.0-M1 release is now available for
voting.

Apache Tomcat 11.0.0-M1 is the first milestone release of the 11.0.x
branch and has been made to provide users with early access to the new
features in Apache Tomcat 11.0.x so that they may provide feedback. The
notable changes compared to 10.1.x include:

- Alignment with the current development versions of the Jakarta
   Servlet, Pages and Expression Language specifications. This includes
   removal of deprecated code and addition of the
   jakarta.servlet.error.query_string attribute for error dispatches

- BASIC authentication now uses UTF-8 by default

- Conversions from bytes to characters now trigger exceptions rather
   than replacement for invalid byte sequences for the given encoding

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html

Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory. Applications using deprecated APIs may require 
further changes.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M1/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1408

The tag is:
https://github.com/apache/tomcat/tree/11.0.0-M1
59c81e30e2f64f5e8c1db78c4860c51850dfb0bd

The proposed 11.0.0-M1 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 11.0.0-M1

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 9.0.70

2022-12-02 Thread jean-frederic clere 

On 12/1/22 15:27, Rémy Maucherat wrote:

[X] Stable - go ahead and release as 9.0.70


Test on fedora36 with tc-native-1.2.35

--
Cheers

Jean-Frederic


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Correct handling of cookie values with quotes

2022-12-02 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new af983a45c8 Correct handling of cookie values with quotes
af983a45c8 is described below

commit af983a45c8e3f2252c1a14d52024dde63ff2
Author: Mark Thomas 
AuthorDate: Fri Dec 2 15:21:01 2022 +

Correct handling of cookie values with quotes

While we should back-port this, I don't intend to at this point. The
possibility of breakage is too great.
---
 .../tomcat/util/http/Rfc6265CookieProcessor.java   |  7 ++--
 .../org/apache/tomcat/util/http/parser/Cookie.java | 11 ++
 test/org/apache/tomcat/util/http/TestCookies.java  | 41 +-
 webapps/docs/changelog.xml |  9 +
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java 
b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
index 8f2da681b2..2a35863a2b 100644
--- a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
@@ -210,14 +210,17 @@ public class Rfc6265CookieProcessor extends 
CookieProcessorBase {
 private void validateCookieValue(String value) {
 int start = 0;
 int end = value.length();
+boolean quoted = false;
 
 if (end > 1 && value.charAt(0) == '"' && value.charAt(end - 1) == '"') 
{
-start = 1;
-end--;
+quoted = true;
 }
 
 char[] chars = value.toCharArray();
 for (int i = start; i < end; i++) {
+if (quoted && (i == start || i == end - 1)) {
+continue;
+}
 char c = chars[i];
 if (c < 0x21 || c == 0x22 || c == 0x2c || c == 0x3b || c == 0x5c 
|| c == 0x7f) {
 throw new IllegalArgumentException(sm.getString(
diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java 
b/java/org/apache/tomcat/util/http/parser/Cookie.java
index f10d53d232..8801f0f5e9 100644
--- a/java/org/apache/tomcat/util/http/parser/Cookie.java
+++ b/java/org/apache/tomcat/util/http/parser/Cookie.java
@@ -185,13 +185,6 @@ public class Cookie {
  */
 private static ByteBuffer readCookieValueRfc6265(ByteBuffer bb) {
 boolean quoted = false;
-if (bb.hasRemaining()) {
-if (bb.get() == QUOTE_BYTE) {
-quoted = true;
-} else {
-bb.rewind();
-}
-}
 int start = bb.position();
 int end = bb.limit();
 while (bb.hasRemaining()) {
@@ -202,8 +195,10 @@ public class Cookie {
 end = bb.position() - 1;
 bb.position(end);
 break;
+} else if (b == QUOTE_BYTE && start == bb.position() -1) {
+quoted = true;
 } else if (quoted && b == QUOTE_BYTE) {
-end = bb.position() - 1;
+end = bb.position();
 break;
 } else {
 // Invalid cookie
diff --git a/test/org/apache/tomcat/util/http/TestCookies.java 
b/test/org/apache/tomcat/util/http/TestCookies.java
index 265801789f..bb08c0 100644
--- a/test/org/apache/tomcat/util/http/TestCookies.java
+++ b/test/org/apache/tomcat/util/http/TestCookies.java
@@ -29,9 +29,12 @@ public class TestCookies {
 private final Cookie FOO = new Cookie("foo", "bar");
 private final Cookie FOO_EMPTY = new Cookie("foo", "");
 private final Cookie FOO_CONTROL = new Cookie("foo", "b\u00e1r");
+private final Cookie FOO_CONTROL_QUOTED = new Cookie("foo", 
"\"b\u00e1r\"");
+private final Cookie FOO_QUOTED = new Cookie("foo", "\"bar\"");
 private final Cookie BAR = new Cookie("bar", "rab");
 private final Cookie BAR_EMPTY = new Cookie("bar", "");
 private final Cookie A = new Cookie("a", "b");
+private final Cookie A_QUOTED = new Cookie("a", "\"b\"");
 private final Cookie HASH_EMPTY = new Cookie("#", "");
 private final Cookie $PORT = new Cookie("$Port", "8080");
 // RFC 2109 attributes are generally interpreted as additional cookies by
@@ -74,8 +77,13 @@ public class TestCookies {
 
 @Test
 public void testQuotedValueRfc6265() {
-test("foo=bar;a=\"b\"", FOO, A);
-test("foo=bar;a=\"b\";", FOO, A);
+test("foo=bar;a=\"b\"", FOO, A_QUOTED);
+test("foo=bar;a=\"b\";", FOO, A_QUOTED);
+}
+
+@Test
+public void testInvalidQuotedValueRfc6265() {
+test("a=\"b\"x;foo=bar", FOO);
 }
 
 @Test
@@ -109,7 +117,7 @@ public class TestCookies {
 
 @Test
 public void v1QuotedValueRfc6265() {
-test("$Version=1;foo=\"bar\";a=b; ; ", $VERSION_1, FOO, A);
+test("$Version=1;foo=\"bar\";a=b; ; ", $VERSION_1, FOO_QUOTED, A);
 }
 
 @Test
@@ -12