date:20210909

Author: markt
Date: Fri Sep 10 06:18:15 2021
New Revision: 49863

Log:
Release Apache Tomcat 10.0.11

Added:
release/tomcat/tomcat-10/v10.0.11/
  - copied from r49862, dev/tomcat/tomcat-10/v10.0.11/
Removed:
dev/tomcat/tomcat-10/v10.0.11/


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

Re: [VOTE][RESULT] Release Apache Tomcat 10.0.11

2021-09-09 Thread Mark Thomas


The following votes were cast:

Binding:
+1: markt, remm, isapir, mgrigorov

No other votes were cast.
The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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

svn commit: r49862 - /dev/tomcat/tomcat-10/v10.1.0-M5/ /release/tomcat/tomcat-10/v10.1.0-M5/

Author: markt
Date: Fri Sep 10 06:14:22 2021
New Revision: 49862

Log:
Release Apache Tomcat 10.1.0-M5 (alpha)

Added:
release/tomcat/tomcat-10/v10.1.0-M5/
  - copied from r49861, dev/tomcat/tomcat-10/v10.1.0-M5/
Removed:
dev/tomcat/tomcat-10/v10.1.0-M5/


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

Re: [VOTE] Release Apache Tomcat 10.1.0-M5

2021-09-09 Thread Mark Thomas


The following votes were cast:

Binding:
+1: markt, remm, isapir, mgrigorov, jfclere

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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

Re: [VOTE] Release Apache Tomcat 10.1.0-M5

2021-09-09 Thread Mark Thomas


On 08/09/2021 09:52, Martin Grigorov wrote:

On Mon, Sep 6, 2021 at 5:43 PM Mark Thomas  wrote:





It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M4/



This should be -M5


Sorry about that. I must have missed it in the copy/paste/edit.

Mark

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

Re: [VOTE] Release Apache Tomcat 10.1.0-M5

2021-09-09 Thread jean-frederic clere


On 06/09/2021 16:43, Mark Thomas wrote:

[X] Alpha - go ahead and release as 10.1.0-M5 (alpha)


Tested on fedora34 with adoptopenjdk jdk-11.0.12+7

Still one failure:
   [concat] Testsuites with failed tests:
   [concat] TEST-org.apache.tomcat.util.net.TestSsl.NIO2.txt

I will have a closer look later.

--
Cheers

Jean-Frederic


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

[jira] [Deleted] (MTOMCAT-326) Slot Deposit Dana Bersama SBA99

