[GitHub] [tomcat] Only303 closed pull request #386: 9.0.x

2020-12-10 Thread GitBox


Only303 closed pull request #386:
URL: https://github.com/apache/tomcat/pull/386


   



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



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



[GitHub] [tomcat] ghusta opened a new pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


ghusta opened a new pull request #387:
URL: https://github.com/apache/tomcat/pull/387


   Error in french translation for message 'jsp.exception'
   
   _durent_ instead of _durant_



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



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



[GitHub] [tomcat] rmaucher commented on pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


rmaucher commented on pull request #387:
URL: https://github.com/apache/tomcat/pull/387#issuecomment-742383485


   I have now improved the string in poeditor. Thanks.
   
   You should do this kind of fix in poeditor rather than in a PR.



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



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



[GitHub] [tomcat] rmaucher closed pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


rmaucher closed pull request #387:
URL: https://github.com/apache/tomcat/pull/387


   



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



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



[GitHub] [tomcat] markt-asf closed pull request #386: 9.0.x

2020-12-10 Thread GitBox


markt-asf closed pull request #386:
URL: https://github.com/apache/tomcat/pull/386


   



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



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



[GitHub] [tomcat] markt-asf commented on pull request #386: 9.0.x

2020-12-10 Thread GitBox


markt-asf commented on pull request #386:
URL: https://github.com/apache/tomcat/pull/386#issuecomment-742392924


   User blocked for repeatedly opening and closing PR.



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



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



[GitHub] [tomcat] ghusta commented on pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


ghusta commented on pull request #387:
URL: https://github.com/apache/tomcat/pull/387#issuecomment-742396632


   OK thanks. I didn't know poeditor.



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



-
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 pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


martin-g commented on pull request #387:
URL: https://github.com/apache/tomcat/pull/387#issuecomment-742397348


   I think we need to improve our "How to contribute" docs. Both at Tomcat 
website and here in GitHub PR templates.
   I've seen several times poeditor being mentioned here and in the mailing 
lists but never seen how to use it. 
   One can easily find https://poeditor.com/ but from there on I have no 
information how to use it and how to find Tomcat resources in it. And then once 
I find and change them then I guess I need to export them and import them in 
Git again.
   
   So, before providing this information we should not blame our contributors. 



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



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



[GitHub] [tomcat] rmaucher commented on pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


rmaucher commented on pull request #387:
URL: https://github.com/apache/tomcat/pull/387#issuecomment-742399001


   http://tomcat.apache.org/getinvolved.html -> click on "translations" and it 
looks good enough to me.



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



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



[GitHub] [tomcat] markt-asf commented on pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


markt-asf commented on pull request #387:
URL: https://github.com/apache/tomcat/pull/387#issuecomment-742405368


   I've updated that text to reflect the recent changes to escaping.



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



-
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 pull request #387: Fix typo for message 'jsp.exception' (french locale)

2020-12-10 Thread GitBox


martin-g commented on pull request #387:
URL: https://github.com/apache/tomcat/pull/387#issuecomment-742407425


   > http://tomcat.apache.org/getinvolved.html -> click on "translations" and 
it looks good enough to me.
   
   Thanks!
   I've grepped Tomcat webapps/docs for poeditor and it didn't return any hits.
   I'll read the wiki and add GH template.



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



-
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: [maven-release-plugin] prepare release 0.1.0

2020-12-10 Thread markt
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-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new cbada32  [maven-release-plugin] prepare release 0.1.0
cbada32 is described below

commit cbada3204bf9c43ca0cf481cd88c7521690b30a0
Author: Mark Thomas 
AuthorDate: Thu Dec 10 11:14:24 2020 +

[maven-release-plugin] prepare release 0.1.0
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9ac2429..7575153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  0.1.0-SNAPSHOT
+  0.1.0
  
   
 This tool is a work in progress.
@@ -97,6 +97,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
 
https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git
+0.1.0
   
 
   


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



[tomcat-jakartaee-migration] annotated tag 0.1.0 created (now 1dab4a0)

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

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


  at 1dab4a0  (tag)
 tagging cbada3204bf9c43ca0cf481cd88c7521690b30a0 (commit)
  by Mark Thomas
  on Thu Dec 10 11:14:57 2020 +

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

No new revisions were added by this update.


-
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: [maven-release-plugin] prepare for next development iteration

2020-12-10 Thread markt
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-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 5092020  [maven-release-plugin] prepare for next development iteration
5092020 is described below

commit 50920204befee848c34b259a4f50ce0c072b5b1c
Author: Mark Thomas 
AuthorDate: Thu Dec 10 11:15:02 2020 +

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

diff --git a/pom.xml b/pom.xml
index 7575153..2d65a60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  0.1.0
+  0.1.1-SNAPSHOT
  
   
 This tool is a work in progress.
@@ -97,7 +97,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
 
https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git
-0.1.0
+HEAD
   
 
   


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



svn commit: r44904 - in /dev/tomcat/jakartaee-migration: ./ v0.1.0/ v0.1.0/binaries/ v0.1.0/source/

2020-12-10 Thread markt
Author: markt
Date: Thu Dec 10 11:32:52 2020
New Revision: 44904

Log:
Upload Apache Tomcat migration tool for Jakarta EE 0.1.0 for voting

Added:
dev/tomcat/jakartaee-migration/
dev/tomcat/jakartaee-migration/v0.1.0/
dev/tomcat/jakartaee-migration/v0.1.0/binaries/

dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz
   (with props)

dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.asc

dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.sha512

dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip
   (with props)

dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip.asc

dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip.sha512
dev/tomcat/jakartaee-migration/v0.1.0/source/

dev/tomcat/jakartaee-migration/v0.1.0/source/jakartaee-migration-0.1.0-src.tar.gz
   (with props)

dev/tomcat/jakartaee-migration/v0.1.0/source/jakartaee-migration-0.1.0-src.tar.gz.asc

dev/tomcat/jakartaee-migration/v0.1.0/source/jakartaee-migration-0.1.0-src.tar.gz.sha512

dev/tomcat/jakartaee-migration/v0.1.0/source/jakartaee-migration-0.1.0-src.zip  
 (with props)

dev/tomcat/jakartaee-migration/v0.1.0/source/jakartaee-migration-0.1.0-src.zip.asc

dev/tomcat/jakartaee-migration/v0.1.0/source/jakartaee-migration-0.1.0-src.zip.sha512

Added: 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz
--
svn:mime-type = application/x-gzip

Added: 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.asc
==
--- 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.asc
 (added)
+++ 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.asc
 Thu Dec 10 11:32:52 2020
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl/SBa4ACgkQEMAcWi9g
+Weej6BAA2Disvgt+zJ3+hswZ3ueV9FRD5hW7Hrshmgv5QjQrZZkqBHGasQqCb9d4
+W5jedUiQO5ce+C6GkVU7pjOuLuexlE8adHRY/buaJZXfU6uJHjHTArsT55S+5+hh
+9CnRlt3zDpjcKXzrDtjf81n1tTte3NsFGZQmrXRHwQumtvjA5NA4aWRe+uviq7Rs
+SjYzQkb1hPXBGx24FcjheHuSJVzCKHjIfN5absRkM474QDzmRVi8e5Q10kJvCYen
+CKEr/JdoFIMpCDZTNjhwBBODu0w+vhX31PPCpiVOBj4yx24dA8aanB7ZSxjzXU5E
+o5SAVnbvfRvOXc+PWZ17ZnAJHoNLOfSA79TfEfd2q5+adn1ZHqHKFLIs32zDFgNL
+Q2D0bveKeOe+pLuByDVzczVQO9xUV6KDGQijMxIug5bxbzYCOAY0xW5lq6Dv5ruB
+ss97UVAIZhaYhLLwzjrwS67PDUkGXBn6awyiTGYLocKGPTYZjPRv1auleb9kZRae
+r9DMWCJ0nx74avM6YpLYBcxyJ5ZL6W1YRhKvuw5cFfnp+8JKktAAuFHlL84vCRt3
+MiWX0SozFLI1s0GYp+FWu5GrPLa8aPviaDgsaoJF4KKziUlKC80q7PabqqJWosee
+rp3IT/Wv0plcsGwDcSlB1LD2G9DXXQTDWJbIHZn7ivG+UU568ns=
+=gjTJ
+-END PGP SIGNATURE-

Added: 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.sha512
==
--- 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.sha512
 (added)
+++ 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.tar.gz.sha512
 Thu Dec 10 11:32:52 2020
@@ -0,0 +1 @@
+a8a36fa12860aa23c316641a4e072d7bd21302a9a1a7c1bb494b652626735c62bc663dbc9bed6d495ed8cc027c25a103cecbf6000fa8f539d4627ebd27fb3247
 *jakartaee-migration-0.1.0-bin.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip.asc
==
--- 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip.asc
 (added)
+++ 
dev/tomcat/jakartaee-migration/v0.1.0/binaries/jakartaee-migration-0.1.0-bin.zip.asc
 Thu Dec 10 11:32:52 2020
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl/SBa4ACgkQEMAcWi9g
+Wef1ExAAoA2Y7f3U0kCpAz/whOgJANvVFGNvA/RZrIgY7NdfAVcymViFkjCV3hpf
+OUt1C9uHNTZIsaazR4JK6EBxA7MY4sxXfgxwYWN4oiIJeGk5vkFSWV6bwTgFvr/y
+O4GeOpVGquMSJ92zP8qwb3569MbjQ9b3mU6wvw9lP20gwSp03FCGSlSHDZjgmIlV
+9TTVnnaAE2Ltdt8cYF

[VOTE] Apache Tomcat migration tool for Jakarta EE

2020-12-10 Thread Mark Thomas
The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
available for voting.

This is (potentially) the first release.

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

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

The tag is:
https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
cbada3204bf9c43ca0cf481cd88c7521690b30a0

The proposed 0.1.0 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-native] branch master updated: Add more information around minimum versions

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 51468b2  Add more information around minimum versions
51468b2 is described below