2021-09-09 Thread Mark Thomas (Jira)



 [ 
https://issues.apache.org/jira/browse/MTOMCAT-326?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Mark Thomas deleted MTOMCAT-326:



> Slot Deposit Dana Bersama SBA99
> ---
>
> Key: MTOMCAT-326
> URL: https://issues.apache.org/jira/browse/MTOMCAT-326
> Project: Apache Tomcat Maven Plugin
>  Issue Type: New Feature
>Reporter: claudiatan353
>Assignee: Olivier Lamy
>Priority: Trivial
>
> h1. *Persiapan Slot Gacor 2021 Yang Menjadikan Pemain Menang Besar*
> [*!https://i.imgur.com/khrTiXA.png!*|https://18.139.152.126/]
> Bermain dalam permainan judi *Slot Gacor 2021* online menjadi satu pilihan 
> permainan yang dapat ditetapkan oleh para pemain judi online di internet. 
> Bermain game judi slot online merupakan satu pilihan dari beragam game judi 
> yang bisa ditemukan pemain ketika menjalani proses permainan judi online 
> [Slot Deposit Dana|http://45.76.153.6/] hanya di SBA99  . Kondisi permainan 
> dalam sarana online di internet memang cukup beragam dimana pemain dapat 
> memilih satu permainan untuk dimainkan oleh para pemain judi online sehingga 
> memperbesar peluangnya untuk menang.
> Permainan judi dalam sarana online di internet menjadi salah satu langkah 
> dalam bermain judi online yang perlu diperhatikan pemain dengan baik. 
> Aktivitas permainan judi online di internet dapat menjadikan pemain memiliki 
> kesempatan untuk bisa menjalani proses permainan judi dengan baik. Bagi para 
> pemain judi online di internet, bermain dalam sarana online terbaik SBA99 
> memberikan kesempatan pemain mendapatkan pilihan game yang tepat dan sesuai 
> dengan kebutuhan para pemain judi online.
> [!https://i.imgur.com/KjS1xDw.png!|https://bit.ly/3t1QuzA]
> Dalam menetapkan pilihan permainan yang akan dimainkan oleh para pemain judi 
> online di internet, pemain perlu mempertimbangkan beberapa hal yang sebaiknya 
> dipahami sebelum memilih game judi. Salah satu hal yang dapat menjadikan 
> pemain bisa memilih permainan judi dengan mudah dan tepat adalah kondisi 
> permainan yang populer dan banyak tersedia dalam pilihan agen judi online di 
> internet.
> h1. *Permainan Slot Jadi Satu Pilihan Populer Para Pemain Judi Online*
> Bagi para petaruh judi online, game *slot gacor 2021* online menjadi satu 
> permainan yang dapat menarik untuk dimainkan oleh para pemain judi online. 
> Permainan slot merupakan game yang mudah dan populer di dalam sarana berjudi 
> online di internet. Game slot jadi satu permainan yang mudah untuk dijalani 
> pejudi sehingga populer di kalangan para pemain judi baru. Pemain pemula 
> maupun pejudi berpengalaman dapat memilih game slot tersebut.
> Aktivitas permainan slot online mudah dimainkan karena semua proses bermain 
> judinya dijalani dengan menggunakan mesin *_link slot terbaik_* online. Agar 
> pemain dapat memanfaatkan permainan yang mudah tersebut dengan benar, para 
> pemain judi online di internet harus bisa memainkan game tersebut secara 
> tepat sehingga mampu memberikan kesempatan menang untuk bettor.
> h2. *Persiapan Pemain Dalam Menjalani Proses Permainan Judi Slot*
> [*!https://i.imgur.com/SeG4NJC.png!*|https://bit.ly/3BzzYdf]
> Berkaitan dengan proses bermain judi slot online, pemain harus melakukan satu 
> usaha penting agar ada kesempatan menang yang terbuka lebar ketika para 
> pemain judi online memainkannya. Persiapan dalam bermain judi online 
> merupakan kebutuhan yang sudah selayaknya dijalani agar pemain bisa melakukan 
> aktivitas berjudi di internet. Bentuk persiapan yang harus dilakukan para 
> pemain judi online dalam menjalani proses permainan judi slot online adalah 
> dengan memperhatikan penjelasan di bawah ini.
>  * *Memilih Dan Menetapkan Agen Judi Online Dengan Kualitas Terbaik*
> Cara pertama yang dapat dilakukan para pemain judi online di internet agar 
> dapat siap memainkan game slot online adalah dengan memilih dan menetapkan 
> agen judi online tempat bermain slot. Pilihan agen judi tempat pemain 
> menjalani proses permainan judi slot online perlu dipertimbangkan dengan baik 
> mengingat adanya beragam *_situs mpo slot_* judi online yang tersebar luas di 
> internet sekarang ini.
> Bermain judi dalam sarana online di internet akan membantu pemain mendapatkan 
> kesempatan untuk bisa berjudi dengan baik ketika pilihan sarananya 
> berkualitas seperti SBA99. Pemain harus memperhatikan beberapa kondisi dalam 
> permainan judi *slot gacor 2021* online agar dapat berjudi dengan lancar. 
> Pemain judi online dapat memperhatikan dengan baik beberapa kondisi agen 
> seperti tingkat kepercayaan, reputasi dan fasilitas di dalam agen judi online.
>  * *Memperhatikan Proses Dan Cara Bermain Judi Yang Tepat*
> Langkah persiapan kedua yang harus diperhatikan pemain agar dapat menjalani 
> proses permainan judi slot online dengan baik adalah memperhatikan proses dan 
> cara pemain d

[jira] [Updated] (MTOMCAT-326) Slot Deposit Dana Bersama SBA99

2021-09-09 Thread claudiatan353 (Jira)

[
https://issues.apache.org/jira/browse/MTOMCAT-326?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

claudiatan353 updated MTOMCAT-326:
--
Description:
h1. *Persiapan Slot Gacor 2021 Yang Menjadikan Pemain Menang Besar*

[*!https://i.imgur.com/khrTiXA.png!*|https://18.139.152.126/]

Bermain dalam permainan judi *Slot Gacor 2021* online menjadi satu pilihan
permainan yang dapat ditetapkan oleh para pemain judi online di internet.
Bermain game judi slot online merupakan satu pilihan dari beragam game judi
yang bisa ditemukan pemain ketika menjalani proses permainan judi online [Slot
Deposit Dana|http://45.76.153.6/] hanya di SBA99 . Kondisi permainan dalam
sarana online di internet memang cukup beragam dimana pemain dapat memilih satu
permainan untuk dimainkan oleh para pemain judi online sehingga memperbesar
peluangnya untuk menang.

Permainan judi dalam sarana online di internet menjadi salah satu langkah dalam
bermain judi online yang perlu diperhatikan pemain dengan baik. Aktivitas
permainan judi online di internet dapat menjadikan pemain memiliki kesempatan
untuk bisa menjalani proses permainan judi dengan baik. Bagi para pemain judi
online di internet, bermain dalam sarana online terbaik SBA99 memberikan
kesempatan pemain mendapatkan pilihan game yang tepat dan sesuai dengan
kebutuhan para pemain judi online.

[!https://i.imgur.com/KjS1xDw.png!|https://bit.ly/3t1QuzA]

Dalam menetapkan pilihan permainan yang akan dimainkan oleh para pemain judi
online di internet, pemain perlu mempertimbangkan beberapa hal yang sebaiknya
dipahami sebelum memilih game judi. Salah satu hal yang dapat menjadikan pemain
bisa memilih permainan judi dengan mudah dan tepat adalah kondisi permainan
yang populer dan banyak tersedia dalam pilihan agen judi online di internet.
h1. *Permainan Slot Jadi Satu Pilihan Populer Para Pemain Judi Online*

Bagi para petaruh judi online, game *slot gacor 2021* online menjadi satu
permainan yang dapat menarik untuk dimainkan oleh para pemain judi online.
Permainan slot merupakan game yang mudah dan populer di dalam sarana berjudi
online di internet. Game slot jadi satu permainan yang mudah untuk dijalani
pejudi sehingga populer di kalangan para pemain judi baru. Pemain pemula maupun
pejudi berpengalaman dapat memilih game slot tersebut.

Aktivitas permainan slot online mudah dimainkan karena semua proses bermain
judinya dijalani dengan menggunakan mesin *_link slot terbaik_* online. Agar
pemain dapat memanfaatkan permainan yang mudah tersebut dengan benar, para
pemain judi online di internet harus bisa memainkan game tersebut secara tepat
sehingga mampu memberikan kesempatan menang untuk bettor.
h2. *Persiapan Pemain Dalam Menjalani Proses Permainan Judi Slot*

[*!https://i.imgur.com/SeG4NJC.png!*|https://bit.ly/3BzzYdf]

Berkaitan dengan proses bermain judi slot online, pemain harus melakukan satu
usaha penting agar ada kesempatan menang yang terbuka lebar ketika para pemain
judi online memainkannya. Persiapan dalam bermain judi online merupakan
kebutuhan yang sudah selayaknya dijalani agar pemain bisa melakukan aktivitas
berjudi di internet. Bentuk persiapan yang harus dilakukan para pemain judi
online dalam menjalani proses permainan judi slot online adalah dengan
memperhatikan penjelasan di bawah ini.
* *Memilih Dan Menetapkan Agen Judi Online Dengan Kualitas Terbaik*

Cara pertama yang dapat dilakukan para pemain judi online di internet agar
dapat siap memainkan game slot online adalah dengan memilih dan menetapkan agen
judi online tempat bermain slot. Pilihan agen judi tempat pemain menjalani
proses permainan judi slot online perlu dipertimbangkan dengan baik mengingat
adanya beragam *_situs mpo slot_* judi online yang tersebar luas di internet
sekarang ini.

Bermain judi dalam sarana online di internet akan membantu pemain mendapatkan
kesempatan untuk bisa berjudi dengan baik ketika pilihan sarananya berkualitas
seperti SBA99. Pemain harus memperhatikan beberapa kondisi dalam permainan judi
*slot gacor 2021* online agar dapat berjudi dengan lancar. Pemain judi online
dapat memperhatikan dengan baik beberapa kondisi agen seperti tingkat
kepercayaan, reputasi dan fasilitas di dalam agen judi online.
* *Memperhatikan Proses Dan Cara Bermain Judi Yang Tepat*

Langkah persiapan kedua yang harus diperhatikan pemain agar dapat menjalani
proses permainan judi slot online dengan baik adalah memperhatikan proses dan
cara pemain dalam menjalani permainan *_slot mpo online_*. Pemain harus paham
tahapan dalam bermain game slot yang tepat dalam agen terbaik SBA99 sehingga
dapat menjadikan pemain judi online mampu menjalani proses permainan dengan
baik. meskipun game slot dianggap sebagai permainan mudah, usaha memahaminya
tetap diperlukan oleh para pemain judi online.

Baca Juga: [Slot Deposit Dana|https://letterboxd.com/claudiatan353/]
h3. *Mempersiapkan Strategi Dan Trik Dalam Ber

[jira] [Created] (MTOMCAT-326) Slot Deposit Dana Bersama SBA99

2021-09-09 Thread claudiatan353 (Jira)

claudiatan353 created MTOMCAT-326:
-

 Summary: Slot Deposit Dana Bersama SBA99
 Key: MTOMCAT-326
 URL: https://issues.apache.org/jira/browse/MTOMCAT-326
 Project: Apache Tomcat Maven Plugin
  Issue Type: New Feature
  Components: tomcat6
Affects Versions: backlog
Reporter: claudiatan353
Assignee: Olivier Lamy
 Fix For: moreinfo






--
This message was sent by Atlassian Jira
(v8.3.4#803005)

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

[GitHub] [tomcat] cklein05 commented on pull request #428: Enhancement: Additional user attributes queried by (some) realms



cklein05 commented on pull request #428:
URL: https://github.com/apache/tomcat/pull/428#issuecomment-916634571


   Now, the code should be as we've discussed before.
   
   I will additionally provide some initial documentation and a change log 
entry soon. You are always welcome to improve these while merging.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

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



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

Re: [VOTE] Release Apache Tomcat 8.5.71


Rémy,

On 9/9/21 16:07, Rémy Maucherat wrote:

On Thu, Sep 9, 2021 at 9:50 PM Christopher Schultz
 wrote:

- Add a UserDatabase implementation as a superset of the DataSourceRealm
 functionality.


Actually, I didn't backport this to 8.5, since I ran into Java 7
related troubles. Derby needs an old version, also the UserDatabase
interface would need breaking changes without the "default" keyword.


Remy


Cut and paste ;)


Yep. I did fix all the version numbers, including showing a difference 
between the current version and the previous one ;)


The 8.5.x release also has the fix for Content-Range which was too late 
for the other 2 releases.


Thanks for the clarification.

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

2021-09-09 Thread Rémy Maucherat

On Thu, Sep 9, 2021 at 9:50 PM Christopher Schultz
 wrote:
> - Add a UserDatabase implementation as a superset of the DataSourceRealm
> functionality.

Actually, I didn't backport this to 8.5, since I ran into Java 7
related troubles. Derby needs an old version, also the UserDatabase
interface would need breaking changes without the "default" keyword.

> Remy

Cut and paste ;)

Rémy

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

-
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: Increment version number for next dev cycle

This is an automated email from the ASF dual-hosted git repository.

schultz 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 ab0f3dc  Increment version number for next dev cycle
ab0f3dc is described below

commit ab0f3dc67452455a79e15792dba8c84ae9199d99
Author: Christopher Schultz 
AuthorDate: Thu Sep 9 15:55:26 2021 -0400

Increment version number for next dev cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 8 +---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7a041bf..b832befd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=71
+version.build=72
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index f209ecc..89847f1 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.71
+maven.asf.release.deploy.version=8.5.72
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 15d01c1..8de6fbc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   
@@ -152,7 +154,7 @@
 order of the remaining header values is unchanged. (markt)
   
   
-65563: Correct parsing of HTTP Content-Rnage
+65563: Correct parsing of HTTP Content-Range
 headers. Tomcat was incorrectly requiring an = character
 after bytes. Fix based on pull request 449 by
 Thierry Guérin. (markt)
@@ -235,7 +237,7 @@
 
   
 
-
+
   
 
   

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

[VOTE] Release Apache Tomcat 8.5.71


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

The notable changes compared to 8.5.70 are:

- Add a UserDatabase implementation as a superset of the DataSourceRealm
   functionality.

- Update the internal fork of Apache Commons DBCP to 2.9.0, Apache
   Commons Pool to 2.9.1, Apache Commons FileUpload to 2.0, and
   Apache Commons Codec to 1.16.

- Update the packaged version of the Tomcat Native Library to 1.2.31 to
   pick up Windows binaries built with OpenSSL 1.1.1l.

- Correct parsing of Content-Range headers

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat-8.0.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.71/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1333
The tag is:

https://github.com/apache/tomcat/commit/9e60ee33816f3f28af81535c108e6bd23f2ef970

https://github.com/apache/tomcat/tree/8.5.71
9e60ee33816f3f28af81535c108e6bd23f2ef970

The proposed 8.5.71 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.71 (stable)

Remy

-
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: Plans for Tomcat 8.5.71


Jon,

On 9/9/21 14:58, jonmcalexan...@wellsfargo.com.INVALID wrote:

I didn't want to be a pick, I just track these things really close for internal 
release cycles. :-)


Voting email has been sent. If you are able to test it out, that would 
be great.


-chris


-Original Message-
From: Christopher Schultz 
Sent: Thursday, September 9, 2021 1:51 PM
To: Tomcat Developers List ;
jonmcalexan...@wellsfargo.com.INVALID
Subject: Re: Plans for Tomcat 8.5.71

Jon,

On 9/9/21 13:40, jonmcalexan...@wellsfargo.com.INVALID wrote:

Any update on when voting is going to start?


I finally have the build working again after some (great!) changes to the
release process.

The vote should be out as soon as I can get the Maven artifacts uploaded.

-chris



From: Rémy Maucherat 
Sent: Sep 2, 2021 4:47 AM
To: Tomcat Developers List 
Subject: Re: Plans for Tomcat 8.5.71

On Wed, Sep 1, 2021 at 2:52 PM Christopher Schultz
 wrote:


All,

Since the tcnative vote has passed, and it's the beginning of the
month, I expect to tag + call for a vote on 8.5.71 later today
(US-Eastern time). It's an extra-long weekend in the US this upcoming
weekend; if I get enough votes by Friday mid-day, I'll do the
release, otherwise the vote will likely remain open until Wednesday

morning.


I think you should wait for the tag on the main branch before doing
anything, otherwise you may be missing one of the "auto" pre tag
updates (poeditor, etc).

Rémy



Thanks,
-chris

-
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




-
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



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

[VOTE] Release Apache Tomcat 8.5.71


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

The notable changes compared to 8.5.70 are:

- Add a UserDatabase implementation as a superset of the DataSourceRealm
   functionality.

- Update the internal fork of Apache Commons DBCP to 2.9.0, Apache
   Commons Pool to 2.9.1, Apache Commons FileUpload to 2.0, and
   Apache Commons Codec to 1.16.

- Update the packaged version of the Tomcat Native Library to 1.2.31 to
   pick up Windows binaries built with OpenSSL 1.1.1l.

- Correct parsing of Content-Range headers

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat-8.0.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.71/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1333
The tag is:

https://github.com/apache/tomcat/commit/9e60ee33816f3f28af81535c108e6bd23f2ef970

https://github.com/apache/tomcat/tree/8.5.71
9e60ee33816f3f28af81535c108e6bd23f2ef970

The proposed 8.5.71 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.71 (stable)

Remy

-
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

svn commit: r49858 - /dev/tomcat/tomcat-8/v8.5.71/ /release/tomcat/tomcat-8/v8.5.71/

Author: schultz
Date: Thu Sep  9 19:19:30 2021
New Revision: 49858

Log:
Move release to dev folder for vote

Added:
dev/tomcat/tomcat-8/v8.5.71/
  - copied from r49857, release/tomcat/tomcat-8/v8.5.71/
Removed:
release/tomcat/tomcat-8/v8.5.71/


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

svn commit: r49857 [1/2] - in /release/tomcat/tomcat-8/v8.5.71: ./ bin/ bin/embed/ bin/extras/ src/

Author: schultz
Date: Thu Sep  9 19:01:21 2021
New Revision: 49857

Log:
Upload v8.5.71 for voting

Added:
release/tomcat/tomcat-8/v8.5.71/
release/tomcat/tomcat-8/v8.5.71/KEYS
release/tomcat/tomcat-8/v8.5.71/README.html
release/tomcat/tomcat-8/v8.5.71/RELEASE-NOTES
release/tomcat/tomcat-8/v8.5.71/bin/
release/tomcat/tomcat-8/v8.5.71/bin/README.html
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-deployer.tar.gz   
(with props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-deployer.tar.gz.asc

release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-deployer.tar.gz.sha512
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-deployer.zip   
(with props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-deployer.zip.asc
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-deployer.zip.sha512
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-fulldocs.tar.gz   
(with props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-fulldocs.tar.gz.asc

release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-fulldocs.tar.gz.sha512
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-windows-x64.zip   
(with props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-windows-x64.zip.asc

release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-windows-x64.zip.sha512
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-windows-x86.zip   
(with props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-windows-x86.zip.asc

release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71-windows-x86.zip.sha512
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.exe   (with props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.exe.asc
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.exe.sha512
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.tar.gz   (with 
props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.tar.gz.asc
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.tar.gz.sha512
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.zip   (with props)
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.zip.asc
release/tomcat/tomcat-8/v8.5.71/bin/apache-tomcat-8.5.71.zip.sha512
release/tomcat/tomcat-8/v8.5.71/bin/embed/
release/tomcat/tomcat-8/v8.5.71/bin/embed/apache-tomcat-8.5.71-embed.tar.gz 
  (with props)

release/tomcat/tomcat-8/v8.5.71/bin/embed/apache-tomcat-8.5.71-embed.tar.gz.asc

release/tomcat/tomcat-8/v8.5.71/bin/embed/apache-tomcat-8.5.71-embed.tar.gz.sha512
release/tomcat/tomcat-8/v8.5.71/bin/embed/apache-tomcat-8.5.71-embed.zip   
(with props)
release/tomcat/tomcat-8/v8.5.71/bin/embed/apache-tomcat-8.5.71-embed.zip.asc

release/tomcat/tomcat-8/v8.5.71/bin/embed/apache-tomcat-8.5.71-embed.zip.sha512
release/tomcat/tomcat-8/v8.5.71/bin/extras/
release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar   (with 
props)
release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.asc
release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.sha512
release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar   (with props)
release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.asc
release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.sha512
release/tomcat/tomcat-8/v8.5.71/src/
release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz   (with 
props)
release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz.asc
release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz.sha512
release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.zip   (with 
props)
release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.zip.asc
release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.zip.sha512

Added: release/tomcat/tomcat-8/v8.5.71/KEYS
==
--- release/tomcat/tomcat-8/v8.5.71/KEYS (added)
+++ release/tomcat/tomcat-8/v8.5.71/KEYS Thu Sep  9 19:01:21 2021
@@ -0,0 +1,785 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N

svn commit: r49857 [2/2] - in /release/tomcat/tomcat-8/v8.5.71: ./ bin/ bin/embed/ bin/extras/ src/

Propchange: release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar
--
svn:mime-type = application/octet-stream

Added: release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.asc
==
--- release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.asc 
(added)
+++ release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.asc Thu 
Sep  9 19:01:21 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmE6WPkACgkQHPApP6U8
+pFiM5w/9HOQrEb8dg2GcC4hCGXzte+wpc95svtc7ibBZKj6fwX52GAzjuDrzHb22
+fKzpD8aUkQMknAf+lb+kUwtyDNQwwqBEj3CYE4aYjsLY7/jhDi2IdNubAbclYHta
+/ViQ9WCy+wm/UN8ZMKcrvYn5F6eZIFHRAz4KZN6RBHrBl/oyl2nQoF/e92YBlPTM
+ZF0WOCM4Ucc0VoOvh+lHxTNR1y34me4wrw/chNDAYKm2OU8Utfnn4ZMTA6pzYTl4
+HczHk7y364p+yBGEg0orvwo5mkShesjEBg3txsHaOEOqFQrQKuhnP6yJ6AGGGQeL
+IUo9LGi/tnsCm4EckN+JCKOqmQtdo/i/GVpmDfse7+BSAy6AKenUtnMvXxl3RfXK
+2iR8Nb+XkVMVD4E6q+i5RuufZfchBa3XGUfHFiok1FxPSquUA4j2sOt4ao/PZn3o
+ic4aH4/VAs3BcES/Llu37t2UhNYqWcDsG0PxmS9l5TKWOQvF2vlYE9NxO2O645f5
+1m+/6uZCS2FN/LK65Mmb9zqNC+7WKr11B2sj1IP+7lyd20ozC3ygrACLFqJdxG0Z
+RZqmigo0/52QQljoG4DNgK+PQIJxbXQlInnsZoSOQo+TGKfO1SsP58EAzUIkRC0h
+6oSQjhZt+eZjGVcsRN5g4t7jtZEw1V62/cwx60nIy2s2oZadEgA=
+=QaQl
+-END PGP SIGNATURE-

Added: release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.sha512
==
--- release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.sha512 
(added)
+++ release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-jmx-remote.jar.sha512 
Thu Sep  9 19:01:21 2021
@@ -0,0 +1 @@
+11a9ec210c34e4d7f94dbb2479d7dbfcc9bf007758b7962d27644e9c6b71623e0c2e111c50d32c62d669621cf62e2480dbdd33ff38b4812967b6b7202f99a05e
 *catalina-jmx-remote.jar
\ No newline at end of file

Added: release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar
==
Binary file - no diff available.

Propchange: release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar
--
svn:mime-type = application/octet-stream

Added: release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.asc
==
--- release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.asc (added)
+++ release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.asc Thu Sep  9 
19:01:21 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmE6WPkACgkQHPApP6U8
+pFioIhAAqJYfwIxHq7k0dhr1UJmdrkcUQga38w3mgm07ErvJgwhF4d9mm0WP9FKm
+3yQyH+CR9w+tA/74E31j4T6425byqcwP3V9EHkRSM/B2GWEyhgM0FCqfaXDR2OAY
+QxkBCJUHtUXFxeNvJBg186S/QqQRWU1Q+bSPNUJv1Xh1w/xwFG7HhpJWHJm3njln
+zA+DpQaxOWyRzPyiPYu8GhRijn/MQohcKtXJri3Fh2sMZzz4mi5+fXS4L9wGxx6b
+/XpS9c7sfYa5f2vMNllOCoopR9CHr4D+Oe6IRd2v1h8EHSQ9h/iRk1b9zbeO/i/K
+74KfL3K296IahHiYlcAYSYmQ5JFZ3ijxc7S9q0gr27Ji758xztATtMsW9FvPO2UZ
+DDvJioH/sCQdTkVP1Ld7Rml9YHzPYJYK1XJ3+QMCvuWJjZoAoCi+SrBm9WBoNits
+NeinZAU5l7jfNAgSz7EdvXz4iJtTUZ9glHIGY48D4Np+urEMXlxDoNVNX6u62X0P
+IkpWIgPWpADdcssPNKfkkknsrGcS+ZdtBtF2vwAk9JEQoHtDUuVuz/wqg/0C/N07
+Z5UAnwf+E/qVMkB3dph/i8pzE8+n7YVrslzGg/nXgyhF3Ien2mqtlaQUPzBQQ9JF
+wYK41iwBIvUUVNH+aN6xU97FbYPrCpxlz1p8vwjRsZgmg2eSoH4=
+=iNd/
+-END PGP SIGNATURE-

Added: release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.sha512
==
--- release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.sha512 (added)
+++ release/tomcat/tomcat-8/v8.5.71/bin/extras/catalina-ws.jar.sha512 Thu Sep  
9 19:01:21 2021
@@ -0,0 +1 @@
+37ed470f6fcfbc4d8275810d1404235902b2c311939a03b9706e3639821aa9b4e28e9d6ed288e6fb088d3c74f53941ae64c195164f4a6ef1d44d01e4e78cffa6
 *catalina-ws.jar
\ No newline at end of file

Added: release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz
==
Binary file - no diff available.

Propchange: release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz.asc
==
--- release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz.asc 
(added)
+++ release/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz.asc Thu 
Sep  9 19:01:21 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmE6WdAACgkQHPApP6U8
+pFgc4BAAri1/bQH8rtWf5YPcdxBRSvXDcJbwwoZWrjKGT0mb2P3EQHUofoYOGnI7
+IfDj5New9cOmBgA3lkOtIgfYOPWgbJDs0NEIYaE

RE: Plans for Tomcat 8.5.71

2021-09-09 Thread jonmcalexander

Thanks Chris, 

I didn't want to be a pick, I just track these things really close for internal 
release cycles. :-)

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

Middleware Product Engineering
Enterprise CIO | EAS | Middleware | Infrastructure Solutions

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

jonmcalexan...@wellsfargo.com
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: Christopher Schultz 
> Sent: Thursday, September 9, 2021 1:51 PM
> To: Tomcat Developers List ;
> jonmcalexan...@wellsfargo.com.INVALID
> Subject: Re: Plans for Tomcat 8.5.71
> 
> Jon,
> 
> On 9/9/21 13:40, jonmcalexan...@wellsfargo.com.INVALID wrote:
> > Any update on when voting is going to start?
> 
> I finally have the build working again after some (great!) changes to the
> release process.
> 
> The vote should be out as soon as I can get the Maven artifacts uploaded.
> 
> -chris
> 
> > 
> > From: Rémy Maucherat 
> > Sent: Sep 2, 2021 4:47 AM
> > To: Tomcat Developers List 
> > Subject: Re: Plans for Tomcat 8.5.71
> >
> > On Wed, Sep 1, 2021 at 2:52 PM Christopher Schultz
> >  wrote:
> >>
> >> All,
> >>
> >> Since the tcnative vote has passed, and it's the beginning of the
> >> month, I expect to tag + call for a vote on 8.5.71 later today
> >> (US-Eastern time). It's an extra-long weekend in the US this upcoming
> >> weekend; if I get enough votes by Friday mid-day, I'll do the
> >> release, otherwise the vote will likely remain open until Wednesday
> morning.
> >
> > I think you should wait for the tag on the main branch before doing
> > anything, otherwise you may be missing one of the "auto" pre tag
> > updates (poeditor, etc).
> >
> > Rémy
> >
> >>
> >> Thanks,
> >> -chris
> >>
> >> -
> >> 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
> >
> >
> 
> -
> 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: [tomcat] tag 8.5.71 created (now 9e60ee3)


All,

Apologies for re-creating the tag: I had to fix a source file, so a 
re-tag was appropriate.


-chris

On 9/9/21 14:47, schu...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.71
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


   at 9e60ee3  (commit)
This tag includes the following new commits:

  new 9e60ee3  Tag 8.5.71

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



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

Re: Plans for Tomcat 8.5.71


Jon,

On 9/9/21 13:40, jonmcalexan...@wellsfargo.com.INVALID wrote:

Any update on when voting is going to start?


I finally have the build working again after some (great!) changes to 
the release process.


The vote should be out as soon as I can get the Maven artifacts uploaded.

-chris



From: Rémy Maucherat 
Sent: Sep 2, 2021 4:47 AM
To: Tomcat Developers List 
Subject: Re: Plans for Tomcat 8.5.71

On Wed, Sep 1, 2021 at 2:52 PM Christopher Schultz
 wrote:


All,

Since the tcnative vote has passed, and it's the beginning of the month,
I expect to tag + call for a vote on 8.5.71 later today (US-Eastern
time). It's an extra-long weekend in the US this upcoming weekend; if I
get enough votes by Friday mid-day, I'll do the release, otherwise the
vote will likely remain open until Wednesday morning.


I think you should wait for the tag on the main branch before doing
anything, otherwise you may be missing one of the "auto" pre tag
updates (poeditor, etc).

Rémy



Thanks,
-chris

-
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




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

[tomcat] 01/01: Tag 8.5.71

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 8.5.71
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 9e60ee33816f3f28af81535c108e6bd23f2ef970
Author: schultz 
AuthorDate: Thu Sep 9 11:44:27 2021 -0700

Tag 8.5.71
---
 build.properties.default   | 7 ---
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7a041bf..750d811 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,13 +27,14 @@ version.major=8
 version.minor=5
 version.build=71
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
 # Note: The value is in seconds (unlike milliseconds used by 
System.currentTimeMillis()).
-#2021-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+# 2021-09-09 18:43:14 UTC
+ant.tstamp.now=1631212994
+
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 15d01c1..f05e070 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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

[tomcat] tag 8.5.71 created (now 9e60ee3)

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.71
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 9e60ee3  (commit)
This tag includes the following new commits:

 new 9e60ee3  Tag 8.5.71

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

[tomcat] tag 8.5.71 deleted (was 467953e)

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.71
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


*** WARNING: tag 8.5.71 was deleted! ***

 was 467953e  Tag 8.5.71

This change permanently discards the following revisions:

 discard 467953e  Tag 8.5.71

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

RE: Plans for Tomcat 8.5.71

2021-09-09 Thread jonmcalexander

Any update on when voting is going to start?


Thanks,


Sent with BlackBerry Work (www.blackberry.com)

From: Rémy Maucherat 
Sent: Sep 2, 2021 4:47 AM
To: Tomcat Developers List 
Subject: Re: Plans for Tomcat 8.5.71

On Wed, Sep 1, 2021 at 2:52 PM Christopher Schultz
 wrote:
>
> All,
>
> Since the tcnative vote has passed, and it's the beginning of the month,
> I expect to tag + call for a vote on 8.5.71 later today (US-Eastern
> time). It's an extra-long weekend in the US this upcoming weekend; if I
> get enough votes by Friday mid-day, I'll do the release, otherwise the
> vote will likely remain open until Wednesday morning.

I think you should wait for the tag on the main branch before doing
anything, otherwise you may be missing one of the "auto" pre tag
updates (poeditor, etc).

Rémy

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

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

Re: [VOTE] Release Apache Tomcat 9.0.53

2021-09-09 Thread Igal Sapir

On Mon, Sep 6, 2021 at 12:22 PM Rémy Maucherat  wrote:

> The proposed Apache Tomcat 9.0.53 release is now available for voting.
>
> The notable changes compared to 9.0.53 are:
>
> - Add a UserDatabase implementation as a superset of the DataSourceRealm
>functionality.
>
> - Update the internal fork of Apache Commons DBCP to 2.9.0 and Apache
>Commons Pool to 2.11.1
>
> - Update the packaged version of the Tomcat Native Library to 1.2.31 to
>pick up Windows binaries built with OpenSSL 1.1.1l.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.53/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1332
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.53
> 966ec5401970b9d4b41b53f5fff9f65966d887dd
>
> The proposed 9.0.53 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.53 (stable)
>

+1 tested on Ubuntu 20.04 with Zulu 11 JVM

Igal



>
> Remy
>
> -
> 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: Make checkstyle happy

This is an automated email from the ASF dual-hosted git repository.

schultz 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 c021fd8  Make checkstyle happy
c021fd8 is described below

commit c021fd8af4c6f94a98171fc35680e95cd5eea2da
Author: schultz 
AuthorDate: Thu Sep 9 10:28:46 2021 -0700

Make checkstyle happy
---
 java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java 
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
index 783c61a..2d82680 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
@@ -240,7 +240,7 @@ public class DelegatingConnection 
extends AbandonedTrace i
 
 /**
  * Handles the given exception by throwing it.
- * 
+ *
  * @param e the exception to throw.
  * @throws SQLException the exception to throw.
  */

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

[tomcat] 01/01: Tag 8.5.71

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 8.5.71
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 467953eb030a9627231b70c8a90ffcd4a07a1eb5
Author: schultz 
AuthorDate: Thu Sep 9 09:58:34 2021 -0700

Tag 8.5.71
---
 build.properties.default   | 6 +++---
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7a041bf..9c0de57 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,13 +27,13 @@ version.major=8
 version.minor=5
 version.build=71
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
 # Note: The value is in seconds (unlike milliseconds used by 
System.currentTimeMillis()).
-#2021-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+# 2021-09-09 16:56:00 UTC
+ant.tstamp.now=1631206560
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 15d01c1..f05e070 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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

[tomcat] tag 8.5.71 created (now 467953e)

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.71
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 467953e  (commit)
This tag includes the following new commits:

 new 467953e  Tag 8.5.71

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

Re: [VOTE] Release Apache Tomcat 9.0.53

2021-09-09 Thread Coty Sutherland

On Mon, Sep 6, 2021 at 3:22 PM Rémy Maucherat  wrote:

> The proposed Apache Tomcat 9.0.53 release is now available for voting.
>
> The notable changes compared to 9.0.53 are:
>
> - Add a UserDatabase implementation as a superset of the DataSourceRealm
>functionality.
>
> - Update the internal fork of Apache Commons DBCP to 2.9.0 and Apache
>Commons Pool to 2.11.1
>
> - Update the packaged version of the Tomcat Native Library to 1.2.31 to
>pick up Windows binaries built with OpenSSL 1.1.1l.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.53/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1332
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.53
> 966ec5401970b9d4b41b53f5fff9f65966d887dd
>
> The proposed 9.0.53 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 9.0.53 (stable)
>

+1 on fc34 with OpenJDK8 :)


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

Re: [VOTE] Release Apache Tomcat 9.0.53

2021-09-09 Thread jean-frederic clere


On 06/09/2021 21:21, Rémy Maucherat wrote:

[X] Stable - go ahead and release as 9.0.53 (stable)


Tested on fedora34 with openjdk8.

--
Cheers

Jean-Frederic


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

Re: [VOTE] Release Apache Tomcat 9.0.53

2021-09-09 Thread Mladen Turk





On 06/09/2021 21:21, Rémy Maucherat wrote:

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


The proposed 9.0.53 release is:
[ ] Broken - do not release
[x] Stable - go ahead and release as 9.0.53 (stable)



Tested installer, service, admin
and some tests. All works fine on
Windows Server 2022

Regards
--
^TM

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

[GitHub] [tomcat] cklein05 commented on pull request #428: Enhancement: Additional user attributes queried by (some) realms



cklein05 commented on pull request #428:
URL: https://github.com/apache/tomcat/pull/428#issuecomment-916111826


   Rémy,
   
   I agree with you that, for MemoryRealm and UserDatabaseRealm, this feature 
is not that much useful. However, for the sake of _completeness_ (aka all 
realms should behave the same, in a way) these do support additional user 
attributes as well. Nevertheless, the feature is primarily intended to provide 
a _user friendly_ user name easily. The UserDatabase supports the `fullname` 
attribute, so, this is still a simple way to provide this to the application.
   
   With DataSourceRealm it's nearly as much as useful than with JNDIRealm, 
since one can always add many _interesting_ columns to the `tomcat_users` 
database table. In my company, we have several production applications that 
relay on DataSourceRealm connected to a PostgreSQL user database.
   
   I agreed with Mark and Michael to remove the whole _defensive copy_ stuff. 
However, that's not yet pushed back onto my GitHub repository. Shall I do so?


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

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



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

[GitHub] [tomcat] rmaucher commented on pull request #428: Enhancement: Additional user attributes queried by (some) realms



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


   Looking back at this since I thin I have time to merge it. Shouldn't some of 
the changes be dropped and focused only on the realms that show a benefit ?
   - JNDIRealm: Very useful, that's likely the whole point of this new feature.
   - DataSourceRealm: This does something useful but less so and it is complex.
   - MemoryRealm: This adds some complexity for a fixed list of attributes 
which do not seem that useful.
   - UserDatabaseRealm: Same.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

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



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

[Bug 65565] Tomcat responds with HTTP status code 503 with response body upstream connect error or disconnect/reset before headers. reset reason: remote refused stream reset

https://bz.apache.org/bugzilla/show_bug.cgi?id=65565

--- Comment #3 from Mark Thomas  ---
If you aren't using a reverse proxy, where is the 503 response coming from?

Again, the users mailing list is the place to seek help.

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

buildbot failure in on tomcat-9.0.x

2021-09-09 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-9.0.x while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9.0.x/builds/128

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] c177e9dadf9e1438da5649116a4dd5d45ad403d1
Blamelist: Mark Thomas ,remm 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[Bug 65565] Tomcat responds with HTTP status code 503 with response body upstream connect error or disconnect/reset before headers. reset reason: remote refused stream reset

https://bz.apache.org/bugzilla/show_bug.cgi?id=65565

--- Comment #2 from Juhi Gupta  ---
We are not using reverse proxy and we have used all the default values for both
spring boot and tomcat.
Are  there any specific configuration you are looking for?

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

buildbot success in on tomcat-9.0.x

2021-09-09 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-9.0.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9.0.x/builds/127

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] f806d4fb11c247517a17b59192c28642a56f31b7
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




-
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: Use DataSource in DataSourceUserDatabase constructor

2021-09-09 Thread remm

This is an automated email from the ASF dual-hosted git repository.

remm 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 c177e9d  Use DataSource in DataSourceUserDatabase constructor
c177e9d is described below

commit c177e9dadf9e1438da5649116a4dd5d45ad403d1
Author: remm 
AuthorDate: Thu Sep 9 11:38:23 2021 +0200

Use DataSource in DataSourceUserDatabase constructor

Easy to do since there's no support for a local DataSource.
Also allows much easier and complete testing since a JNDI environment is
no longer needed.
---
 .../apache/catalina/users/DataSourceUserDatabase.java| 16 
 .../catalina/users/DataSourceUserDatabaseFactory.java| 14 ++
 java/org/apache/catalina/users/mbeans-descriptors.xml|  3 ++-
 webapps/docs/changelog.xml   |  8 
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java 
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 99cf584..01f6718 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.naming.Context;
 import javax.sql.DataSource;
 
 import org.apache.catalina.Group;
@@ -45,16 +44,16 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
 private static final Log log = 
LogFactory.getLog(DataSourceUserDatabase.class);
 private static final StringManager sm = 
StringManager.getManager(DataSourceUserDatabase.class);
 
-public DataSourceUserDatabase(Context namingContext, String id) {
-this.namingContext = namingContext;
+public DataSourceUserDatabase(DataSource dataSource, String id) {
+this.dataSource = dataSource;
 this.id = id;
 }
 
 
 /**
- * Associated naming context (will be used to bet the DataSource).
+ * DataSource to use.
  */
-protected final Context namingContext;
+protected final DataSource dataSource;
 
 
 /**
@@ -243,7 +242,7 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
  * @param dataSourceName the name of the JNDI JDBC DataSource
  */
 public void setDataSourceName(String dataSourceName) {
-  this.dataSourceName = dataSourceName;
+this.dataSourceName = dataSourceName;
 }
 
 /**
@@ -1509,9 +1508,10 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
  * @return Connection to the database
  */
 protected Connection openConnection() {
+if (dataSource == null) {
+return null;
+}
 try {
-Context context = namingContext;
-DataSource dataSource = (DataSource) 
context.lookup(dataSourceName);
 Connection connection = dataSource.getConnection();
 connectionSuccess = true;
 return connection;
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java 
b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
index d288eff..1a69b7f 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
@@ -24,6 +24,7 @@ import javax.naming.Name;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 import javax.naming.spi.ObjectFactory;
+import javax.sql.DataSource;
 
 
 /**
@@ -78,16 +79,21 @@ public class DataSourceUserDatabaseFactory implements 
ObjectFactory {
 return null;
 }
 
-// Create and configure a MemoryUserDDataSourceUserDatabaseatabase 
instance based on the
-// RefAddr values associated with this Reference
-DataSourceUserDatabase database = new DataSourceUserDatabase(nameCtx, 
name.toString());
+DataSource dataSource = null;
+String dataSourceName = null;
 RefAddr ra = null;
 
 ra = ref.get("dataSourceName");
 if (ra != null) {
-database.setDataSourceName(ra.getContent().toString());
+dataSourceName = ra.getContent().toString();
+dataSource = (DataSource) nameCtx.lookup(dataSourceName);
 }
 
+// Create and configure a DataSourceUserDatabase instance based on the
+// RefAddr values associated with this Reference
+DataSourceUserDatabase database = new 
DataSourceUserDatabase(dataSource, name.toString());
+database.setDataSourceName(dataSourceName);
+
 ra = ref.get("readonly");
 if (ra != null) {
 
database.setReadonly(Boolean.parseBoolean(ra.getContent().toString()));
diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/java/

[tomcat] branch 10.0.x updated: Use DataSource in DataSourceUserDatabase constructor

2021-09-09 Thread remm

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new b2dd7da  Use DataSource in DataSourceUserDatabase constructor
b2dd7da is described below

commit b2dd7da238028b9c1f63cf427df8de387863f306
Author: remm 
AuthorDate: Thu Sep 9 11:38:23 2021 +0200

Use DataSource in DataSourceUserDatabase constructor

Easy to do since there's no support for a local DataSource.
Also allows much easier and complete testing since a JNDI environment is
no longer needed.
---
 .../apache/catalina/users/DataSourceUserDatabase.java| 16 
 .../catalina/users/DataSourceUserDatabaseFactory.java| 14 ++
 java/org/apache/catalina/users/mbeans-descriptors.xml|  3 ++-
 webapps/docs/changelog.xml   |  8 
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java 
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 99cf584..01f6718 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.naming.Context;
 import javax.sql.DataSource;
 
 import org.apache.catalina.Group;
@@ -45,16 +44,16 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
 private static final Log log = 
LogFactory.getLog(DataSourceUserDatabase.class);
 private static final StringManager sm = 
StringManager.getManager(DataSourceUserDatabase.class);
 
-public DataSourceUserDatabase(Context namingContext, String id) {
-this.namingContext = namingContext;
+public DataSourceUserDatabase(DataSource dataSource, String id) {
+this.dataSource = dataSource;
 this.id = id;
 }
 
 
 /**
- * Associated naming context (will be used to bet the DataSource).
+ * DataSource to use.
  */
-protected final Context namingContext;
+protected final DataSource dataSource;
 
 
 /**
@@ -243,7 +242,7 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
  * @param dataSourceName the name of the JNDI JDBC DataSource
  */
 public void setDataSourceName(String dataSourceName) {
-  this.dataSourceName = dataSourceName;
+this.dataSourceName = dataSourceName;
 }
 
 /**
@@ -1509,9 +1508,10 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
  * @return Connection to the database
  */
 protected Connection openConnection() {
+if (dataSource == null) {
+return null;
+}
 try {
-Context context = namingContext;
-DataSource dataSource = (DataSource) 
context.lookup(dataSourceName);
 Connection connection = dataSource.getConnection();
 connectionSuccess = true;
 return connection;
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java 
b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
index d288eff..1a69b7f 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
@@ -24,6 +24,7 @@ import javax.naming.Name;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 import javax.naming.spi.ObjectFactory;
+import javax.sql.DataSource;
 
 
 /**
@@ -78,16 +79,21 @@ public class DataSourceUserDatabaseFactory implements 
ObjectFactory {
 return null;
 }
 
-// Create and configure a MemoryUserDDataSourceUserDatabaseatabase 
instance based on the
-// RefAddr values associated with this Reference
-DataSourceUserDatabase database = new DataSourceUserDatabase(nameCtx, 
name.toString());
+DataSource dataSource = null;
+String dataSourceName = null;
 RefAddr ra = null;
 
 ra = ref.get("dataSourceName");
 if (ra != null) {
-database.setDataSourceName(ra.getContent().toString());
+dataSourceName = ra.getContent().toString();
+dataSource = (DataSource) nameCtx.lookup(dataSourceName);
 }
 
+// Create and configure a DataSourceUserDatabase instance based on the
+// RefAddr values associated with this Reference
+DataSourceUserDatabase database = new 
DataSourceUserDatabase(dataSource, name.toString());
+database.setDataSourceName(dataSourceName);
+
 ra = ref.get("readonly");
 if (ra != null) {
 
database.setReadonly(Boolean.parseBoolean(ra.getContent().toString()));
diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/jav

[tomcat] branch main updated: Use DataSource in DataSourceUserDatabase constructor

2021-09-09 Thread remm

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 878caf6  Use DataSource in DataSourceUserDatabase constructor
878caf6 is described below

commit 878caf69ca333929b31ed821c2a7f2593e785495
Author: remm 
AuthorDate: Thu Sep 9 11:38:23 2021 +0200

Use DataSource in DataSourceUserDatabase constructor

Easy to do since there's no support for a local DataSource.
Also allows much easier and complete testing since a JNDI environment is
no longer needed.
---
 .../apache/catalina/users/DataSourceUserDatabase.java| 16 
 .../catalina/users/DataSourceUserDatabaseFactory.java| 14 ++
 java/org/apache/catalina/users/mbeans-descriptors.xml|  3 ++-
 webapps/docs/changelog.xml   |  8 
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java 
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 99cf584..01f6718 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.naming.Context;
 import javax.sql.DataSource;
 
 import org.apache.catalina.Group;
@@ -45,16 +44,16 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
 private static final Log log = 
LogFactory.getLog(DataSourceUserDatabase.class);
 private static final StringManager sm = 
StringManager.getManager(DataSourceUserDatabase.class);
 
-public DataSourceUserDatabase(Context namingContext, String id) {
-this.namingContext = namingContext;
+public DataSourceUserDatabase(DataSource dataSource, String id) {
+this.dataSource = dataSource;
 this.id = id;
 }
 
 
 /**
- * Associated naming context (will be used to bet the DataSource).
+ * DataSource to use.
  */
-protected final Context namingContext;
+protected final DataSource dataSource;
 
 
 /**
@@ -243,7 +242,7 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
  * @param dataSourceName the name of the JNDI JDBC DataSource
  */
 public void setDataSourceName(String dataSourceName) {
-  this.dataSourceName = dataSourceName;
+this.dataSourceName = dataSourceName;
 }
 
 /**
@@ -1509,9 +1508,10 @@ public class DataSourceUserDatabase extends 
SparseUserDatabase {
  * @return Connection to the database
  */
 protected Connection openConnection() {
+if (dataSource == null) {
+return null;
+}
 try {
-Context context = namingContext;
-DataSource dataSource = (DataSource) 
context.lookup(dataSourceName);
 Connection connection = dataSource.getConnection();
 connectionSuccess = true;
 return connection;
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java 
b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
index d288eff..1a69b7f 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabaseFactory.java
@@ -24,6 +24,7 @@ import javax.naming.Name;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 import javax.naming.spi.ObjectFactory;
+import javax.sql.DataSource;
 
 
 /**
@@ -78,16 +79,21 @@ public class DataSourceUserDatabaseFactory implements 
ObjectFactory {
 return null;
 }
 
-// Create and configure a MemoryUserDDataSourceUserDatabaseatabase 
instance based on the
-// RefAddr values associated with this Reference
-DataSourceUserDatabase database = new DataSourceUserDatabase(nameCtx, 
name.toString());
+DataSource dataSource = null;
+String dataSourceName = null;
 RefAddr ra = null;
 
 ra = ref.get("dataSourceName");
 if (ra != null) {
-database.setDataSourceName(ra.getContent().toString());
+dataSourceName = ra.getContent().toString();
+dataSource = (DataSource) nameCtx.lookup(dataSourceName);
 }
 
+// Create and configure a DataSourceUserDatabase instance based on the
+// RefAddr values associated with this Reference
+DataSourceUserDatabase database = new 
DataSourceUserDatabase(dataSource, name.toString());
+database.setDataSourceName(dataSourceName);
+
 ra = ref.get("readonly");
 if (ra != null) {
 
database.setReadonly(Boolean.parseBoolean(ra.getContent().toString()));
diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/java/or

[Bug 65565] Tomcat responds with HTTP status code 503 with response body upstream connect error or disconnect/reset before headers. reset reason: remote refused stream reset

https://bz.apache.org/bugzilla/show_bug.cgi?id=65565

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
There is insufficient information provided in this report to demonstrate that
Tomcat is behaving incorrectly. The "remote refused stream reset" behaviour may
be correct depending on the configuration of the reverse proxy which is
completely missing from this report.

Even with the reverse proxy configuration, there is insufficient information
provided in this report to enable anyone to start an investigation.

Please take your enquiry to the Tomcat users mailing list. If, and only if, you
are able to provide a test case that demonstrates this issue then re-open this
issue and provide the test case along with the steps to reproduce.

-- 
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] 01/04: More version updates

This is an automated email from the ASF dual-hosted git repository.

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

commit 39a2f1dd76036215b319aee3f8e577ade0f7b491
Author: Mark Thomas 
AuthorDate: Thu Sep 9 09:50:08 2021 +0100

More version updates
---
 BUILDING.txt   |  2 +-
 RELEASE-NOTES  |  2 +-
 build.xml  |  4 ++--
 java/org/apache/catalina/connector/CoyoteAdapter.java  |  2 +-
 java/org/apache/jasper/Constants.java  |  2 +-
 java/org/apache/jasper/compiler/Generator.java |  2 +-
 java/org/apache/jasper/compiler/Validator.java |  3 ++-
 java/org/apache/jasper/resources/LocalStrings.properties   |  2 +-
 .../org/apache/jasper/resources/LocalStrings_es.properties |  2 +-
 .../org/apache/jasper/resources/LocalStrings_fr.properties |  2 +-
 .../org/apache/jasper/resources/LocalStrings_ja.properties |  2 +-
 .../org/apache/jasper/resources/LocalStrings_ko.properties |  2 +-
 .../apache/jasper/resources/LocalStrings_zh_CN.properties  |  2 +-
 test/org/apache/jasper/compiler/TestJspDocumentParser.java | 12 +++-
 test/org/apache/tomcat/util/descriptor/web/TestWebXml.java |  5 +
 .../{document-3.1.jspx => document-3.2.jspx}   |  2 +-
 .../{document-3.1.jspx => document-4.0.jspx}   |  2 +-
 .../document-3.1.jspx  |  0
 webapps/docs/appdev/deployment.xml |  2 +-
 webapps/docs/appdev/introduction.xml   |  8 
 webapps/docs/class-loader-howto.xml|  2 +-
 webapps/docs/index.xml | 14 +++---
 webapps/docs/project.xml   |  2 +-
 23 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 0670db8..27fb422 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -20,7 +20,7 @@
 
 
 This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Jakarta Servlet 6.0, JSP 3.0, EL 5.0, WebSocket 2.0 and
+implements the Jakarta Servlet 6.0, JSP 3.1, EL 5.0, WebSocket 2.0 and
 Authentication 2.0 specifications from the Jakarta EE project at Eclipse
 .
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 70e5abf..def4047 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -77,7 +77,7 @@ for use by web applications (by placing them in "lib"):
 * el-api.jar (EL 5.0 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
-* jsp-api.jar (JSP 3.0 API)
+* jsp-api.jar (JSP 3.1 API)
 * servlet-api.jar (Servlet 6.0 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
diff --git a/build.xml b/build.xml
index 428ce57..d010a4d 100644
--- a/build.xml
+++ b/build.xml
@@ -54,8 +54,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 3367425..053874f 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -67,7 +67,7 @@ public class CoyoteAdapter implements Adapter {
 
 // -- Constants
 
-private static final String POWERED_BY = "Servlet/6.0 JSP/3.0 " +
+private static final String POWERED_BY = "Servlet/6.0 JSP/3.1 " +
 "(" + ServerInfo.getServerInfo() + " Java/" +
 System.getProperty("java.vm.vendor") + "/" +
 System.getProperty("java.runtime.version") + ")";
diff --git a/java/org/apache/jasper/Constants.java 
b/java/org/apache/jasper/Constants.java
index 16e2e96..7a0c058 100644
--- a/java/org/apache/jasper/Constants.java
+++ b/java/org/apache/jasper/Constants.java
@@ -30,7 +30,7 @@ import java.util.List;
  */
 public class Constants {
 
-public static final String SPEC_VERSION = "3.0";
+public static final String SPEC_VERSION = "3.1";
 
 /**
  * These classes/packages are automatically imported by the
diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 7c35a3d..61eec0c 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -818,7 +818,7 @@ class Generator {
 out.println(");");
 
 if (ctxt.getOptions().isXpoweredBy()) {
-out.printil("response.addHeader(\"X-Powered-By\", \"JSP/3.0\");");
+out.printil("response.addHeader(\"X-Powered-By\", \"JSP/3.1\");");
 }
 
 out.printil("pageContext = _jspxFactory.getPageContext(this, request, 
r

[tomcat] branch 8.5.x updated: Provide implementation of isParametersProvided

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 625d5a3  Provide implementation of isParametersProvided
625d5a3 is described below

commit 625d5a3ae9dafed015e1a670d01c9c8c6e4c2981
Author: Mark Thomas 
AuthorDate: Thu Sep 9 09:53:59 2021 +0100

Provide implementation of isParametersProvided
---
 java/org/apache/jasper/el/JspMethodExpression.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/jasper/el/JspMethodExpression.java 
b/java/org/apache/jasper/el/JspMethodExpression.java
index c6f9fb4..de724d5 100644
--- a/java/org/apache/jasper/el/JspMethodExpression.java
+++ b/java/org/apache/jasper/el/JspMethodExpression.java
@@ -99,6 +99,11 @@ public final class JspMethodExpression extends 
MethodExpression implements
 }
 
 @Override
+public boolean isParametersProvided() {
+return this.target.isParametersProvided();
+}
+
+@Override
 public boolean equals(Object obj) {
 return this.target.equals(obj);
 }

-
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: Provide implementation of isParametersProvided

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 1515122  Provide implementation of isParametersProvided
1515122 is described below

commit 15151223fbcb5bc10ab6aebfd5f09e238ed26753
Author: Mark Thomas 
AuthorDate: Thu Sep 9 09:53:59 2021 +0100

Provide implementation of isParametersProvided
---
 java/org/apache/jasper/el/JspMethodExpression.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/jasper/el/JspMethodExpression.java 
b/java/org/apache/jasper/el/JspMethodExpression.java
index c6f9fb4..de724d5 100644
--- a/java/org/apache/jasper/el/JspMethodExpression.java
+++ b/java/org/apache/jasper/el/JspMethodExpression.java
@@ -99,6 +99,11 @@ public final class JspMethodExpression extends 
MethodExpression implements
 }
 
 @Override
+public boolean isParametersProvided() {
+return this.target.isParametersProvided();
+}
+
+@Override
 public boolean equals(Object obj) {
 return this.target.equals(obj);
 }

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

[tomcat] branch 10.0.x updated (fd14af6 -> cb1b00d)

This is an automated email from the ASF dual-hosted git repository.

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


from fd14af6  Provide implementation of isParametersProvided
 new 9e4ab0b  Add support for Servlet 5 to WebXml.toString()
 new cb1b00d  Align with 10.1.x

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:
 java/org/apache/tomcat/util/descriptor/web/WebXml.java | 3 +++
 test/org/apache/tomcat/util/descriptor/web/TestWebXml.java | 5 +
 2 files changed, 8 insertions(+)

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

[Bug 65565] New: Tomcat responds with HTTP status code 503 with response body upstream connect error or disconnect/reset before headers. reset reason: remote refused stream reset

https://bz.apache.org/bugzilla/show_bug.cgi?id=65565

Bug ID: 65565
   Summary: Tomcat responds with HTTP status code 503 with
response body upstream connect error or
disconnect/reset before headers. reset reason: remote
refused stream reset
   Product: Tomcat 9
   Version: 9.0.52
  Hardware: All
OS: All
Status: NEW
  Severity: blocker
  Priority: P2
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: juhigupta...@gmail.com
  Target Milestone: -

Hello, I have following configuration setup in my production environment:

Java Application with following configuration:
1. Sprint boot server version 2.5.4
2. Tomcat version 9.0.52
3. Inside our Application we have enabled HTTP 2 version by using following
bean code
```
@Bean
public TomcatConnectorCustomizer customizer() {
  return (connector) -> connector.addUpgradeProtocol(new Http2Protocol());
  }
```

4. All the other Spring boot and Tomcat configuration/properties are default
5. Running this Application as docker container (using base image of alpine) on
cloud in which we have installed tomcat-native which has following libs
https://pkgs.alpinelinux.org/contents?branch=edge&name=tomcat-native&arch=x86&repo=community

Issue faced: When the client call this java application, it receives HTTP
status code 503 with response body as "upstream connect error or
disconnect/reset before headers. reset reason: remote refused stream reset"
They happen almost 2-3 times in an hour with normal load

We didnt get these errors while using HTTP 1 but have started to notice this
issue when we upgraded Tomcat to use HTTP 2


We also enabled internal logs for tomcat to be printed by using these
application property
logging.level.org.apache.tomcat=ERROR
logging.level.org.apache.catalina=ERROR
but no additional information was printed out when we get this error.

-- 
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] 01/02: Add support for Servlet 5 to WebXml.toString()

This is an automated email from the ASF dual-hosted git repository.

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

commit 9e4ab0bc5e44d898445800aed4ac0a69d3f95b66
Author: Mark Thomas 
AuthorDate: Thu Sep 9 10:05:10 2021 +0100

Add support for Servlet 5 to WebXml.toString()
---
 java/org/apache/tomcat/util/descriptor/web/WebXml.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 434e630..62b5ed7 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -752,6 +752,9 @@ public class WebXml extends XmlEncodingBase implements 
DocumentProperties.Charse
 } else if ("4.0".equals(version)) {
 javaeeNamespace = XmlIdentifiers.JAVAEE_8_NS;
 webXmlSchemaLocation = XmlIdentifiers.WEB_40_XSD;
+} else if ("5.0".equals(version)) {
+javaeeNamespace = XmlIdentifiers.JAKARTAEE_9_NS;
+webXmlSchemaLocation = XmlIdentifiers.WEB_50_XSD;
 }
 sb.append("

[tomcat] 02/02: Align with 10.1.x

This is an automated email from the ASF dual-hosted git repository.

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

commit cb1b00d46c62f150c3d4d3537510e47d40cb392d
Author: Mark Thomas 
AuthorDate: Thu Sep 9 10:09:52 2021 +0100

Align with 10.1.x
---
 test/org/apache/tomcat/util/descriptor/web/TestWebXml.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java 
b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
index d68605c..898cec6 100644
--- a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
@@ -177,6 +177,11 @@ public class TestWebXml {
 doTestValidateVersion("4.0");
 }
 
+@Test
+public void testValidateVersion50() throws IOException, SAXException {
+doTestValidateVersion("5.0");
+}
+
 private void doTestValidateVersion(String version) throws IOException, 
SAXException {
 WebXml webxml = new WebXml();
 

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

[tomcat] branch 10.0.x updated: Provide implementation of isParametersProvided

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new fd14af6  Provide implementation of isParametersProvided
fd14af6 is described below

commit fd14af64e393b7778271a8787c4bae355ae9a2cc
Author: Mark Thomas 
AuthorDate: Thu Sep 9 09:53:59 2021 +0100

Provide implementation of isParametersProvided
---
 java/org/apache/jasper/el/JspMethodExpression.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/jasper/el/JspMethodExpression.java 
b/java/org/apache/jasper/el/JspMethodExpression.java
index c59b6f0..63dd545 100644
--- a/java/org/apache/jasper/el/JspMethodExpression.java
+++ b/java/org/apache/jasper/el/JspMethodExpression.java
@@ -99,6 +99,11 @@ public final class JspMethodExpression extends 
MethodExpression implements
 }
 
 @Override
+public boolean isParametersProvided() {
+return this.target.isParametersProvided();
+}
+
+@Override
 public boolean equals(Object obj) {
 return this.target.equals(obj);
 }

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

[tomcat] 04/04: Add support for Servlet 5 to WebXml.toString()

This is an automated email from the ASF dual-hosted git repository.

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

commit 0b36542a5175a793c31b34357264c5eb4ef556ce
Author: Mark Thomas 
AuthorDate: Thu Sep 9 10:05:10 2021 +0100

Add support for Servlet 5 to WebXml.toString()
---
 java/org/apache/tomcat/util/descriptor/web/WebXml.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 434e630..62b5ed7 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -752,6 +752,9 @@ public class WebXml extends XmlEncodingBase implements 
DocumentProperties.Charse
 } else if ("4.0".equals(version)) {
 javaeeNamespace = XmlIdentifiers.JAVAEE_8_NS;
 webXmlSchemaLocation = XmlIdentifiers.WEB_40_XSD;
+} else if ("5.0".equals(version)) {
+javaeeNamespace = XmlIdentifiers.JAKARTAEE_9_NS;
+webXmlSchemaLocation = XmlIdentifiers.WEB_50_XSD;
 }
 sb.append("

[tomcat] 03/04: Fix failing tests

This is an automated email from the ASF dual-hosted git repository.

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

commit 8a9b1c4c14e7ebf46c0c03d9246201647c7eed23
Author: Mark Thomas 
AuthorDate: Thu Sep 9 10:00:05 2021 +0100

Fix failing tests

Should not have re-used existing proeprty name
---
 test/jakarta/el/TestBeanELResolver.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/jakarta/el/TestBeanELResolver.java 
b/test/jakarta/el/TestBeanELResolver.java
index 6847aca..5da3667 100644
--- a/test/jakarta/el/TestBeanELResolver.java
+++ b/test/jakarta/el/TestBeanELResolver.java
@@ -38,6 +38,7 @@ public class TestBeanELResolver {
 private static final String PROPERTY01_NAME = "valueA";
 private static final String PROPERTY02_NAME = "valueB";
 private static final String PROPERTY03_NAME = "name";
+private static final String PROPERTY04_NAME = "valueC";
 private static final String PROPERTY_VALUE = "test1";
 
 @Test
@@ -947,7 +948,7 @@ public class TestBeanELResolver {
 BeanELResolver resolver = new BeanELResolver();
 ELContext context = new 
StandardELContext(ELManager.getExpressionFactory());
 
-Object result = resolver.getValue(context, new Bean(), 
PROPERTY02_NAME);
+Object result = resolver.getValue(context, new Bean(), 
PROPERTY04_NAME);
 
 Assert.assertEquals("Default", result);
 Assert.assertTrue(context.isPropertyResolved());
@@ -964,7 +965,7 @@ public class TestBeanELResolver {
 
 
 public interface MyInterface {
-default String getValueB() {
+default String getValueC() {
 return "Default";
 }
 }

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

[tomcat] 02/04: Provide implementation of isParametersProvided

This is an automated email from the ASF dual-hosted git repository.

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

commit 8650cbb6104d09d247d7df5848e64ab12a598835
Author: Mark Thomas 
AuthorDate: Thu Sep 9 09:53:59 2021 +0100

Provide implementation of isParametersProvided
---
 java/org/apache/jasper/el/JspMethodExpression.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/jasper/el/JspMethodExpression.java 
b/java/org/apache/jasper/el/JspMethodExpression.java
index 6e336f6..bc9ad0a 100644
--- a/java/org/apache/jasper/el/JspMethodExpression.java
+++ b/java/org/apache/jasper/el/JspMethodExpression.java
@@ -125,6 +125,11 @@ public final class JspMethodExpression extends 
MethodExpression implements
 }
 
 @Override
+public boolean isParametersProvided() {
+return this.target.isParametersProvided();
+}
+
+@Override
 public boolean equals(Object obj) {
 return this.target.equals(obj);
 }

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

[tomcat] branch main updated (386912a -> 0b36542)

This is an automated email from the ASF dual-hosted git repository.

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


from 386912a  Fix BZ 65563. Correct parsing of Content-Range headers
 new 39a2f1d  More version updates
 new 8650cbb  Provide implementation of isParametersProvided
 new 8a9b1c4  Fix failing tests
 new 0b36542  Add support for Servlet 5 to WebXml.toString()

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 BUILDING.txt   |  2 +-
 RELEASE-NOTES  |  2 +-
 build.xml  |  4 ++--
 java/org/apache/catalina/connector/CoyoteAdapter.java  |  2 +-
 java/org/apache/jasper/Constants.java  |  2 +-
 java/org/apache/jasper/compiler/Generator.java |  2 +-
 java/org/apache/jasper/compiler/Validator.java |  3 ++-
 java/org/apache/jasper/el/JspMethodExpression.java |  5 +
 java/org/apache/jasper/resources/LocalStrings.properties   |  2 +-
 .../org/apache/jasper/resources/LocalStrings_es.properties |  2 +-
 .../org/apache/jasper/resources/LocalStrings_fr.properties |  2 +-
 .../org/apache/jasper/resources/LocalStrings_ja.properties |  2 +-
 .../org/apache/jasper/resources/LocalStrings_ko.properties |  2 +-
 .../apache/jasper/resources/LocalStrings_zh_CN.properties  |  2 +-
 java/org/apache/tomcat/util/descriptor/web/WebXml.java |  3 +++
 test/jakarta/el/TestBeanELResolver.java|  5 +++--
 test/org/apache/jasper/compiler/TestJspDocumentParser.java | 12 +++-
 test/org/apache/tomcat/util/descriptor/web/TestWebXml.java |  5 +
 .../{document-1.1.jspx => document-3.2.jspx}   |  2 +-
 .../{document-1.1.jspx => document-4.0.jspx}   |  2 +-
 .../document-3.1.jspx  |  0
 webapps/docs/appdev/deployment.xml |  2 +-
 webapps/docs/appdev/introduction.xml   |  8 
 webapps/docs/class-loader-howto.xml|  2 +-
 webapps/docs/index.xml | 14 +++---
 webapps/docs/project.xml   |  2 +-
 26 files changed, 58 insertions(+), 33 deletions(-)
 copy test/webapp/jsp/doc-version-invalid/{document-1.1.jspx => 
document-3.2.jspx} (92%)
 copy test/webapp/jsp/doc-version-invalid/{document-1.1.jspx => 
document-4.0.jspx} (92%)
 rename test/webapp/jsp/{doc-version-invalid => 
doc-version-valid}/document-3.1.jspx (100%)

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

Re: [VOTE] Release Apache Tomcat 9.0.53

2021-09-09 Thread Rémy Maucherat

On Mon, Sep 6, 2021 at 9:21 PM Rémy Maucherat  wrote:
>
> The proposed Apache Tomcat 9.0.53 release is now available for voting.
>
> The notable changes compared to 9.0.53 are:
>
> - Add a UserDatabase implementation as a superset of the DataSourceRealm
>functionality.
>
> - Update the internal fork of Apache Commons DBCP to 2.9.0 and Apache
>Commons Pool to 2.11.1
>
> - Update the packaged version of the Tomcat Native Library to 1.2.31 to
>pick up Windows binaries built with OpenSSL 1.1.1l.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat-9.0.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.53/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1332
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.53
> 966ec5401970b9d4b41b53f5fff9f65966d887dd
>
> The proposed 9.0.53 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.53 (stable)

Rémy

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

Re: building Tomcat with a third-party library

2021-09-09 Thread Martin Grigorov

On Wed, Sep 8, 2021 at 11:34 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> Alain,
>
> On 9/8/21 14:26, alain hubert wrote:
> > Hello,
> >
> > my colleagues just gave me a challenge before I can retire but the
> problem
> > is I haven't done anything else than Email/Excel for years, being an
> > old-school manager. Please be indulgent.
> >
> > It took hours before I could find the Tomcat source, unzip it, and much
> > more to understand the magics with ANT which needs Java to run (I was
> > ashamed to learn that but the Tomcat documentation is well written,
> thanks).
> >
> > Here I am blocked, I need to implement a very simple Authenticator
> relying
> > on a proprietary Java library.
> > When adding the import lines for importing this proprietary package, it's
> > not possible to compile anymore.
>
> How important is it to build Tomcat *with* your custom library? What if,
> instead, you compiled your library separately and used Tomcat as a
> (previously-built) dependency?
>

As Chris suggested you could use Tomcat's jars as dependencies to build
your own library.
See https://search.maven.org/artifact/org.apache.tomcat/tomcat-catalina
Then put your-library.jar either in yourApp.war#lib or in
$CATALINA_BASE/lib and configure your Authenticator in
yourApp.war#META-INF/context.xml or
$CATALINA_HOME/conf/context.xml/server.xml
See https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html and
https://tomcat.apache.org/tomcat-9.0-doc/config/valve.html#Authentication



>
> > I get the following errors. From what I understand, building Tomcat
> > with an additional library would need to add it somewhere but I was
> > not able to find this in the documentation. Does anyone have an
> > idea? >
> > thanks for reading
> > A.Hubert.
> >
> > compile:
> >  [javac] Compiling 1 source file to
> > /home/ahubert/tests/tomcat-src/apache-tomcat-9.0.52-src/output/classes
> >  [javac]
> >
> /home/ahubert/tests/tomcat-src/apache-tomcat-9.0.52-src/java/org/apache/catalina/authenticator/BasicAuthenticatorToto.java:19:
> > error: package com.exane.authentification does not exist
> >  [javac] import static com.exane.authentification.Authent.*;
> >  [javac]^
> >  [javac]
> >
> /home/ahubert/tests/tomcat-src/apache-tomcat-9.0.52-src/java/org/apache/catalina/authenticator/BasicAuthenticatorToto.java:20:
> > error: package com.exane.authentification does not exist
> >  [javac] import static com.exane.authentification.Verif.*;
> >  [javac]^
> >  [javac]
> >
> /home/ahubert/tests/tomcat-src/apache-tomcat-9.0.52-src/java/org/apache/catalina/authenticator/BasicAuthenticatorToto.java:22:
> > error: package com.exane.authentification does not exist
> >  [javac] import com.exane.authentification.*;
> >  [javac] ^
> >  [javac] 3 errors
> >
> > BUILD FAILED
> > /home/ahubert/tests/tomcat-src/apache-tomcat-9.0.52-src/build.xml:973:
> > Compile failed; see the compiler error output for details.
>
> Where are the source files for com.exane.* to be found?
>

If you decide to modify Tomcat's sources directly then you should add your
library to the build classpath.
See
https://github.com/apache/tomcat/blob/386912a93f130078f52e7094be3a730cda742121/build.xml#L214-L221
The sources of com.exane.* are not really needed. You need the classes,
i.e. the jar.

Martin


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

[Bug 65563] DefaultServlet's doPut returns HTTP code 400 when using Content-Range

https://bz.apache.org/bugzilla/show_bug.cgi?id=65563

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #3 from Mark Thomas  ---
Thanks for the report, PR and analysis. Good quality bug reports like this are
always appreciated.

Fixed in:
- 10.1.x for 10.1.0-M6 onwards
- 10.0.x for 10.0.12 onwards
- 9.0.x for 9.0.54 onwards
- 8.5.x for 8.5.71 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf closed pull request #449: Fix ContentRange parser



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


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

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



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

[GitHub] [tomcat] markt-asf commented on pull request #449: Fix ContentRange parser



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


   Thanks for the PR. I applied the PR manually as I wanted to make a few 
changes:
   - add a comment explaining why we don't explicitly parse for SP
   - add some additional tests
   - add a change log entry


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

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

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



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

[tomcat] branch 8.5.x updated: Fix BZ 65563. Correct parsing of Content-Range headers

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 893b141  Fix BZ 65563. Correct parsing of Content-Range headers
893b141 is described below

commit 893b141dace403e7adc46988c49636ece827317b
Author: Mark Thomas 
AuthorDate: Thu Sep 9 08:36:12 2021 +0100

Fix BZ 65563. Correct parsing of Content-Range headers

Tomcat was incorrectly requiring an '=' character after "bytes". Fix
based on pull request #449  by Thierry Guérin.
---
 .../tomcat/util/http/parser/ContentRange.java  |  8 
 .../catalina/servlets/TestDefaultServletPut.java   | 24 ++
 webapps/docs/changelog.xml |  6 ++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/ContentRange.java 
b/java/org/apache/tomcat/util/http/parser/ContentRange.java
index 59bf071..d77a0e4 100644
--- a/java/org/apache/tomcat/util/http/parser/ContentRange.java
+++ b/java/org/apache/tomcat/util/http/parser/ContentRange.java
@@ -71,10 +71,10 @@ public class ContentRange {
 return null;
 }
 
-// Must be followed by '='
-if (HttpParser.skipConstant(input, "=") == SkipResult.NOT_FOUND) {
-return null;
-}
+// Must be followed by SP. Parser is lenient and accepts any LWS here.
+// No need for explicit check as something must have terminated the
+// token and if that something was anything other than LWS the 
following
+// call to readLong() will fail.
 
 // Start
 long start = HttpParser.readLong(input);
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletPut.java 
b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
index 09c30ff..e2e0058 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletPut.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
@@ -52,30 +52,36 @@ public class TestDefaultServletPut extends TomcatBaseTest {
 
 // Valid partial PUT
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
+"Content-Range: bytes 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
 // Full PUT
 parameterSets.add(new Object[] {
 "", null, PATCH_TEXT, Boolean.TRUE });
 // Invalid range
 parameterSets.add(new Object[] {
-"Content-Range: apples=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
+"Content-Range: apples 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
 "Content-Range: bytes00-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes0-" + PATCH_LEN + "/" + START_LEN + CRLF, 
Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes@0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+"Content-Range: bytes -7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/0x5" + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+paramete

[tomcat] branch 9.0.x updated: Fix BZ 65563. Correct parsing of Content-Range headers

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f806d4f  Fix BZ 65563. Correct parsing of Content-Range headers
f806d4f is described below

commit f806d4fb11c247517a17b59192c28642a56f31b7
Author: Mark Thomas 
AuthorDate: Thu Sep 9 08:36:12 2021 +0100

Fix BZ 65563. Correct parsing of Content-Range headers

Tomcat was incorrectly requiring an '=' character after "bytes". Fix
based on pull request #449  by Thierry Guérin.
---
 .../tomcat/util/http/parser/ContentRange.java  |  8 
 .../catalina/servlets/TestDefaultServletPut.java   | 24 ++
 webapps/docs/changelog.xml | 10 +
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/ContentRange.java 
b/java/org/apache/tomcat/util/http/parser/ContentRange.java
index 59bf071..d77a0e4 100644
--- a/java/org/apache/tomcat/util/http/parser/ContentRange.java
+++ b/java/org/apache/tomcat/util/http/parser/ContentRange.java
@@ -71,10 +71,10 @@ public class ContentRange {
 return null;
 }
 
-// Must be followed by '='
-if (HttpParser.skipConstant(input, "=") == SkipResult.NOT_FOUND) {
-return null;
-}
+// Must be followed by SP. Parser is lenient and accepts any LWS here.
+// No need for explicit check as something must have terminated the
+// token and if that something was anything other than LWS the 
following
+// call to readLong() will fail.
 
 // Start
 long start = HttpParser.readLong(input);
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletPut.java 
b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
index 09c30ff..e2e0058 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletPut.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
@@ -52,30 +52,36 @@ public class TestDefaultServletPut extends TomcatBaseTest {
 
 // Valid partial PUT
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
+"Content-Range: bytes 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
 // Full PUT
 parameterSets.add(new Object[] {
 "", null, PATCH_TEXT, Boolean.TRUE });
 // Invalid range
 parameterSets.add(new Object[] {
-"Content-Range: apples=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
+"Content-Range: apples 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
 "Content-Range: bytes00-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes0-" + PATCH_LEN + "/" + START_LEN + CRLF, 
Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes@0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+"Content-Range: bytes -7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/0x5" + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+param

[tomcat] branch 10.0.x updated: Fix BZ 65563. Correct parsing of Content-Range headers

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new b218d53  Fix BZ 65563. Correct parsing of Content-Range headers
b218d53 is described below

commit b218d531bda1b081916289044a3558414723a396
Author: Mark Thomas 
AuthorDate: Thu Sep 9 08:36:12 2021 +0100

Fix BZ 65563. Correct parsing of Content-Range headers

Tomcat was incorrectly requiring an '=' character after "bytes". Fix
based on pull request #449  by Thierry Guérin.
---
 .../tomcat/util/http/parser/ContentRange.java  |  8 
 .../catalina/servlets/TestDefaultServletPut.java   | 24 ++
 webapps/docs/changelog.xml | 10 +
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/ContentRange.java 
b/java/org/apache/tomcat/util/http/parser/ContentRange.java
index 59bf071..d77a0e4 100644
--- a/java/org/apache/tomcat/util/http/parser/ContentRange.java
+++ b/java/org/apache/tomcat/util/http/parser/ContentRange.java
@@ -71,10 +71,10 @@ public class ContentRange {
 return null;
 }
 
-// Must be followed by '='
-if (HttpParser.skipConstant(input, "=") == SkipResult.NOT_FOUND) {
-return null;
-}
+// Must be followed by SP. Parser is lenient and accepts any LWS here.
+// No need for explicit check as something must have terminated the
+// token and if that something was anything other than LWS the 
following
+// call to readLong() will fail.
 
 // Start
 long start = HttpParser.readLong(input);
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletPut.java 
b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
index 09c30ff..e2e0058 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletPut.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
@@ -52,30 +52,36 @@ public class TestDefaultServletPut extends TomcatBaseTest {
 
 // Valid partial PUT
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
+"Content-Range: bytes 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
 // Full PUT
 parameterSets.add(new Object[] {
 "", null, PATCH_TEXT, Boolean.TRUE });
 // Invalid range
 parameterSets.add(new Object[] {
-"Content-Range: apples=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
+"Content-Range: apples 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
 "Content-Range: bytes00-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes0-" + PATCH_LEN + "/" + START_LEN + CRLF, 
Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes@0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+"Content-Range: bytes -7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/0x5" + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+par

[tomcat] branch main updated: Fix BZ 65563. Correct parsing of Content-Range headers

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 386912a  Fix BZ 65563. Correct parsing of Content-Range headers
386912a is described below

commit 386912a93f130078f52e7094be3a730cda742121
Author: Mark Thomas 
AuthorDate: Thu Sep 9 08:36:12 2021 +0100

Fix BZ 65563. Correct parsing of Content-Range headers

Tomcat was incorrectly requiring an '=' character after "bytes". Fix
based on pull request #449  by Thierry Guérin.
---
 .../tomcat/util/http/parser/ContentRange.java  |  8 
 .../catalina/servlets/TestDefaultServletPut.java   | 24 ++
 webapps/docs/changelog.xml | 10 +
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/parser/ContentRange.java 
b/java/org/apache/tomcat/util/http/parser/ContentRange.java
index 59bf071..d77a0e4 100644
--- a/java/org/apache/tomcat/util/http/parser/ContentRange.java
+++ b/java/org/apache/tomcat/util/http/parser/ContentRange.java
@@ -71,10 +71,10 @@ public class ContentRange {
 return null;
 }
 
-// Must be followed by '='
-if (HttpParser.skipConstant(input, "=") == SkipResult.NOT_FOUND) {
-return null;
-}
+// Must be followed by SP. Parser is lenient and accepts any LWS here.
+// No need for explicit check as something must have terminated the
+// token and if that something was anything other than LWS the 
following
+// call to readLong() will fail.
 
 // Start
 long start = HttpParser.readLong(input);
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletPut.java 
b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
index 09c30ff..e2e0058 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletPut.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletPut.java
@@ -52,30 +52,36 @@ public class TestDefaultServletPut extends TomcatBaseTest {
 
 // Valid partial PUT
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
+"Content-Range: bytes 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.TRUE, END_TEXT, Boolean.TRUE });
 // Full PUT
 parameterSets.add(new Object[] {
 "", null, PATCH_TEXT, Boolean.TRUE });
 // Invalid range
 parameterSets.add(new Object[] {
-"Content-Range: apples=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
+"Content-Range: apples 0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
 "Content-Range: bytes00-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes0-" + PATCH_LEN + "/" + START_LEN + CRLF, 
Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes=0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes@0-" + PATCH_LEN + "/" + START_LEN + 
CRLF, Boolean.FALSE, START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+"Content-Range: bytes -7/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
 parameterSets.add(new Object[] {
-"Content-Range: bytes=0-5/0x5" + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+"Content-Range: bytes 9-/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 9-X/" + START_LEN + CRLF, Boolean.FALSE, 
START_TEXT, Boolean.TRUE });
+parameterSets.add(new Object[] {
+"Content-Range: bytes 0-5/" + CRLF, Boolean.FALSE, START_TEXT, 
Boolean.TRUE });
+paramet

[Bug 65563] DefaultServlet's doPut returns HTTP code 400 when using Content-Range