commit 51468b2357ae46ecd7363aa05285e5c48a0888b2
Author: Mark Thomas 
AuthorDate: Thu Dec 10 12:21:05 2020 +

Add more information around minimum versions
---
 native/srclib/VERSIONS | 35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index f6b09de..e52a291 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -1,7 +1,40 @@
+The current minimum versions are:
+- OpenSSL 1.0.2 
+- APR 1.4.3
+
 The following version of the libraries are recommended:
 
 - APR 1.7.0 or later, http://apr.apache.org
 - OpenSSL 1.1.1g or later, http://www.openssl.org
 
 Older versions should also work but are not as thoroughly tested by the Tomcat
-Native team
\ No newline at end of file
+Native team
+
+It is current anticipated that Tomcat Native releases will transition to 1.3.x
+after April 2021 when the minimum version will become OpenSSL 1.1.0 and
+APR 1.5.2.
+
+The minimum version of OpenSSL is driven by the version of OpenSSL used by
+downstream distributions.
+
+The current state of OpenSSL in Debian is:
+- OpenSSL 1.1.0l in Debian 9 (EOL in June 2022)
+- OpenSSL 1.1.1d in Debian 10
+
+And in Ubuntu:
+- OpenSSL 1.0.2g in Ubuntu 16.04 LTS (EOL in April 2021)
+- OpenSSL 1.1.1  in Ubuntu 18.04 LTS
+- OpenSSL 1.1.1f in Ubuntu 20.04 LTS
+
+
+The minimum version of APR is driven by the version of APR used by
+downstream distributions.
+
+The current state of APR in Debian is:
+- APR 1.5.2 in Debian 9 (EOL in June 2022)
+- APR 1.6.5 in Debian 10
+
+And in Ubuntu:
+- APR 1.5.2 in Ubuntu 16.04 LTS (EOL in April 2021)
+- APR 1.6.3 in Ubuntu 18.04 LTS
+- APR 1.6.5 in Ubuntu 20.04 LTS


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



[tomcat-native] branch master updated: Fix broken XML

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new eee8dc8  Fix broken XML
eee8dc8 is described below

commit eee8dc8613ff0ba267d43b8d112a84ecba52007d
Author: Mark Thomas 
AuthorDate: Thu Dec 10 12:22:07 2020 +

Fix broken XML
---
 xdocs/miscellaneous/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index d477712..920435c 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -40,7 +40,7 @@
   Enable building to continue against OpenSSL 3.x and 1.1.1. (markt)
 
 
-  64942: Expose support for Unix Domain Sockets in APR v1.6 and 
up. (minfrin)
+  64942: Expose support for Unix Domain Sockets in APR v1.6 and 
up. (minfrin)
 
   
 


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



Tomcat Native release

2020-12-10 Thread Mark Thomas
All,

With the recent OpenSSL vulnerability announcement I'm intended to
produce a Tomcat Native release that picks up the latest OpenSSL version
for the Windows binaries. I'll start on this shortly.

Mark

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



[tomcat-native] branch master updated: Update minimum recommended OpenSSL version

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new f365034  Update minimum recommended OpenSSL version
f365034 is described below

commit f36503443d92d0ec57290f2b2c9399f9c9c65c44
Author: Mark Thomas 
AuthorDate: Thu Dec 10 12:28:03 2020 +

Update minimum recommended OpenSSL version
---
 native/srclib/VERSIONS| 4 +++-
 xdocs/miscellaneous/changelog.xml | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index e52a291..3ea7339 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -5,15 +5,17 @@ The current minimum versions are:
 The following version of the libraries are recommended:
 
 - APR 1.7.0 or later, http://apr.apache.org
-- OpenSSL 1.1.1g or later, http://www.openssl.org
+- OpenSSL 1.1.1i or later, http://www.openssl.org
 
 Older versions should also work but are not as thoroughly tested by the Tomcat
 Native team
 
+
 It is current anticipated that Tomcat Native releases will transition to 1.3.x
 after April 2021 when the minimum version will become OpenSSL 1.1.0 and
 APR 1.5.2.
 
+
 The minimum version of OpenSSL is driven by the version of OpenSSL used by
 downstream distributions.
 
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 920435c..39baf28 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -42,6 +42,9 @@
 
   64942: Expose support for Unix Domain Sockets in APR v1.6 and 
up. (minfrin)
 
+
+  Update recommended OpenSSL version to 1.1.1i or later. (markt)
+
   
 
 


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



[tomcat-native] 01/02: Remove unnecessary code. Minimum APR version is 1.4.3

2020-12-10 Thread markt
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-native.git

commit ba0dc4e68b0c653c208b6b8dc75fe11b6146a3a8
Author: Mark Thomas 
AuthorDate: Thu Dec 10 13:37:15 2020 +

Remove unnecessary code. Minimum APR version is 1.4.3
---
 native/src/file.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/native/src/file.c b/native/src/file.c
index e9bd5cf..9a7acea 100644
--- a/native/src/file.c
+++ b/native/src/file.c
@@ -407,11 +407,7 @@ TCN_IMPLEMENT_CALL(jint, File, writevFull)(TCN_STDARGS, 
jlong file,
 vec[i].iov_len  = (*e)->GetArrayLength(e, ba[i]);
 vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
 }
-#if (APR_VERSION_MAJOR >= 1) && (APR_VERSION_MINOR >= 1)
 ss = apr_file_writev_full(f, vec, nvec, &written);
-#else
-ss = apr_file_writev(f, vec, nvec, &written);
-#endif
 
 for (i = 0; i < nvec; i++) {
 (*e)->ReleaseByteArrayElements(e, ba[i], (jbyte *)vec[i].iov_base,


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



[tomcat-native] 02/02: Remove unnecessary code. Minimum OpenSSL version is 1.0.2

2020-12-10 Thread markt
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-native.git

commit 0693071c0138dbabdb173f5ba960d3614d87c46b
Author: Mark Thomas 
AuthorDate: Thu Dec 10 13:39:44 2020 +

Remove unnecessary code. Minimum OpenSSL version is 1.0.2
---
 native/src/ssl.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/native/src/ssl.c b/native/src/ssl.c
index 985b61a..da5f026 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -385,11 +385,9 @@ static apr_status_t ssl_init_cleanup(void *data)
 #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
 ENGINE_cleanup();
 #endif
-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
 #ifndef OPENSSL_NO_COMP
 SSL_COMP_free_compression_methods();
 #endif
-#endif
 CRYPTO_cleanup_all_ex_data();
 #if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
 ERR_remove_thread_state(NULL);


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



[tomcat-native] branch master updated (f365034 -> 0693071)

2020-12-10 Thread markt
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-native.git.


from f365034  Update minimum recommended OpenSSL version
 new ba0dc4e  Remove unnecessary code. Minimum APR version is 1.4.3
 new 0693071  Remove unnecessary code. Minimum OpenSSL version is 1.0.2

The 2 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:
 native/src/file.c | 4 
 native/src/ssl.c  | 2 --
 2 files changed, 6 deletions(-)


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



[tomcat] branch master updated: Update deprecation as code is shared between Tomcat 10 and Tomcat Native

2020-12-10 Thread markt
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 a6b6781  Update deprecation as code is shared between Tomcat 10 and 
Tomcat Native
a6b6781 is described below

commit a6b67811ef62d475d095166c63f4d9bcab54f15b
Author: Mark Thomas 
AuthorDate: Thu Dec 10 13:53:17 2020 +

Update deprecation as code is shared between Tomcat 10 and Tomcat Native
---
 java/org/apache/tomcat/jni/Address.java   | 5 +++--
 java/org/apache/tomcat/jni/Directory.java | 5 +++--
 java/org/apache/tomcat/jni/File.java  | 5 +++--
 java/org/apache/tomcat/jni/FileInfo.java  | 5 +++--
 java/org/apache/tomcat/jni/Global.java| 5 +++--
 java/org/apache/tomcat/jni/Local.java | 5 +++--
 java/org/apache/tomcat/jni/Lock.java  | 5 +++--
 java/org/apache/tomcat/jni/Mmap.java  | 5 +++--
 java/org/apache/tomcat/jni/Multicast.java | 5 +++--
 java/org/apache/tomcat/jni/OS.java| 5 +++--
 java/org/apache/tomcat/jni/Poll.java  | 5 +++--
 java/org/apache/tomcat/jni/PoolCallback.java  | 5 +++--
 java/org/apache/tomcat/jni/Proc.java  | 5 +++--
 java/org/apache/tomcat/jni/ProcErrorCallback.java | 5 +++--
 java/org/apache/tomcat/jni/Procattr.java  | 5 +++--
 java/org/apache/tomcat/jni/Registry.java  | 5 +++--
 java/org/apache/tomcat/jni/SSLSocket.java | 5 +++--
 java/org/apache/tomcat/jni/Shm.java   | 5 +++--
 java/org/apache/tomcat/jni/Sockaddr.java  | 5 +++--
 java/org/apache/tomcat/jni/Socket.java| 5 +++--
 java/org/apache/tomcat/jni/Status.java| 5 +++--
 java/org/apache/tomcat/jni/Stdlib.java| 5 +++--
 java/org/apache/tomcat/jni/Thread.java| 5 +++--
 java/org/apache/tomcat/jni/Time.java  | 5 +++--
 java/org/apache/tomcat/jni/User.java  | 5 +++--
 25 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Address.java 
b/java/org/apache/tomcat/jni/Address.java
index cabaabc..87eba9e 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -21,8 +21,9 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
 @Deprecated
 public class Address {
diff --git a/java/org/apache/tomcat/jni/Directory.java 
b/java/org/apache/tomcat/jni/Directory.java
index 8eb6087..2b3e081 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
 @Deprecated
 public class Directory {
diff --git a/java/org/apache/tomcat/jni/File.java 
b/java/org/apache/tomcat/jni/File.java
index 9128b62..e86c282 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -24,8 +24,9 @@ import java.nio.ByteBuffer;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
 @Deprecated
 public class File {
diff --git a/java/org/apache/tomcat/jni/FileInfo.java 
b/java/org/apache/tomcat/jni/FileInfo.java
index 9eeba1a..8bd8549 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -22,8 +22,9 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  *
  * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
- *  10.1.x onwards to only those components required to provide
- *  OpenSSL integration with the NIO and NIO2 connectors.
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ 

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

2020-12-10 Thread Rémy Maucherat
On Thu, Dec 10, 2020 at 12:39 PM Mark Thomas  wrote:

> The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
> available for voting.
>
> This is (potentially) the first release.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1291/
>
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
> cbada3204bf9c43ca0cf481cd88c7521690b30a0
>
> The proposed 0.1.0 release is:
>
> [ ] -1: Broken. Do not release because...
> [X] +1: Acceptable. Go ahead and release.
>
> Very good IMO for a first release.

Rémy


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

2020-12-10 Thread Christopher Schultz

Mark,

On 12/10/20 06:39, Mark Thomas wrote:

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

This is (potentially) the first release.

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

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

The tag is:
https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
cbada3204bf9c43ca0cf481cd88c7521690b30a0

The proposed 0.1.0 release is:

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


Do we even need (a) a release and (b) a VOTE?

I once heard Ross say that there was an ASP project (Subversion?) that 
never had votes; they only had releases. That seemed to cut-down on the 
red-tape required to get things out into the world. I can't find a 
reference for that, now.


Since this is a developer tool and not a runtime library or anything 
like that, maybe we can just say "YMMV, this is available any time you 
want it"?


That said, I have no objections whatsoever with holding a vote. I am an 
unsigned "0" on the vote itself; I have not even downloaded the source 
let alone attempted to migrate a project using it.


-chris

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



[tomcat] branch master updated: Align with changes made directly in Tomcat Native

2020-12-10 Thread markt
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 c400239  Align with changes made directly in Tomcat Native
c400239 is described below

commit c400239cb17d82f8e10f12e40881293b7d2d70b9
Author: Mark Thomas 
AuthorDate: Thu Dec 10 14:00:22 2020 +

Align with changes made directly in Tomcat Native
---
 java/org/apache/tomcat/jni/Address.java | 5 +++--
 java/org/apache/tomcat/jni/Library.java | 8 
 java/org/apache/tomcat/jni/Socket.java  | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Address.java 
b/java/org/apache/tomcat/jni/Address.java
index 87eba9e..acac800 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -46,8 +46,9 @@ public class Address {
 
 /**
  * Create apr_sockaddr_t from hostname, address family, and port.
- * @param hostname The hostname or numeric address string to 
resolve/parse, or
- *   NULL to build an address that corresponds to 0.0.0.0 or ::
+ * @param hostname The hostname or numeric address string to 
resolve/parse, the
+ * path of the Unix Domain Socket, or NULL to build an 
address
+ * that corresponds to 0.0.0.0 or ::
  * @param family The address family to use, or APR_UNSPEC if the system 
should
  *   decide.
  * @param port The port number.
diff --git a/java/org/apache/tomcat/jni/Library.java 
b/java/org/apache/tomcat/jni/Library.java
index c6c1398..a9849d3 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -177,6 +177,12 @@ public final class Library {
 /* Is the O_NONBLOCK flag inherited from listening sockets?
  */
 public static boolean APR_O_NONBLOCK_INHERITED  = false;
+/* Poll operations are interruptable by apr_pollset_wakeup().
+ */
+public static boolean APR_POLLSET_WAKEABLE  = false;
+/* Support for Unix Domain Sockets.
+ */
+public static boolean APR_HAVE_UNIX = false;
 
 
 public static int APR_SIZEOF_VOIDP;
@@ -244,6 +250,8 @@ public final class Library {
 APR_CHARSET_EBCDIC  = has(18);
 APR_TCP_NODELAY_INHERITED = has(19);
 APR_O_NONBLOCK_INHERITED  = has(20);
+APR_POLLSET_WAKEABLE  = has(21);
+APR_HAVE_UNIX = has(22);
 if (APR_MAJOR_VERSION < 1) {
 throw new UnsatisfiedLinkError("Unsupported APR Version (" +
aprVersionString() + ")");
diff --git a/java/org/apache/tomcat/jni/Socket.java 
b/java/org/apache/tomcat/jni/Socket.java
index bfed4e2..6d64ec0 100644
--- a/java/org/apache/tomcat/jni/Socket.java
+++ b/java/org/apache/tomcat/jni/Socket.java
@@ -85,6 +85,7 @@ public class Socket {
 public static final int APR_UNSPEC = 0;
 public static final int APR_INET   = 1;
 public static final int APR_INET6  = 2;
+public static final int APR_UNIX   = 3;
 
 public static final int APR_PROTO_TCP  =   6; /** TCP  */
 public static final int APR_PROTO_UDP  =  17; /** UDP  */


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



Re: Tomcat Native release

2020-12-10 Thread Christopher Schultz

Mark,

On 12/10/20 07:24, Mark Thomas wrote:

With the recent OpenSSL vulnerability announcement I'm intended to
produce a Tomcat Native release that picks up the latest OpenSSL version
for the Windows binaries. I'll start on this shortly.


+1 though this is a much bigger deal for clients than for servers. And 
for servers verifying client certificates.


-chris

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



[tomcat-native] branch master updated: Update java code to align with 10.0.x

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 8d75b7a  Update java code to align with 10.0.x
8d75b7a is described below

commit 8d75b7a8f64d76eaac963ec361317d28b49c211f
Author: Mark Thomas 
AuthorDate: Thu Dec 10 14:05:43 2020 +

Update java code to align with 10.0.x
---
 java/org/apache/tomcat/jni/Address.java   | 6 ++
 java/org/apache/tomcat/jni/Directory.java | 6 ++
 java/org/apache/tomcat/jni/File.java  | 6 ++
 java/org/apache/tomcat/jni/FileInfo.java  | 6 ++
 java/org/apache/tomcat/jni/Global.java| 6 ++
 java/org/apache/tomcat/jni/Local.java | 6 ++
 java/org/apache/tomcat/jni/Lock.java  | 6 ++
 java/org/apache/tomcat/jni/Mmap.java  | 6 ++
 java/org/apache/tomcat/jni/Multicast.java | 6 ++
 java/org/apache/tomcat/jni/OS.java| 6 ++
 java/org/apache/tomcat/jni/Poll.java  | 6 ++
 java/org/apache/tomcat/jni/PoolCallback.java  | 6 ++
 java/org/apache/tomcat/jni/Proc.java  | 6 ++
 java/org/apache/tomcat/jni/ProcErrorCallback.java | 6 ++
 java/org/apache/tomcat/jni/Procattr.java  | 6 ++
 java/org/apache/tomcat/jni/Registry.java  | 6 ++
 java/org/apache/tomcat/jni/SSLSocket.java | 6 ++
 java/org/apache/tomcat/jni/Shm.java   | 6 ++
 java/org/apache/tomcat/jni/Sockaddr.java  | 6 ++
 java/org/apache/tomcat/jni/Socket.java| 6 ++
 java/org/apache/tomcat/jni/Status.java| 6 ++
 java/org/apache/tomcat/jni/Stdlib.java| 6 ++
 java/org/apache/tomcat/jni/Thread.java| 6 ++
 java/org/apache/tomcat/jni/Time.java  | 6 ++
 java/org/apache/tomcat/jni/User.java  | 6 ++
 25 files changed, 150 insertions(+)

diff --git a/java/org/apache/tomcat/jni/Address.java 
b/java/org/apache/tomcat/jni/Address.java
index 38a08f8..acac800 100644
--- a/java/org/apache/tomcat/jni/Address.java
+++ b/java/org/apache/tomcat/jni/Address.java
@@ -19,7 +19,13 @@ package org.apache.tomcat.jni;
 /** Address
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
+@Deprecated
 public class Address {
 
 public static final String APR_ANYADDR = "0.0.0.0";
diff --git a/java/org/apache/tomcat/jni/Directory.java 
b/java/org/apache/tomcat/jni/Directory.java
index 8a94972..2b3e081 100644
--- a/java/org/apache/tomcat/jni/Directory.java
+++ b/java/org/apache/tomcat/jni/Directory.java
@@ -20,7 +20,13 @@ package org.apache.tomcat.jni;
 /** Directory
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
+@Deprecated
 public class Directory {
 
 /**
diff --git a/java/org/apache/tomcat/jni/File.java 
b/java/org/apache/tomcat/jni/File.java
index 4ae5523..e86c282 100644
--- a/java/org/apache/tomcat/jni/File.java
+++ b/java/org/apache/tomcat/jni/File.java
@@ -22,7 +22,13 @@ import java.nio.ByteBuffer;
 /** File
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
+@Deprecated
 public class File {
 
 /** Open the file for reading */
diff --git a/java/org/apache/tomcat/jni/FileInfo.java 
b/java/org/apache/tomcat/jni/FileInfo.java
index 9fb6bd3..8bd8549 100644
--- a/java/org/apache/tomcat/jni/FileInfo.java
+++ b/java/org/apache/tomcat/jni/FileInfo.java
@@ -20,7 +20,13 @@ package org.apache.tomcat.jni;
 /** Fileinfo
  *
  * @author Mladen Turk
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
+@Deprecated
 public class FileInfo {
 
 /** Allocates memory and closes lingering handles in the specified pool */
diff --git a/java/org/apache/tomcat/jni/Global.java 
b/java/org/apache/tomcat/jni/Global.java
index c1d1eb5..05a85f3 100644
--- a/java/org/apache/tomcat/jni/Global.java
+++ b/java/org/apache/tomcat/jni/Global.java
@@ -20,7 

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

2020-12-10 Thread Mark Thomas
On 10/12/2020 13:58, Christopher Schultz wrote:
> Mark,
> 
> On 12/10/20 06:39, Mark Thomas wrote:
>> The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
>> available for voting.
>>
>> This is (potentially) the first release.
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/
>>
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-1291/
>>
>> The tag is:
>> https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
>> cbada3204bf9c43ca0cf481cd88c7521690b30a0
>>
>> The proposed 0.1.0 release is:
>>
>> [ ] -1: Broken. Do not release because...
>> [ ] +1: Acceptable. Go ahead and release.
> 
> Do we even need (a) a release and (b) a VOTE?

If we want a release, we MUST have a VOTE.

> I once heard Ross say that there was an ASP project (Subversion?) that
> never had votes; they only had releases. That seemed to cut-down on the
> red-tape required to get things out into the world. I can't find a
> reference for that, now.

That doesn't sound right. From memory, Subversion doesn't have votes for
new committers but PMC membership and releases require a VOTE.

> Since this is a developer tool and not a runtime library or anything
> like that, maybe we can just say "YMMV, this is available any time you
> want it"?

It could be a runtime library. One possibility is that we integrate it
into Tomcat 10 somehow so that if you try and deploy a Java EE 8 WAR it
gets automatically converted to a Jakarta EE 9 WAR.

> That said, I have no objections whatsoever with holding a vote. I am an
> unsigned "0" on the vote itself; I have not even downloaded the source
> let alone attempted to migrate a project using it.

Fair enough.

I think the naming of some of the artefacts could be improved. As this
is the first ever release I'm leaning towards cancelling / voting
against to get them fixed so all releases will (hopefully) use a
consistent naming convention rather it changing after the first release.

Mark

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



[tomcat-native] branch master updated: Another location to update OpenSSL to 1.1.1i

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 77fd0ed  Another location to update OpenSSL to 1.1.1i
77fd0ed is described below

commit 77fd0ed2eba8a25d42874a016cf816b52383871a
Author: Mark Thomas 
AuthorDate: Thu Dec 10 14:21:05 2020 +

Another location to update OpenSSL to 1.1.1i
---
 download_deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download_deps.sh b/download_deps.sh
index 6976f11..80613a6 100755
--- a/download_deps.sh
+++ b/download_deps.sh
@@ -3,7 +3,7 @@
 # Small script to get a recent openssl, with npn support
 # Will run configure and build_libs to generate the .s files
 
-SSL=openssl-1.1.1g.tar.gz
+SSL=openssl-1.1.1i.tar.gz
 APR=apr-1.7.0.tar.gz
 mkdir -p deps
 


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



[GitHub] [tomcat] rainerjung merged pull request #385: Add peerAddress to coyote request

2020-12-10 Thread GitBox


rainerjung merged pull request #385:
URL: https://github.com/apache/tomcat/pull/385


   



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



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



[tomcat] branch master updated (c400239 -> 834f356)

2020-12-10 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c400239  Align with changes made directly in Tomcat Native
 new ab1435b  Add peerAddress to coyote request
 new 2ec5803  Fix comment and changelog typos
 new 27200cf  Merge branch 'master' into peer-address
 new 834f356  Merge pull request #385 from rainerjung/peer-address

The 22791 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:
 java/org/apache/catalina/connector/Request.java|  19 ++
 .../catalina/valves/AbstractAccessLogValve.java|  60 -
 .../apache/catalina/valves/LocalStrings.properties |   1 +
 .../apache/catalina/valves/RemoteAddrValve.java|   9 +-
 .../apache/catalina/valves/RemoteCIDRValve.java|   9 +-
 .../apache/catalina/valves/RequestFilterValve.java |  30 +++
 java/org/apache/coyote/AbstractProcessor.java  |   6 +
 java/org/apache/coyote/ActionCode.java |   5 +
 java/org/apache/coyote/Constants.java  |   7 +
 java/org/apache/coyote/Request.java|   6 +
 java/org/apache/coyote/RequestInfo.java|   5 +
 java/org/apache/coyote/ajp/AjpProcessor.java   |   4 +
 .../catalina/valves/TestRequestFilterValve.java| 297 -
 webapps/docs/changelog.xml |  16 ++
 webapps/docs/config/valve.xml  |  31 ++-
 15 files changed, 358 insertions(+), 147 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: Add peerAddress to coyote request

2020-12-10 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 abb3b59  Add peerAddress to coyote request
abb3b59 is described below

commit abb3b595a2cd668d96fb23411568a57837d74306
Author: Rainer Jung 
AuthorDate: Thu Dec 10 15:40:13 2020 +0100

Add peerAddress to coyote request

It contains the IP address of the direct connection peer.
If a reverse proxy sits in front of Tomcat and the protocol
used is AJP or HTTP in combination with the RemoteIp(Valve|Filter),
the peer address might differ from the remoteAddress.
The latter then contains the address of the client in front of the
reverse proxy, not the address of the proxy itself.

Support for the peer address has been added to the
RemoteAddrValve and RemoteCIDRValve with the new attribute
"usePeerAddress". This can be used to restrict access
to Tomcat based on the reverse proxy IP address, which is especially
useful to harden access to AJP connectors.

The peer address can also be logged in the access log
using the new %{peer}a syntax.
---
 java/org/apache/catalina/connector/Request.java|  19 ++
 .../catalina/valves/AbstractAccessLogValve.java|  60 -
 .../apache/catalina/valves/LocalStrings.properties |   1 +
 .../apache/catalina/valves/RemoteAddrValve.java|   9 +-
 .../apache/catalina/valves/RemoteCIDRValve.java|   9 +-
 .../apache/catalina/valves/RequestFilterValve.java |  30 +++
 java/org/apache/coyote/AbstractProcessor.java  |   6 +
 java/org/apache/coyote/ActionCode.java |   5 +
 java/org/apache/coyote/Constants.java  |   7 +
 java/org/apache/coyote/Request.java|   6 +
 java/org/apache/coyote/RequestInfo.java|   5 +
 java/org/apache/coyote/ajp/AjpProcessor.java   |   4 +
 .../catalina/valves/TestRequestFilterValve.java| 297 -
 webapps/docs/changelog.xml |  16 ++
 webapps/docs/config/valve.xml  |  31 ++-
 15 files changed, 358 insertions(+), 147 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index cd6e343..3172a19 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -411,6 +411,12 @@ public class Request implements HttpServletRequest {
 
 
 /**
+ * Connection peer address.
+ */
+protected String peerAddr = null;
+
+
+/**
  * Remote host.
  */
 protected String remoteHost = null;
@@ -487,6 +493,7 @@ public class Request implements HttpServletRequest {
 localesParsed = false;
 secure = false;
 remoteAddr = null;
+peerAddr = null;
 remoteHost = null;
 remotePort = -1;
 localPort = -1;
@@ -1301,6 +1308,18 @@ public class Request implements HttpServletRequest {
 
 
 /**
+ * @return the connection peer IP address making this Request.
+ */
+public String getPeerAddr() {
+if (peerAddr == null) {
+coyoteRequest.action(ActionCode.REQ_PEER_ADDR_ATTRIBUTE, 
coyoteRequest);
+peerAddr = coyoteRequest.peerAddr().toString();
+}
+return peerAddr;
+}
+
+
+/**
  * @return the remote host name making this Request.
  */
 @Override
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index b204001..2f6d635 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -163,6 +163,13 @@ public abstract class AbstractAccessLogValve extends 
ValveBase implements Access
 LOCAL, REMOTE
 }
 
+/**
+ * The list of our ip address types.
+ */
+private enum RemoteAddressType {
+REMOTE, PEER
+}
+
 //-- Constructor
 public AbstractAccessLogValve() {
 super(true);
@@ -865,19 +872,50 @@ public abstract class AbstractAccessLogValve extends 
ValveBase implements Access
  * write remote IP address - %a
  */
 protected class RemoteAddrElement implements AccessLogElement, 
CachedElement {
+/**
+ * Type of address to log
+ */
+private static final String remoteAddress = "remote";
+private static final String peerAddress = "peer";
+
+private final RemoteAddressType remoteAddressType;
+
+public RemoteAddrElement() {
+remoteAddressType = RemoteAddressType.REMOTE;
+}
+
+public RemoteAddrElement(String type) {
+switch (type) {
+case remoteAddress:
+remoteAddressType = RemoteAddressType.REMOTE;
+

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

2020-12-10 Thread Rémy Maucherat
On Thu, Dec 10, 2020 at 3:13 PM Mark Thomas  wrote:

> On 10/12/2020 13:58, Christopher Schultz wrote:
> > Mark,
> >
> > On 12/10/20 06:39, Mark Thomas wrote:
> >> The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
> >> available for voting.
> >>
> >> This is (potentially) the first release.
> >>
> >> It can be obtained from:
> >>
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/
> >>
> >> The Maven staging repo is:
> >>
> https://repository.apache.org/content/repositories/orgapachetomcat-1291/
> >>
> >> The tag is:
> >> https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
> >> cbada3204bf9c43ca0cf481cd88c7521690b30a0
> >>
> >> The proposed 0.1.0 release is:
> >>
> >> [ ] -1: Broken. Do not release because...
> >> [ ] +1: Acceptable. Go ahead and release.
> >
> > Do we even need (a) a release and (b) a VOTE?
>
> If we want a release, we MUST have a VOTE.
>
> > I once heard Ross say that there was an ASP project (Subversion?) that
> > never had votes; they only had releases. That seemed to cut-down on the
> > red-tape required to get things out into the world. I can't find a
> > reference for that, now.
>
> That doesn't sound right. From memory, Subversion doesn't have votes for
> new committers but PMC membership and releases require a VOTE.
>
> > Since this is a developer tool and not a runtime library or anything
> > like that, maybe we can just say "YMMV, this is available any time you
> > want it"?
>
> It could be a runtime library. One possibility is that we integrate it
> into Tomcat 10 somehow so that if you try and deploy a Java EE 8 WAR it
> gets automatically converted to a Jakarta EE 9 WAR.
>

It sounds doable with a special folder of the host (like a legacyAppBase),
and it creates the result in the host's appBase. Like HostConfig.deployApps
simply does this first, then moves down the usual deployments. I'm not sure
that this is really useful though.

Rémy


>
> > That said, I have no objections whatsoever with holding a vote. I am an
> > unsigned "0" on the vote itself; I have not even downloaded the source
> > let alone attempted to migrate a project using it.
>
> Fair enough.
>
> I think the naming of some of the artefacts could be improved. As this
> is the first ever release I'm leaning towards cancelling / voting
> against to get them fixed so all releases will (hopefully) use a
> consistent naming convention rather it changing after the first release.
>
> Mark
>
> -
> 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

2020-12-10 Thread Romain Manni-Bucau
Le jeu. 10 déc. 2020 à 15:49, Rémy Maucherat  a écrit :

> On Thu, Dec 10, 2020 at 3:13 PM Mark Thomas  wrote:
>
> > On 10/12/2020 13:58, Christopher Schultz wrote:
> > > Mark,
> > >
> > > On 12/10/20 06:39, Mark Thomas wrote:
> > >> The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
> > >> available for voting.
> > >>
> > >> This is (potentially) the first release.
> > >>
> > >> It can be obtained from:
> > >>
> >
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/
> > >>
> > >> The Maven staging repo is:
> > >>
> > https://repository.apache.org/content/repositories/orgapachetomcat-1291/
> > >>
> > >> The tag is:
> > >> https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
> > >> cbada3204bf9c43ca0cf481cd88c7521690b30a0
> > >>
> > >> The proposed 0.1.0 release is:
> > >>
> > >> [ ] -1: Broken. Do not release because...
> > >> [ ] +1: Acceptable. Go ahead and release.
> > >
> > > Do we even need (a) a release and (b) a VOTE?
> >
> > If we want a release, we MUST have a VOTE.
> >
> > > I once heard Ross say that there was an ASP project (Subversion?) that
> > > never had votes; they only had releases. That seemed to cut-down on the
> > > red-tape required to get things out into the world. I can't find a
> > > reference for that, now.
> >
> > That doesn't sound right. From memory, Subversion doesn't have votes for
> > new committers but PMC membership and releases require a VOTE.
> >
> > > Since this is a developer tool and not a runtime library or anything
> > > like that, maybe we can just say "YMMV, this is available any time you
> > > want it"?
> >
> > It could be a runtime library. One possibility is that we integrate it
> > into Tomcat 10 somehow so that if you try and deploy a Java EE 8 WAR it
> > gets automatically converted to a Jakarta EE 9 WAR.
> >
>
> It sounds doable with a special folder of the host (like a legacyAppBase),
> and it creates the result in the host's appBase. Like HostConfig.deployApps
> simply does this first, then moves down the usual deployments. I'm not sure
> that this is really useful though.
>

Does it sound stupid to make the library a ClassFileTransformer added on
the webapp classloader? Sounds the most hurtless for users even if it will
adds a small overhead (and avoids a lot of file duplication which can be
harder to maintain at some point).


>
> Rémy
>
>
> >
> > > That said, I have no objections whatsoever with holding a vote. I am an
> > > unsigned "0" on the vote itself; I have not even downloaded the source
> > > let alone attempted to migrate a project using it.
> >
> > Fair enough.
> >
> > I think the naming of some of the artefacts could be improved. As this
> > is the first ever release I'm leaning towards cancelling / voting
> > against to get them fixed so all releases will (hopefully) use a
> > consistent naming convention rather it changing after the first release.
> >
> > Mark
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
> >
>


Re: [apache/tomcat] Run failed: Smoke Test - master (834f356)

2020-12-10 Thread Rainer Jung
Only the test on Windows fails and only TestSendFile. I don't see, how 
it is related to the latest changes. The ant output does not indicate 
what went wrong and I don't know, whether the detailed logs for the 
tests are available.


Is TestSendFile expected to sporadically fail on Windows?

Link:

https://github.com/apache/tomcat/runs/1531159824

Thanks and regards,

Rainer

Am 10.12.2020 um 15:44 schrieb rainerjung:

GitHub


[apache/tomcat] Smoke Test workflow run


  Smoke Test: Some jobs were not successful

View workflow run 

JDK8 ubuntu-latest  

*Smoke Test* / JDK8 ubuntu-latest
Succeeded in 8 minutes and 13 seconds



JDK11 ubuntu-latest 

*Smoke Test* / JDK11 ubuntu-latest
Succeeded in 10 minutes and 27 seconds



JDK14 ubuntu-latest 

*Smoke Test* / JDK14 ubuntu-latest
Succeeded in 8 minutes and 27 seconds



JDK15-ea ubuntu-latest  

*Smoke Test* / JDK15-ea ubuntu-latest
Succeeded in 9 minutes and 20 seconds



JDK8 windows-latest 

*Smoke Test* / JDK8 windows-latest
Failed in 12 minutes and 39 seconds

	annotations for Smoke Test / JDK8 windows-latest 1 



—
You are receiving this because this workflow ran on your branch.
Manage your GitHub Actions notifications 



GitHub, Inc. ・88 Colin P Kelly Jr Street ・San Francisco, CA 94107


-
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 peerAddress to coyote request

2020-12-10 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 088b8c1  Add peerAddress to coyote request
088b8c1 is described below

commit 088b8c198d84b6bfe495e1661ca192bc8d5f59e0
Author: Rainer Jung 
AuthorDate: Thu Dec 10 16:05:03 2020 +0100

Add peerAddress to coyote request

It contains the IP address of the direct connection peer.
If a reverse proxy sits in front of Tomcat and the protocol
used is AJP or HTTP in combination with the RemoteIp(Valve|Filter),
the peer address might differ from the remoteAddress.
The latter then contains the address of the client in front of the
reverse proxy, not the address of the proxy itself.

Support for the peer address has been added to the
RemoteAddrValve and RemoteCIDRValve with the new attribute
"usePeerAddress". This can be used to restrict access
to Tomcat based on the reverse proxy IP address, which is especially
useful to harden access to AJP connectors.

The peer address can also be logged in the access log
using the new %{peer}a syntax.
---
 java/org/apache/catalina/connector/Request.java|  19 ++
 .../catalina/valves/AbstractAccessLogValve.java|  60 -
 .../apache/catalina/valves/LocalStrings.properties |   1 +
 .../apache/catalina/valves/RemoteAddrValve.java|   8 +-
 .../apache/catalina/valves/RemoteCIDRValve.java|   8 +-
 .../apache/catalina/valves/RequestFilterValve.java |  30 +++
 java/org/apache/coyote/AbstractProcessor.java  |   6 +
 java/org/apache/coyote/ActionCode.java |   5 +
 java/org/apache/coyote/Constants.java  |   7 +
 java/org/apache/coyote/Request.java|   6 +
 java/org/apache/coyote/RequestInfo.java|   5 +
 java/org/apache/coyote/ajp/AjpProcessor.java   |   4 +
 .../catalina/valves/TestRequestFilterValve.java| 297 -
 webapps/docs/changelog.xml |  16 ++
 webapps/docs/config/valve.xml  |  31 ++-
 15 files changed, 358 insertions(+), 145 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index dcf6c7f..3ffaabf 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -403,6 +403,12 @@ public class Request implements HttpServletRequest {
 
 
 /**
+ * Connection peer address.
+ */
+protected String peerAddr = null;
+
+
+/**
  * Remote host.
  */
 protected String remoteHost = null;
@@ -479,6 +485,7 @@ public class Request implements HttpServletRequest {
 localesParsed = false;
 secure = false;
 remoteAddr = null;
+peerAddr = null;
 remoteHost = null;
 remotePort = -1;
 localPort = -1;
@@ -1309,6 +1316,18 @@ public class Request implements HttpServletRequest {
 
 
 /**
+ * @return the connection peer IP address making this Request.
+ */
+public String getPeerAddr() {
+if (peerAddr == null) {
+coyoteRequest.action(ActionCode.REQ_PEER_ADDR_ATTRIBUTE, 
coyoteRequest);
+peerAddr = coyoteRequest.peerAddr().toString();
+}
+return peerAddr;
+}
+
+
+/**
  * @return the remote host name making this Request.
  */
 @Override
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java 
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 41c799c..10c0798 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -163,6 +163,13 @@ public abstract class AbstractAccessLogValve extends 
ValveBase implements Access
 LOCAL, REMOTE
 }
 
+/**
+ * The list of our ip address types.
+ */
+private enum RemoteAddressType {
+REMOTE, PEER
+}
+
 //-- Constructor
 public AbstractAccessLogValve() {
 super(true);
@@ -876,19 +883,50 @@ public abstract class AbstractAccessLogValve extends 
ValveBase implements Access
  * write remote IP address - %a
  */
 protected class RemoteAddrElement implements AccessLogElement, 
CachedElement {
+/**
+ * Type of address to log
+ */
+private static final String remoteAddress = "remote";
+private static final String peerAddress = "peer";
+
+private final RemoteAddressType remoteAddressType;
+
+public RemoteAddrElement() {
+remoteAddressType = RemoteAddressType.REMOTE;
+}
+
+public RemoteAddrElement(String type) {
+switch (type) {
+case remoteAddress:
+remoteAddressType = RemoteAddressType.REMOTE;
+

[Bug 64974] New: Tomcat losing HTTP pipeline requests is asking for available bytes

2020-12-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64974

Bug ID: 64974
   Summary: Tomcat losing HTTP pipeline requests is asking for
available bytes
   Product: Tomcat 9
   Version: 9.0.38
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: cy6erg...@gmail.com
  Target Milestone: -

Created attachment 37599
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37599&action=edit
Just before the fill will discard requests (in debugger)

Starting from 9.0.39 Tomcat server does lose pipelined HTTP requests.

The scenario is the following:

1. A client connects and send a single packet of two HTTP requests
2. The server accepts connection, reads the bytes, parses the first request,
does aux tasks, and notifies a servlet by calling the service method. At this
point, Http1InputBuffer contains both requests, but the first is processed, so
the position points to the beginning of the second request (that is not yet
processed/parsed).
3. The called servlet does start async, start a new thread, and then does setup
read listener.
4. setReadListener function invocation leads to the following call chain:
setReadListener -> CoyoteInputStream.setReadListener ->
InputBuffer.setReadListener -> InputBuffer.isReady -> Request.action
(NB_READ_INTEREST) -> AbstractProcessor.action ->
AbstractProcessor.isReadyForRead -> Http11Processor.available ->
Http11InputBufer.available -> Http11InputBuffer.fill

The fill function checks for the "parsingHeader" flag and goes to the
alternative branch. The byte buffer still contains both requests, and the
position is pointing to the beginning of the second request. However, the
alternative branch does change both position and limit to the same value losing
the right end position. After that, the fill function does several preparation
and invokes socket.read that overwrites the second request or read nothing but
the second request is lost forever because the end position was lost.

See the attached screenshot of this moment. 

It looks like the code lading to the issue was there for a long time, but due
to some changes in 9.0.39, it started to happen. But for sure, the fill
function shouldn't simply discard the limit position but should append bytes
after the limit regardless of the "end" value that points to the last parsed
request that is not correct.

-- 
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 64974] Tomcat losing HTTP pipeline requests if asking for available bytes

2020-12-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64974

Sergey Mashkov  changed:

   What|Removed |Added

Summary|Tomcat losing HTTP pipeline |Tomcat losing HTTP pipeline
   |requests is asking for  |requests if asking for
   |available bytes |available bytes

-- 
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 64974] Tomcat losing HTTP pipeline requests if asking for available bytes

2020-12-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64974

--- Comment #1 from Remy Maucherat  ---
What is the point trying to find edge cases ? You have no content for these
kind of requests, so it is never going to do anything useful.

-- 
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: [VOTE] Apache Tomcat migration tool for Jakarta EE

2020-12-10 Thread Mark Thomas
On 10/12/2020 14:52, Romain Manni-Bucau wrote:
> Le jeu. 10 déc. 2020 à 15:49, Rémy Maucherat  a écrit :
>> On Thu, Dec 10, 2020 at 3:13 PM Mark Thomas  wrote:
>>> On 10/12/2020 13:58, Christopher Schultz wrote:



 Since this is a developer tool and not a runtime library or anything
 like that, maybe we can just say "YMMV, this is available any time you
 want it"?
>>>
>>> It could be a runtime library. One possibility is that we integrate it
>>> into Tomcat 10 somehow so that if you try and deploy a Java EE 8 WAR it
>>> gets automatically converted to a Jakarta EE 9 WAR.
>>>
>>
>> It sounds doable with a special folder of the host (like a legacyAppBase),
>> and it creates the result in the host's appBase. Like HostConfig.deployApps
>> simply does this first, then moves down the usual deployments. I'm not sure
>> that this is really useful though.
>>
> 
> Does it sound stupid to make the library a ClassFileTransformer added on
> the webapp classloader? Sounds the most hurtless for users even if it will
> adds a small overhead (and avoids a lot of file duplication which can be
> harder to maintain at some point).

It doesn't sound stupid at all. It was one of the options considered
when we first started thinking about this. That was before we had the
current implementation. With the experience of what the current
implementation looks like we might want to revisit that discussion.

My own thinking was to convert appBase/javaee.war to
appBase/javaee##converted.war and let the parallel deployment code take
care of deploying just the updated version.

Doing conversion on the fly or at deployment/start-up time raises
various issues that boil down to "How do we detect if conversion is
required?" and "What are the performance impacts of doing so?". There
are users who want to squeeze every last drop of performance out of the
system so I think that leads to some sort of configuration option.

Just thinking about that I thought of:
- watch what classes are requested
- as soon as javax.servlet.* (or one of the others is detected) stop the
  context, enable conversion and restart the context

Then I thought that apps might try to determine if they are running on
Java EE or Jakarta EE by trying to load classes. That could incorrectly
trigger the conversion.

Hmm. Anything apart from an explicitly user set flag starts to look
potentially tricky for some use cases.

Thoughts?

Mark


-
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

2020-12-10 Thread Romain Manni-Bucau
Le jeu. 10 déc. 2020 à 17:14, Mark Thomas  a écrit :

> On 10/12/2020 14:52, Romain Manni-Bucau wrote:
> > Le jeu. 10 déc. 2020 à 15:49, Rémy Maucherat  a écrit :
> >> On Thu, Dec 10, 2020 at 3:13 PM Mark Thomas  wrote:
> >>> On 10/12/2020 13:58, Christopher Schultz wrote:
>
> 
>
>  Since this is a developer tool and not a runtime library or anything
>  like that, maybe we can just say "YMMV, this is available any time you
>  want it"?
> >>>
> >>> It could be a runtime library. One possibility is that we integrate it
> >>> into Tomcat 10 somehow so that if you try and deploy a Java EE 8 WAR it
> >>> gets automatically converted to a Jakarta EE 9 WAR.
> >>>
> >>
> >> It sounds doable with a special folder of the host (like a
> legacyAppBase),
> >> and it creates the result in the host's appBase. Like
> HostConfig.deployApps
> >> simply does this first, then moves down the usual deployments. I'm not
> sure
> >> that this is really useful though.
> >>
> >
> > Does it sound stupid to make the library a ClassFileTransformer added on
> > the webapp classloader? Sounds the most hurtless for users even if it
> will
> > adds a small overhead (and avoids a lot of file duplication which can be
> > harder to maintain at some point).
>
> It doesn't sound stupid at all. It was one of the options considered
> when we first started thinking about this. That was before we had the
> current implementation. With the experience of what the current
> implementation looks like we might want to revisit that discussion.
>
> My own thinking was to convert appBase/javaee.war to
> appBase/javaee##converted.war and let the parallel deployment code take
> care of deploying just the updated version.
>

Hmm, there are env the parallel deployment has pitfalls and it assumes the
not converted app would work no?


>
> Doing conversion on the fly or at deployment/start-up time raises
> various issues that boil down to "How do we detect if conversion is
> required?" and "What are the performance impacts of doing so?". There
> are users who want to squeeze every last drop of performance out of the
> system so I think that leads to some sort of configuration option.
>

Using a transformer it can be configured in context.xml so sounds "easy"
(requires to move to static constant to field instances but nothing crazy).
In terms of performances it is acceptable for such apps - don't forget we
often add javaagents doing potentially worse + JPA adds a transformer
already visiting all classes most of the time. That said a config with some
jar exclusions would be welcomed to only include a few jars.


>
> Just thinking about that I thought of:
> - watch what classes are requested
> - as soon as javax.servlet.* (or one of the others is detected) stop the
>   context, enable conversion and restart the context


> Then I thought that apps might try to determine if they are running on
> Java EE or Jakarta EE by trying to load classes. That could incorrectly
> trigger the conversion.
>
> Hmm. Anything apart from an explicitly user set flag starts to look
> potentially tricky for some use cases.
>
> Thoughts?
>

That's why the transformer looked handy from my window: it is configurable
and easy - we must keep in mind these cases will be rare, the move to
jakarta is not for tomorrow IMHO and when it will come it will be all at
once per spec or not.


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


[Bug 64974] Tomcat losing HTTP pipeline requests if asking for available bytes

2020-12-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64974

--- Comment #2 from Sergey Mashkov  ---
I don't see the point. " You have no content for these kind of requests" -
there are two valid requests. Two valid requests should produce two responses.
Or we should drop the connection after processing the first of them. Silent
discarding any of them leads to breaking HTTP pipeline and all upcoming
requests will have wrong responses.

-- 
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 64974] Tomcat losing HTTP pipeline requests if asking for available bytes

2020-12-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64974

--- Comment #3 from Sergey Mashkov  ---
There is no such restriction to send requests separately. A client may send
requests at any time and shouldn't wait for responses before sending the next:
this is the idea of HTTP pipelining. Also, TCP fragmentation/defragmentation is
out of our control. Therefore, two requests in two network packets could be
merged into a single one at some point on the way to the 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



[tomcat-native] branch master updated: Estimate 1.2.26 release date as 18 Dec 2020

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 846aeca  Estimate 1.2.26 release date as 18 Dec 2020
846aeca is described below

commit 846aeca8b609a46f5ba7e26d4de9892f8483e220
Author: Mark Thomas 
AuthorDate: Thu Dec 10 16:54:29 2020 +

Estimate 1.2.26 release date as 18 Dec 2020
---
 xdocs/index.xml | 4 ++--
 xdocs/news/2020.xml | 5 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/xdocs/index.xml b/xdocs/index.xml
index 9844af2..32d0d91 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,10 +60,10 @@
 
 
 
-3 Sep 2020 - TC-Native-1.2.25
+18 Dec 2020 - TC-Native-1.2.26
 released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.25 Stable.
+Tomcat Native 1.2.26 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.
diff --git a/xdocs/news/2020.xml b/xdocs/news/2020.xml
index 900d3ee..cf1ce79 100644
--- a/xdocs/news/2020.xml
+++ b/xdocs/news/2020.xml
@@ -29,6 +29,11 @@
 
 
 
+ 
+  The Apache Tomcat team is proud to announce the immediate availability of
+  Tomcat Native 1.2.25. This is a bugfix release.
+  
+ 
  
   The Apache Tomcat team is proud to announce the immediate availability of
   Tomcat Native 1.2.25. This is a bugfix release.


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



[tomcat-native] branch master updated: Need to deprecate the examples as well

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 74acf43  Need to deprecate the examples as well
74acf43 is described below

commit 74acf43d608504a7f0cf51181977bc277fed3607
Author: Mark Thomas 
AuthorDate: Thu Dec 10 17:04:18 2020 +

Need to deprecate the examples as well
---
 examples/org/apache/tomcat/jni/Echo.java| 10 --
 examples/org/apache/tomcat/jni/LocalServer.java | 10 --
 examples/org/apache/tomcat/jni/SSLServer.java   | 10 --
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/examples/org/apache/tomcat/jni/Echo.java 
b/examples/org/apache/tomcat/jni/Echo.java
index 1c84d31..0a49608 100644
--- a/examples/org/apache/tomcat/jni/Echo.java
+++ b/examples/org/apache/tomcat/jni/Echo.java
@@ -20,9 +20,15 @@ package org.apache.tomcat.jni;
 import java.io.InputStream;
 import java.util.Properties;
 
-/** Echo server example
+/**
+ * Echo server example
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
-
+@Deprecated
 public class Echo {
 
 public static String echoEcho = null;
diff --git a/examples/org/apache/tomcat/jni/LocalServer.java 
b/examples/org/apache/tomcat/jni/LocalServer.java
index ec84993..eb2bf4e 100644
--- a/examples/org/apache/tomcat/jni/LocalServer.java
+++ b/examples/org/apache/tomcat/jni/LocalServer.java
@@ -19,9 +19,15 @@ package org.apache.tomcat.jni;
 import java.io.InputStream;
 import java.util.Properties;
 
-/** Local Socket server example
+/**
+ * Local Socket server example
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
-
+@Deprecated
 public class LocalServer {
 
 public static String serverAddr = null;
diff --git a/examples/org/apache/tomcat/jni/SSLServer.java 
b/examples/org/apache/tomcat/jni/SSLServer.java
index cb91f1c..677a744 100644
--- a/examples/org/apache/tomcat/jni/SSLServer.java
+++ b/examples/org/apache/tomcat/jni/SSLServer.java
@@ -19,9 +19,15 @@ package org.apache.tomcat.jni;
 import java.io.InputStream;
 import java.util.Properties;
 
-/** SSL Server server example
+/**
+ * SSL Server server example
+ *
+ * @deprecated  The scope of the APR/Native Library will be reduced in Tomcat
+ *  10.1.x / Tomcat Native 2.x onwards to only include those
+ *  components required to provide OpenSSL integration with the NIO
+ *  and NIO2 connectors.
  */
-
+@Deprecated
 public class SSLServer {
 
 public static String serverAddr = null;


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



[tomcat-native] 01/01: Tag 1.2.26

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

markt pushed a commit to tag 1.2.26
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 64fafd13032afb34690e3c3343b6f614f04b2660
Author: Mark Thomas 
AuthorDate: Thu Dec 10 17:09:19 2020 +

Tag 1.2.26
---
 build.properties.default | 2 +-
 native/include/tcn_version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 80be4ff..d6522ec 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
 version.minor=2
 version.build=26
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 1399d6f..92df783 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */


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



[tomcat-native] tag 1.2.26 created (now 64fafd1)

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

markt pushed a change to tag 1.2.26
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git.


  at 64fafd1  (commit)
This tag includes the following new commits:

 new 64fafd1  Tag 1.2.26

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



svn commit: r44912 - in /dev/tomcat/tomcat-connectors/native/1.2.26: ./ binaries/ source/

2020-12-10 Thread markt
Author: markt
Date: Thu Dec 10 20:46:13 2020
New Revision: 44912

Log:
Upload Tomcat Native 1.2.26 for voting

Added:
dev/tomcat/tomcat-connectors/native/1.2.26/
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/

dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.sha512

dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-win32-bin.zip.sha512
dev/tomcat/tomcat-connectors/native/1.2.26/source/

dev/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-src.tar.gz
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-src.tar.gz.asc

dev/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-src.tar.gz.sha512

dev/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-win32-src.zip
   (with props)

dev/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-win32-src.zip.asc

dev/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-win32-src.zip.sha512

Added: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.asc
 Thu Dec 10 20:46:13 2020
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl/SejsACgkQEMAcWi9g
+WecCfhAAnRXHqOG8+JHOUM+Gx14kCKXXM0zNQeGqvjA8bnwUyD/teTx+ZDFoLzgS
+1TIgwSaE3MySiVTzd+D4SFt0Bexn+6Azld+FLT21t9VCuhM6p6KbVkiZx2zamDDK
+tsHwNuS9jpY+p8+9NoXT8v5w+hWFDdTOwmLT6hmZxP60K5G8mJ32DmEwoj8nUcHv
+eWBiIpTVAa8m4OXI14K3xq/ixB6IkoIHChlq//GjCdNbh1GNA3+ZF6AoeChNqjxw
+kDCjPpEgQ/qBIIg2vVL8K3sBV1yfJ54Mv+FlUekzraU/9jljzMBt+u6M6sCCIrAc
+k41Pp9QOAidAEYKOah8vXGNnykQZZwVFaY1rwLnFB7LtFukXWI5zEsb+Viyx1r+Q
+F1Wtb4xnZZ5hX5onSvJNLVoNGY9VlffYHMf/seXPvxpX1rQIH4ncBZnkfnC5n1eL
+mDZG1EeOOJ7GT9Q+fjvZMfTjrQgRCJf8cNLeHQhYApjLGr74ddQ8Ry1JNj7YBXtP
+RzCI0cNmORKjfF6Is6AQ8e+Mb6zxZREqdXQD6EgIOSno3uN8OlEbvx6sdqTsOw4f
+rszNKqPLf5O22puTnjF8fOP01zUoSDxluuQB02nzzGGsoBJFYKks197vq96mTNzm
+19JZJ4vgfVw54RLet4XIf7xc+tccClE38TpSs9bomN7SisuwTwA=
+=wBOT
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip.sha512
 Thu Dec 10 20:46:13 2020
@@ -0,0 +1 @@
+c1df1c3f76bc69e38afc591d3aae9695ea634ba1608bdef2466c413f79a7e6138a2f53e2ecf8390820b5ed40699749da2229171b2147aff79aa94d60a999423f
 *tomcat-native-1.2.26-openssl-1.1.1i-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1i-win32-bin.zip
--
svn:mime-typ

[VOTE] Release Apache Tomcat Native 1.2.26

2020-12-10 Thread Mark Thomas
Version 1.2.26 includes the following changes compared to 1.2.25

- Windows binaries built using 1.1.1i

- BZ 64942 - expose support for unix domain sockets

Various other fixes and improvements. See the changelog for details.

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.26 release is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.26
[2]
https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=64fafd13032afb34690e3c3343b6f614f04b2660

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



[tomcat-native] branch master updated: Increment version to 1.2.27 for next development cycle

2020-12-10 Thread markt
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-native.git


The following commit(s) were added to refs/heads/master by this push:
 new adf5080  Increment version to 1.2.27 for next development cycle
adf5080 is described below

commit adf5080eb2dc7ccf130e54e03927fc9672a1ddc9
Author: Mark Thomas 
AuthorDate: Thu Dec 10 21:15:19 2020 +

Increment version to 1.2.27 for next development cycle
---
 build.properties.default  | 2 +-
 native/include/tcn_version.h  | 2 +-
 native/os/win32/libtcnative.rc| 6 +++---
 xdocs/miscellaneous/changelog.xml | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 80be4ff..d8fcdcc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
 # - Version Control Flags -
 version.major=1
 version.minor=2
-version.build=26
+version.build=27
 version.patch=0
 version.suffix=-dev
 
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 1399d6f..3f14a15 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
 #define TCN_MINOR_VERSION   2
 
 /** patch level */
-#define TCN_PATCH_VERSION   26
+#define TCN_PATCH_VERSION   27
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index e95ded6..8c26f6d 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
  "See the License for the specific language governing " \
  "permissions and limitations under the License."
 
-#define TCN_VERSION "1.2.26"
+#define TCN_VERSION "1.2.27"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,2,26,0
- PRODUCTVERSION 1,2,26,0
+ FILEVERSION 1,2,27,0
+ PRODUCTVERSION 1,2,27,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 39baf28..5a4379f 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -34,6 +34,8 @@
   This is the Changelog for Tomcat Native 1.2.
   
 
+
+
 
   
 


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



RE: Setting up Eclipse IDE on Windows using separate CATALINA_BASE

2020-12-10 Thread jonmcalexander
I appreciate these links, but I'm getting no joy from it as it's not working 
for me. I point eclipse to my instance and don't get Finish. I point it to the 
symbolic link which points to the c:\program files location, and I get finish, 
but I can't do anything with it. It shows localhost, but I can't click next or 
finish. Isn't there somewhere in eclipse that I can tell it CATALINA_HOME is 
here and CATALINA_BASE is there and it reads In the configurations?

Thanks,

Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com

Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020, 11/27/2020, 
12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020, 12/29/2020, 
12/30/2020, 12/31/2020
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.

> -Original Message-
> From: Konstantin Kolinko 
> Sent: Wednesday, December 9, 2020 5:16 PM
> To: Tomcat Developers List 
> Subject: Re: Setting up Eclipse IDE on Windows using separate
> CATALINA_BASE
> 
> чт, 10 дек. 2020 г. в 02:03, :
> >
> > I'm reaching out to the experts that I know of. Does anyone have a process
> for successfully configuring Eclipse IDE on Windows 10 to use Apache Tomcat
> that has a separate CATALINA_BASE from the CATALINA_HOME (Binaries)?
> 
> See the FAQ:
> https://cwiki.apache.org/confluence/display/TOMCAT/Developing
> 
> HTH
> 
> -
> 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] Apache Tomcat migration tool for Jakarta EE

2020-12-10 Thread Emmanuel Bourg
Le 10/12/2020 à 12:39, Mark Thomas a écrit :

> The proposed 0.1.0 release is:
> 
> [ ] -1: Broken. Do not release because...
> [X] +1: Acceptable. Go ahead and release.

Emmanuel Bourg

-
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

2020-12-10 Thread Igal Sapir
On Thu, Dec 10, 2020 at 5:58 AM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> Mark,
>
> On 12/10/20 06:39, Mark Thomas wrote:
> > The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
> > available for voting.
> >
> > This is (potentially) the first release.
> >
> > It can be obtained from:
> >
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/
> >
> > The Maven staging repo is:
> > https://repository.apache.org/content/repositories/orgapachetomcat-1291/
> >
> > The tag is:
> > https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
> > cbada3204bf9c43ca0cf481cd88c7521690b30a0
> >
> > The proposed 0.1.0 release is:
> >
> > [ ] -1: Broken. Do not release because...
> > [ ] +1: Acceptable. Go ahead and release.
>
> Do we even need (a) a release and (b) a VOTE?
>
> I once heard Ross say that there was an ASP project (Subversion?) that
> never had votes; they only had releases. That seemed to cut-down on the
> red-tape required to get things out into the world. I can't find a
> reference for that, now.
>
> Since this is a developer tool and not a runtime library or anything
> like that, maybe we can just say "YMMV, this is available any time you
> want it"?
>
> That said, I have no objections whatsoever with holding a vote. I am an
> unsigned "0" on the vote itself; I have not even downloaded the source
> let alone attempted to migrate a project using it.
>

I'm a +0 on this one.  Like Chris, I also did not even download nor tested
that tool.

Did we use that tool to migrate the Tomcat examples?  Were they all
migrated successfully?

Igal



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


Re: [VOTE] Release Apache Tomcat Native 1.2.26

2020-12-10 Thread Igal Sapir
On Thu, Dec 10, 2020 at 1:10 PM Mark Thomas  wrote:

> Version 1.2.26 includes the following changes compared to 1.2.25
>
> - Windows binaries built using 1.1.1i
>
> - BZ 64942 - expose support for unix domain sockets
>
> Various other fixes and improvements. See the changelog for details.
>
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
>
> The Apache Tomcat Native 1.2.26 release is
>  [X] Stable, go ahead and release
>

Tested with Tomcat 9.0.41 and Java 13.0.4 on Ubuntu 20.04

Best,

Igal



>  [ ] Broken because of ...
>
> Thanks,
>
> Mark
>
>
> [1]
>
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.26
> [2]
>
> https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=64fafd13032afb34690e3c3343b6f614f04b2660
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


[Bug 64830] HTTP2 : GOAWAY sent with Protocol Error and Frame Size Error

2020-12-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64830

Arshiya  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #18 from Arshiya  ---
Hi Mark , 
I tried running the same test program with the latest tomcat 9.0.41 jars on
windows machine .

1.)I am still able to see the incomplete payload related exceptions and GOAWAY
(PROTOCOL_ERROR and FRAME_SIZE_ERROR) .

The test (payload size 55KB) ran for about 8 minutes where few requests had
timed-out (could see in JMeter GUI). On filtering the requests in the PCAP
captured with the unique identifier , I was able to find the trace for 3
requests with the below reason for GOAWAY (GOAWAY.pcap attached) 
 *) FRAME_SIZE_ERROR:The payload is [2128653] bytes long but the maximum frame
size is [16384]
 *) PROTOCOL_ERROR  :Connection [7004], Stream [1], The content length header
value [56,465] does not agree with the size of the data received [56,466]
 *) PROTOCOL_ERROR  :Connection [7092], Stream [1], The content length header
value [56,466] does not agree with the size of the data received [56,466]


Specs:
Windows 10 
Processor:Intel(R) Core(TM) i5-8350U CPU @ 1.70GHz 1.90GHz
RAM:16 GB
System Type : 64 bit

Please let me know in case of further inputs.
Thanks in advance!

-- 
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 64830] HTTP2 : GOAWAY sent with Protocol Error and Frame Size Error

2020-12-10 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64830

--- Comment #19 from Arshiya  ---
Created attachment 37600
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37600&action=edit
PCAP with Goaway

-- 
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: [VOTE] Apache Tomcat migration tool for Jakarta EE

2020-12-10 Thread Martin Grigorov
On Thu, Dec 10, 2020 at 11:50 PM Igal Sapir  wrote:

> On Thu, Dec 10, 2020 at 5:58 AM Christopher Schultz <
> ch...@christopherschultz.net> wrote:
>
> > Mark,
> >
> > On 12/10/20 06:39, Mark Thomas wrote:
> > > The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
> > > available for voting.
> > >
> > > This is (potentially) the first release.
> > >
> > > It can be obtained from:
> > >
> >
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/
> > >
> > > The Maven staging repo is:
> > >
> https://repository.apache.org/content/repositories/orgapachetomcat-1291/
> > >
> > > The tag is:
> > > https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
> > > cbada3204bf9c43ca0cf481cd88c7521690b30a0
> > >
> > > The proposed 0.1.0 release is:
> > >
> > > [ ] -1: Broken. Do not release because...
> > > [ ] +1: Acceptable. Go ahead and release.
> >
> > Do we even need (a) a release and (b) a VOTE?
> >
> > I once heard Ross say that there was an ASP project (Subversion?) that
> > never had votes; they only had releases. That seemed to cut-down on the
> > red-tape required to get things out into the world. I can't find a
> > reference for that, now.
> >
> > Since this is a developer tool and not a runtime library or anything
> > like that, maybe we can just say "YMMV, this is available any time you
> > want it"?
> >
> > That said, I have no objections whatsoever with holding a vote. I am an
> > unsigned "0" on the vote itself; I have not even downloaded the source
> > let alone attempted to migrate a project using it.
> >
>
> I'm a +0 on this one.  Like Chris, I also did not even download nor tested
> that tool.
>
> Did we use that tool to migrate the Tomcat examples?  Were they all
> migrated successfully?
>

No. The examples were migrated manually, i.e. their source code was
migrated.
The tool migrates binary files (.war,.jar, .class). It is useful when your
application depends on third party libraries which still use javax.**

Martin


>
> Igal
>
>
>
> >
> > -chris
> >
> > -
> > 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: Make migrate.sh usable from any directory

2020-12-10 Thread mgrigorov
This is an automated email from the ASF dual-hosted git repository.

mgrigorov 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 000c876  Make migrate.sh usable from any directory
000c876 is described below

commit 000c876ea3a1e700df2fffef70b29d9c3a9dfef2
Author: Martin Tzvetanov Grigorov 
AuthorDate: Fri Dec 11 09:22:22 2020 +0200

Make migrate.sh usable from any directory

Until now one has to `cd` to the bin/ folder to be able to execute 
migrate.sh, otherwise lib/ folder won't be found
---
 src/main/scripts/migrate.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/scripts/migrate.sh b/src/main/scripts/migrate.sh
index c2b941c..3d3f34c 100755
--- a/src/main/scripts/migrate.sh
+++ b/src/main/scripts/migrate.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
 
+BIN_FOLDER=`dirname $PWD/$0`
+
 # Assumes java is on the path
-java -cp "../lib/*" org.apache.tomcat.jakartaee.MigrationCLI "$@"
+java -cp "$BIN_FOLDER/../lib/*" org.apache.tomcat.jakartaee.MigrationCLI "$@"


-
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

2020-12-10 Thread Martin Grigorov
On Thu, Dec 10, 2020 at 1:39 PM Mark Thomas  wrote:

> The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
> available for voting.
>
> This is (potentially) the first release.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1291/
>
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
> cbada3204bf9c43ca0cf481cd88c7521690b30a0
>
> The proposed 0.1.0 release is:
>
> [ ] -1: Broken. Do not release because...
> [ X ] +1: Acceptable. Go ahead and release.
>

Regards,
Martin


>
> Thanks,
>
> Mark
>
> -
> 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

2020-12-10 Thread Mark Thomas
On 11/12/2020 06:58, Martin Grigorov wrote:
> On Thu, Dec 10, 2020 at 11:50 PM Igal Sapir  wrote:
> 
>> On Thu, Dec 10, 2020 at 5:58 AM Christopher Schultz <
>> ch...@christopherschultz.net> wrote:
>>
>>> Mark,
>>>
>>> On 12/10/20 06:39, Mark Thomas wrote:
 The proposed Apache Tomcat migration tool for Jakarta EE 0.1.0 is now
 available for voting.

 This is (potentially) the first release.

 It can be obtained from:

>>>
>> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.1.0/

 The Maven staging repo is:

>> https://repository.apache.org/content/repositories/orgapachetomcat-1291/

 The tag is:
 https://github.com/apache/tomcat-jakartaee-migration/tree/0.1.0
 cbada3204bf9c43ca0cf481cd88c7521690b30a0

 The proposed 0.1.0 release is:

 [ ] -1: Broken. Do not release because...
 [ ] +1: Acceptable. Go ahead and release.
>>>
>>> Do we even need (a) a release and (b) a VOTE?
>>>
>>> I once heard Ross say that there was an ASP project (Subversion?) that
>>> never had votes; they only had releases. That seemed to cut-down on the
>>> red-tape required to get things out into the world. I can't find a
>>> reference for that, now.
>>>
>>> Since this is a developer tool and not a runtime library or anything
>>> like that, maybe we can just say "YMMV, this is available any time you
>>> want it"?
>>>
>>> That said, I have no objections whatsoever with holding a vote. I am an
>>> unsigned "0" on the vote itself; I have not even downloaded the source
>>> let alone attempted to migrate a project using it.
>>>
>>
>> I'm a +0 on this one.  Like Chris, I also did not even download nor tested
>> that tool.
>>
>> Did we use that tool to migrate the Tomcat examples?  Were they all
>> migrated successfully?
>>
> 
> No. The examples were migrated manually, i.e. their source code was
> migrated.
> The tool migrates binary files (.war,.jar, .class). It is useful when your
> application depends on third party libraries which still use javax.**

Martin is correct, the examples were migrated using a package rename in
the IDE.

The JSTL JARs (used by the examples webapp) were migrated with this tool.

Mark

-
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 a change in pull request #382: Add support for unix domain sockets.

2020-12-10 Thread GitBox


martin-g commented on a change in pull request #382:
URL: https://github.com/apache/tomcat/pull/382#discussion_r540754092



##
File path: webapps/docs/config/http.xml
##
@@ -208,6 +208,24 @@
   The default is POST
 
 
+

Review comment:
   At the moment the `port` parameter is mandatory, i.e. if `path` is 
specified then both TCP and UDS will be exposed.
   I guess there will be users which will want to enable **only** UDS.
   Do you think this is reasonable and we should make it possible to disable 
TCP in case UDS is enabled ?





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



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