Re: git-fu is (still) weak

[Martin Grigorov]

Hi Chris,

On Tue, Apr 28, 2020 at 5:58 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Coty,
>
> On 4/28/20 10:45, Coty Sutherland wrote:
> >
> >
> > On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz
> >  > >
> wrote:
> >
> > Rémy,
> >
> > On 4/27/20 18:41, Rémy Maucherat wrote:
> >> On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz
> >>  >> 
> >>  > >> wrote:
> >
> >> All,
> >
> >> I tried again to commit to tc10 branch, got commit id
> >> 8dddc11512fbd3b91ed9d737a42e4b8415458ddf.
> >
> >> Moving to tc9 branch:
> >
> >> $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> >> fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf
> >
> >> - From tc10:
> >
> >> $ git remote -v origin  https://github.com/apache/tomcat (fetch)
> >> origin  https://github.com/apache/tomcat (push)
> >
> >> - From tc9.0.x:
> >
> >> $ git remote -v origin  https://github.com/apache/tomcat (fetch)
> >> origin  https://github.com/apache/tomcat (push)
> >
> >> My 9.0.x local is all up-to-date with github, and github can see
> >> the commit in tc10.
> >
> >> Other than manually handing the diffs myself, I have no idea
> >> what to do, next. :(
> >
> >
> >>> I tried and it looked "ok" to me.
> >
> > Okay, what did you do? When I try to cherry-pick from 10 -> 9 I
> > still get the "bad object" error.
> >
> > When cherry-picking your commits from 9.0.x -> 8.5.x, I get a
> > merge-conflict (of course) because you have already merged them.
> >
> > Did I do something weird with the first commit?
> >
> > Maybe I don't have my branches in order?
> >
> > - From my tomcat-trunk (10) directory:
> >
> > $ git branch -a 9.0.x * master remotes/origin/7.0.x
> > remotes/origin/8.5.x remotes/origin/9.0.x
> > remotes/origin/BZ-63636/tomcat-8.5.x
> > remotes/origin/BZ-63636/tomcat-9.0.x remotes/origin/BZ-63681/8.5.x
> > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/8.5.x
> > remotes/origin/BZ-63835/9.0.x remotes/origin/HEAD -> origin/master
> > remotes/origin/master
> >
> > - From my tomcat-9.0.x directory:
> >
> > $ git branch -a * 9.0.x master remotes/origin/9.0.x
> >
> > - From my tomcat-8.5.x directory:
> >
> > $ git branch -a * 8.5.x remotes/origin/7.0.x remotes/origin/8.5.x
> > remotes/origin/9.0.x remotes/origin/BZ-63681/8.5.x
> > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/9.0.x
> > remotes/origin/HEAD -> origin/master remotes/origin/master
> >
> > My 9.0.x checkout seems "light".
> >
> >
> >> Have you tried a `git fetch origin master` from your 9.0 dir?
> >> That'll update the gitdb with new objects and refs from master,
> >> which should include the one you're trying to pick. That's the
> >> only thing I can think of given that you know your object ID is
> >> correct and present in master on upstream :)
>
> That got 'er goin'!
>
> It definitely fetched a bunch of stuff, but no new files, etc.
> (because becasue I was "up-to-date"). How can I be "up-to-date"
> without being "up-to-date"? :(
>

I see these options for you:

1) don't use several directories for the different branches.
Use just one and switch between branches:
git checkout master / git checkout 9.0.x / git checkout 8.5.x

2) use https://git-scm.com/docs/git-worktree if you prefer to have separate
folder for each branch


>
> Maybe now I can go back and merge the original commits from this
> thread from February.
>
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6oRIAACgkQHPApP6U8
> pFhtsA/9HHIvXZSbOsJuiBSkc0mBLonbtnvu5SOGizvcHZwPymfQgv+SC4yxiam+
> oAXEcBOfXnFG+bdBeD80F16xQOXDOT1ndSwMASA2LzdG2iDqSVVD2DvoqX3Sna3N
> +5Rp40GpIpctVLaz6rp/xTey9pZhFGy+qAjV6lssykU2Dm0trh8JNsWW4qd5Dd14
> RjLSVPN3fmxJ71hXJ3s5X8AufJmxi/TnMfC5h883WpyCM6Wsd1S7E4joXLPXt3LT
> qt82OBCpG23TIAM3CWeBykuKtbpnQ7eSmvMUPiBf8mG/6YoiBoGwuswsZPpDnLj6
> 6j4ni9IjSbPbbt7n5DBFa+QDZ6huIWH5iKcrX27ytQxVDHgDK5J9evHaTK9DbdqW
> xdFdpJ5q2swC+EhZmzz524jQWWcXsUIR0kABtT8MRlW33/5Q23m9ImBu9u58Ep+m
> vGmg8wCezCXAybCYQ86yjVICIINCd4GErrqh5KPbzMfOmTrvi0CTiqiJl9bsLdXr
> MpgbLlKzuaOswFVeI/KbfkKquWZedQVB9Ult2fDNtpRPuqxpjeyJAgu4gTtuwXy4
> +Mr+YFO9zaS49wxBo92L7ZqVn2tYPiMdzxj+39xMKwt5lj+76gq9Iyn7leKxrEZM
> skqHJql7EgIwZ+xTVPlAdtERvbq6FkBHAnJxqAYDydkTVSC7CKY=
> =9c6q
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] branch master updated: Don't swallow I/O exceptions when Manager tries to find a session

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e9bbb5b  Don't swallow I/O exceptions when Manager tries to find a 
session
e9bbb5b is described below

commit e9bbb5b1708e59c0388b125b87a9d710366547a9
Author: Mark Thomas 
AuthorDate: Wed Apr 29 10:03:59 2020 +0100

Don't swallow I/O exceptions when Manager tries to find a session
---
 java/org/apache/catalina/connector/LocalStrings.properties | 1 +
 java/org/apache/catalina/connector/Request.java| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings.properties 
b/java/org/apache/catalina/connector/LocalStrings.properties
index ef7d28f..11aaf22 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -83,6 +83,7 @@ request.asyncNotSupported=A filter or servlet of the current 
chain does not supp
 request.fragmentInDispatchPath=The fragment in dispatch path [{0}] has been 
removed
 request.illegalWrap=The request wrapper must wrap the request obtained from 
getRequest()
 request.notAsync=It is illegal to call this method if the current request is 
not in asynchronous mode (i.e. isAsyncStarted() returns false)
+request.session.failed=Failed to load session [{0}] due to [{1}]
 
 requestFacade.nullRequest=The request object has been recycled and is no 
longer associated with this facade
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 84549d0..a40fc3f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2943,6 +2943,11 @@ public class Request implements HttpServletRequest {
 try {
 session = manager.findSession(requestedSessionId);
 } catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()), e);
+} else {
+log.info(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()));
+}
 session = null;
 }
 if ((session != null) && !session.isValid()) {


-
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: Don't swallow I/O exceptions when Manager tries to find a session

[markt]

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 bc6b855  Don't swallow I/O exceptions when Manager tries to find a 
session
bc6b855 is described below

commit bc6b8550b4821382fa7a46b08700a12176d3a92c
Author: Mark Thomas 
AuthorDate: Wed Apr 29 10:03:59 2020 +0100

Don't swallow I/O exceptions when Manager tries to find a session
---
 java/org/apache/catalina/connector/LocalStrings.properties | 1 +
 java/org/apache/catalina/connector/Request.java| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings.properties 
b/java/org/apache/catalina/connector/LocalStrings.properties
index b4b0f39..98ec857 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -83,6 +83,7 @@ request.asyncNotSupported=A filter or servlet of the current 
chain does not supp
 request.fragmentInDispatchPath=The fragment in dispatch path [{0}] has been 
removed
 request.illegalWrap=The request wrapper must wrap the request obtained from 
getRequest()
 request.notAsync=It is illegal to call this method if the current request is 
not in asynchronous mode (i.e. isAsyncStarted() returns false)
+request.session.failed=Failed to load session [{0}] due to [{1}]
 
 requestFacade.nullRequest=The request object has been recycled and is no 
longer associated with this facade
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 43342d6..42c8346 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2975,6 +2975,11 @@ public class Request implements HttpServletRequest {
 try {
 session = manager.findSession(requestedSessionId);
 } catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()), e);
+} else {
+log.info(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()));
+}
 session = null;
 }
 if ((session != null) && !session.isValid()) {


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

[tomcat] branch 7.0.x updated: BZ 64386: WebdavServlet does not send "getlastmodified" property for resource collection

[michaelo]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new f3c1835  BZ 64386: WebdavServlet does not send "getlastmodified" 
property for resource collection
f3c1835 is described below

commit f3c18356182dc12b677904a392deaa7521050c02
Author: Michael Osipov 
AuthorDate: Wed Apr 29 11:05:25 2020 +0200

BZ 64386: WebdavServlet does not send "getlastmodified" property for 
resource collection
---
 java/org/apache/catalina/servlets/WebdavServlet.java | 2 ++
 webapps/docs/changelog.xml   | 4 
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 4d0f8d4..2623a94 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -2218,6 +2218,8 @@ public class WebdavServlet extends DefaultServlet {
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.NO_CONTENT);
 }
 } else {
+generatedXML.writeProperty("D", "getlastmodified",
+FastHttpDateFormat.formatDate(lastModified));
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.OPENING);
 generatedXML.writeElement("D", "collection", 
XMLWriter.NO_CONTENT);
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.CLOSING);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2f548be..938bc08 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,6 +100,10 @@
 Add more descriptive error message in DefaultServlet for SC_NOT_FOUND.
 (michaelo)
   
+  
+64386: WebdavServlet does not send "getlastmodified"
+property for resource collections. (michaelo)
+  
 
   
   


-
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: BZ 64386: WebdavServlet does not send "getlastmodified" property for resource collection

[michaelo]

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

michaelo 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 c367786  BZ 64386: WebdavServlet does not send "getlastmodified" 
property for resource collection
c367786 is described below

commit c36778635be411f9d41521fc84ad68d5d6568327
Author: Michael Osipov 
AuthorDate: Wed Apr 29 11:05:25 2020 +0200

BZ 64386: WebdavServlet does not send "getlastmodified" property for 
resource collection
---
 java/org/apache/catalina/servlets/WebdavServlet.java | 2 ++
 webapps/docs/changelog.xml   | 4 
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 371de11..b3c558d 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -2087,6 +2087,8 @@ public class WebdavServlet extends DefaultServlet {
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.NO_CONTENT);
 }
 } else {
+generatedXML.writeProperty("D", "getlastmodified",
+FastHttpDateFormat.formatDate(lastModified));
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.OPENING);
 generatedXML.writeElement("D", "collection", 
XMLWriter.NO_CONTENT);
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.CLOSING);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5853387..4b1a44d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -89,6 +89,10 @@
 64384: Fix multipart configuration ignoring some parameters
 in some cases. (schultz)
   
+  
+64386: WebdavServlet does not send "getlastmodified"
+property for resource collections. (michaelo)
+  
 
   
   


-
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: BZ 64386: WebdavServlet does not send "getlastmodified" property for resource collection

[michaelo]

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

michaelo 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 267aff4  BZ 64386: WebdavServlet does not send "getlastmodified" 
property for resource collection
267aff4 is described below

commit 267aff45d2c48c7e6d6a50aecc767bdff6d7b71d
Author: Michael Osipov 
AuthorDate: Wed Apr 29 11:05:25 2020 +0200

BZ 64386: WebdavServlet does not send "getlastmodified" property for 
resource collection
---
 java/org/apache/catalina/servlets/WebdavServlet.java | 2 ++
 webapps/docs/changelog.xml   | 4 
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 371de11..b3c558d 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -2087,6 +2087,8 @@ public class WebdavServlet extends DefaultServlet {
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.NO_CONTENT);
 }
 } else {
+generatedXML.writeProperty("D", "getlastmodified",
+FastHttpDateFormat.formatDate(lastModified));
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.OPENING);
 generatedXML.writeElement("D", "collection", 
XMLWriter.NO_CONTENT);
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.CLOSING);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1629207..479ab6d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -87,6 +87,10 @@
 64384: Fix multipart configuration ignoring some parameters
 in some cases. (schultz)
   
+  
+64386: WebdavServlet does not send "getlastmodified"
+property for resource collections. (michaelo)
+  
 
   
   


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

[tomcat] branch master updated: BZ 64386: WebdavServlet does not send "getlastmodified" property for resource collection

[michaelo]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 796b65b  BZ 64386: WebdavServlet does not send "getlastmodified" 
property for resource collection
796b65b is described below

commit 796b65b7e4868e0bd14c6cf4b3bcda4eb86ba9ab
Author: Michael Osipov 
AuthorDate: Wed Apr 29 11:05:25 2020 +0200

BZ 64386: WebdavServlet does not send "getlastmodified" property for 
resource collection
---
 java/org/apache/catalina/servlets/WebdavServlet.java | 2 ++
 webapps/docs/changelog.xml   | 4 
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 683437c..94b0df0 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -2088,6 +2088,8 @@ public class WebdavServlet extends DefaultServlet {
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.NO_CONTENT);
 }
 } else {
+generatedXML.writeProperty("D", "getlastmodified",
+FastHttpDateFormat.formatDate(lastModified));
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.OPENING);
 generatedXML.writeElement("D", "collection", 
XMLWriter.NO_CONTENT);
 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.CLOSING);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b874a3d..18f1325 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -102,6 +102,10 @@
 64384: Fix multipart configuration ignoring some parameters
 in some cases. (schultz)
   
+  
+64386: WebdavServlet does not send "getlastmodified"
+property for resource collections. (michaelo)
+  
 
   
   


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

[Bug 63636] Context#findRoleMapping() never called in StandardWrapper#findSecurityReference()

[bugzilla]

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

--- Comment #3 from Michael Osipov  ---
Fixed in:
- master for 10.0.0-M5 and onwards
- 9.0.x  for 9.0.35 and onwards
- 8.5.x for 8.5.55 and onwards
- 7.0.x for 7.0.104 and 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

[Bug 64386] WebdavServlet does not send "getlastmodified" property for resource collections

[bugzilla]

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

Michael Osipov  changed:

   What|Removed |Added

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

--- Comment #1 from Michael Osipov  ---
Fixed in:
- master for 10.0.0-M5 and onwards
- 9.0.x  for 9.0.35 and onwards
- 8.5.x for 8.5.55 and onwards
- 7.0.x for 7.0.104 and 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

[tomcat] branch 7.0.x updated: Don't swallow I/O exceptions when Manager tries to find a session

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 8a03f1a  Don't swallow I/O exceptions when Manager tries to find a 
session
8a03f1a is described below

commit 8a03f1ad1d173aa09d9c927dc262c2c944258ab0
Author: Mark Thomas 
AuthorDate: Wed Apr 29 10:03:59 2020 +0100

Don't swallow I/O exceptions when Manager tries to find a session
---
 java/org/apache/catalina/connector/LocalStrings.properties | 1 +
 java/org/apache/catalina/connector/Request.java| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings.properties 
b/java/org/apache/catalina/connector/LocalStrings.properties
index 1336726..cef1411 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -89,6 +89,7 @@ mapperListener.unregisterWrapper=Unregister Wrapper [{0}] in 
Context [{1}] for c
 request.asyncNotSupported=A filter or servlet of the current chain does not 
support asynchronous operations.
 request.fragmentInDispatchPath=The fragment in dispatch path [{0}] has been 
removed
 request.notAsync=It is illegal to call this method if the current request is 
not in asynchronous mode (i.e. isAsyncStarted() returns false)
+request.session.failed=Failed to load session [{0}] due to [{1}]
 
 requestFacade.nullRequest=The request object has been recycled and is no 
longer associated with this facade
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 59f91f7..4355f05 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3156,6 +3156,11 @@ public class Request implements HttpServletRequest {
 try {
 session = manager.findSession(requestedSessionId);
 } catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()), e);
+} else {
+log.info(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()));
+}
 session = null;
 }
 if ((session != null) && !session.isValid()) {


-
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: Don't swallow I/O exceptions when Manager tries to find a session

[markt]

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 103347f  Don't swallow I/O exceptions when Manager tries to find a 
session
103347f is described below

commit 103347f097c46f6bcba1563580c2cf373594c130
Author: Mark Thomas 
AuthorDate: Wed Apr 29 10:03:59 2020 +0100

Don't swallow I/O exceptions when Manager tries to find a session
---
 java/org/apache/catalina/connector/LocalStrings.properties | 1 +
 java/org/apache/catalina/connector/Request.java| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings.properties 
b/java/org/apache/catalina/connector/LocalStrings.properties
index 364fd66..eea0161 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -82,6 +82,7 @@ request.asyncNotSupported=A filter or servlet of the current 
chain does not supp
 request.fragmentInDispatchPath=The fragment in dispatch path [{0}] has been 
removed
 request.illegalWrap=The request wrapper must wrap the request obtained from 
getRequest()
 request.notAsync=It is illegal to call this method if the current request is 
not in asynchronous mode (i.e. isAsyncStarted() returns false)
+request.session.failed=Failed to load session [{0}] due to [{1}]
 
 requestFacade.nullRequest=The request object has been recycled and is no 
longer associated with this facade
 
diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 2d13f82..8180aa9 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3014,6 +3014,11 @@ public class Request implements HttpServletRequest {
 try {
 session = manager.findSession(requestedSessionId);
 } catch (IOException e) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()), e);
+} else {
+log.info(sm.getString("request.session.failed", 
requestedSessionId, e.getMessage()));
+}
 session = null;
 }
 if ((session != null) && !session.isValid()) {


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

[Bug 63636] Context#findRoleMapping() never called in StandardWrapper#findSecurityReference()

[bugzilla]

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

--- Comment #4 from Michael Osipov  ---
(In reply to Michael Osipov from comment #3)
> Fixed in:
> - master for 10.0.0-M5 and onwards
> - 9.0.x  for 9.0.35 and onwards
> - 8.5.x for 8.5.55 and onwards
> - 7.0.x for 7.0.104 and onwards

That was nonsense, wrong BZ issue.

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

Re: [RESULT][VOTE] Release Apache Tomcat Native 1.2.24

[Mark Thomas]

The following votes were cast:

Binding:
+1: markt, mgrigorov, michaelo

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: r39173 - /dev/tomcat/tomcat-connectors/native/1.2.24/ /dev/tomcat/tomcat-connectors/native/README.html /release/tomcat/tomcat-connectors/native/1.2.24/ /release/tomcat/tomcat-connectors/na

[markt]

Author: markt
Date: Wed Apr 29 10:41:13 2020
New Revision: 39173

Log:
Release Apache Tomcat Native Connector 1.2.24

Added:
release/tomcat/tomcat-connectors/native/1.2.24/
  - copied from r39172, dev/tomcat/tomcat-connectors/native/1.2.24/
Removed:
dev/tomcat/tomcat-connectors/native/1.2.24/
dev/tomcat/tomcat-connectors/native/README.html
Modified:
release/tomcat/tomcat-connectors/native/README.html

Modified: release/tomcat/tomcat-connectors/native/README.html
==
--- release/tomcat/tomcat-connectors/native/README.html (original)
+++ release/tomcat/tomcat-connectors/native/README.html Wed Apr 29 10:41:13 2020
@@ -1,4 +1,4 @@
 The Apache Tomcat Native
 
-The latest release version is 1.2.23
+The latest release version is 1.2.24
 



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

[tomcat] branch master updated: Merge BufferPool15Impl into BufferPool

[remm]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8ed94f7  Merge BufferPool15Impl into BufferPool
8ed94f7 is described below

commit 8ed94f7a33f62315b1fd490ce2845a05660ffd35
Author: remm 
AuthorDate: Wed Apr 29 14:20:31 2020 +0200

Merge BufferPool15Impl into BufferPool

Also add (!!) a system property to configure the static buffer pool
size, since it was fixed to 100MB.
This static pool may not be beneficial anymore and could be reviewed.
---
 java/org/apache/catalina/tribes/io/BufferPool.java | 81 --
 .../catalina/tribes/io/BufferPool15Impl.java   | 67 --
 webapps/docs/changelog.xml |  9 +++
 webapps/docs/config/systemprops.xml|  6 ++
 4 files changed, 59 insertions(+), 104 deletions(-)

diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java 
b/java/org/apache/catalina/tribes/io/BufferPool.java
index a44a1da..4c77c20 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -17,68 +17,75 @@
 package org.apache.catalina.tribes.io;
 
 
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.apache.catalina.tribes.util.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
-/**
- *
- *
- * @version 1.0
- */
 public class BufferPool {
 private static final Log log = LogFactory.getLog(BufferPool.class);
 
-public static final int DEFAULT_POOL_SIZE = 100*1024*1024; //100MB
+public static final int DEFAULT_POOL_SIZE =
+
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
 100*1024*1024); //100MB
 
 protected static final StringManager sm = 
StringManager.getManager(BufferPool.class);
 
-
-
 protected static volatile BufferPool instance = null;
-protected final BufferPoolAPI pool;
-
-private BufferPool(BufferPoolAPI pool) {
-this.pool = pool;
-}
-
-public XByteBuffer getBuffer(int minSize, boolean discard) {
-if ( pool != null ) return pool.getBuffer(minSize, discard);
-else return new XByteBuffer(minSize,discard);
-}
-
-public void returnBuffer(XByteBuffer buffer) {
-if ( pool != null ) pool.returnBuffer(buffer);
-}
-
-public void clear() {
-if ( pool != null ) pool.clear();
-}
-
 
 public static BufferPool getBufferPool() {
 if (instance == null) {
 synchronized (BufferPool.class) {
 if (instance == null) {
-   BufferPoolAPI pool = new BufferPool15Impl();
-   pool.setMaxSize(DEFAULT_POOL_SIZE);
-   log.info(sm.getString("bufferPool.created",
-   Integer.toString(DEFAULT_POOL_SIZE), 
pool.getClass().getName()));
-   instance = new BufferPool(pool);
+BufferPool pool = new BufferPool();
+pool.setMaxSize(DEFAULT_POOL_SIZE);
+log.info(sm.getString("bufferPool.created",
+Integer.toString(DEFAULT_POOL_SIZE),
+pool.getClass().getName()));
+instance = pool;
 }
 }
 }
 return instance;
 }
 
+private BufferPool() {
+}
 
-public static interface BufferPoolAPI {
-public void setMaxSize(int bytes);
+public XByteBuffer getBuffer(int minSize, boolean discard) {
+XByteBuffer buffer = queue.poll();
+if ( buffer != null ) size.addAndGet(-buffer.getCapacity());
+if ( buffer == null ) buffer = new XByteBuffer(minSize,discard);
+else if ( buffer.getCapacity() <= minSize ) buffer.expand(minSize);
+buffer.setDiscard(discard);
+buffer.reset();
+return buffer;
+}
 
-public XByteBuffer getBuffer(int minSize, boolean discard);
+public void returnBuffer(XByteBuffer buffer) {
+if ( (size.get() + buffer.getCapacity()) <= maxSize ) {
+size.addAndGet(buffer.getCapacity());
+queue.offer(buffer);
+}
+}
+
+public void clear() {
+queue.clear();
+size.set(0);
+}
 
-public void returnBuffer(XByteBuffer buffer);
+protected int maxSize;
+protected final AtomicInteger size = new AtomicInteger(0);
+protected final ConcurrentLinkedQueue queue =
+new ConcurrentLinkedQueue<>();
 
-public void clear();
+public void setMaxSize(int bytes) {
+this.maxSize = bytes;
 }
+
+public int getMaxSize() {
+return maxSize;
+}
+
 }
diff --git a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java 
b/java/org/apache/catalina/tr

[tomcat] branch master updated: Import updated French translations from POEditor (by remm)

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 86cfa50  Import updated French translations from POEditor (by remm)
86cfa50 is described below

commit 86cfa50c9937ea29c126f3c50883774a6dc1e159
Author: Mark Thomas 
AuthorDate: Wed Apr 29 13:27:55 2020 +0100

Import updated French translations from POEditor (by remm)
---
 java/org/apache/catalina/core/LocalStrings_fr.properties |  1 -
 .../apache/catalina/manager/LocalStrings_fr.properties   |  1 +
 .../org/apache/catalina/realm/LocalStrings_fr.properties |  1 +
 .../apache/jasper/resources/LocalStrings_fr.properties   | 16 
 java/org/apache/naming/LocalStrings_fr.properties|  2 +-
 .../apache/tomcat/util/buf/LocalStrings_fr.properties|  2 ++
 webapps/docs/changelog.xml   |  4 
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 5252c8d..35d642e 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -72,7 +72,6 @@ aprListener.aprDestroy=Echec de l'arrêt de la librairie 
Apache Tomcat Native ba
 aprListener.aprInit=La librairie Apache Tomcat Native basée sur APR qui permet 
des performances optimales dans les environnements de production n''a pas été 
trouvée sur le java.library.path : [{0}]
 aprListener.aprInitDebug=La librairie Apache Tomcat Native basée sur APR n''a 
pas été trouvée en utilisant les noms [{0}] dans le java.library.path [{1}], 
les erreurs retournées sont [{2}]
 aprListener.aprInitError=La librairie Apache Tomcat Native basée sur APR n''a 
pas pu être chargée, l''erreur retournée est [{0}]
-aprListener.config=Configuration de APR/OpenSSL : useAprConnector [{0}], 
useOpenSSL [{1}]
 aprListener.currentFIPSMode=Mode FIPS actuel : [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener est configuré pour 
forcer le mode FIPS mais la librairie est déjà en mode FIPS [{0}]
 aprListener.flags=Fonctionnalités d''APR : IPv6 [{0}], sendfile [{1}], accept 
filters [{2}], random [{3}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index fd02ea2..ac83147 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -163,6 +163,7 @@ managerServlet.resourcesType=OK - Liste des ressources 
globales de type [{0}]
 managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a échoué : 
[{0}]
 managerServlet.saved=OK - Configuration serveur sauvegardée
 managerServlet.savedContext=OK - Configuration du contexte [{0}] sauvegardée
+managerServlet.savedContextFail=ECHEC - L''enregistrement de la configuration 
du Contexte [{0}] a échoué
 managerServlet.serverInfo=OK - Informations sur le serveur\n\
 Version de Tomcat : [{0}]\n\
 Nom de l''OS : [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties 
b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index f9a8529..f3f2382 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -20,6 +20,7 @@ combinedRealm.authSuccess=Authentifié l''utilisateur [{0}] 
avec le domaine [{1}
 combinedRealm.getPassword=La méthode getPassword() ne doit jamais être appelée
 combinedRealm.getPrincipal=La méthode getPrincipal() ne devrait jamais être 
appelée
 combinedRealm.realmStartFail=Impossible de démarrer le royaume [{0}]
+combinedRealm.setCredentialHandler=Un CredentialHandler a été défini sur une 
instance de CombinedRealm (ou une sous classe de CombinedRealm), et 
CombinedRealm ne supporte pas de CredentialHandler
 combinedRealm.unexpectedMethod=Un appel de méthode inattendu à été effectué 
sur le royaumes combiné
 
 credentialHandler.invalidStoredCredential=Le royaume a fourni des identifiants 
[{0}] invalides à comparer avec ceux fournis par le client
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 5718f2a..41a5fcd 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -292,9 +292,12 @@ jsp.warning.mappedFile=WARNING : Valeur incorrecte pour le 
initParam mappedFile.
 jsp.warning.maxLoadedJsps=WARNING : Valeur invalide pour le paramètre 
d'initialisation maxLoadedJsps, la valeur par défaut "-1" sera utilisée
 jsp.warning.modificationTestInterval=WARNING : Valeur invalide pour le 
paramètre d'initialisation modificationTestInterval, la valeur par défaut "4" 
secondes sera utilisée
 jsp.

[tomcat] branch master updated: Remove reason phrase on WebDAV Multi-Status (207) response

[michaelo]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 1c7dffa  Remove reason phrase on WebDAV Multi-Status (207) response
1c7dffa is described below

commit 1c7dffab075841bf7ea7fb802cc76a6ee99c03b0
Author: Michael Osipov 
AuthorDate: Wed Apr 29 14:38:52 2020 +0200

Remove reason phrase on WebDAV Multi-Status (207) response
---
 .../apache/catalina/servlets/WebdavServlet.java| 105 +
 webapps/docs/changelog.xml |   3 +
 2 files changed, 8 insertions(+), 100 deletions(-)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 94b0df0..63d352e 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -784,9 +784,7 @@ public class WebdavServlet extends DefaultServlet {
 // Removing any lock-null resource which would be present
 lockNullResources.remove(path);
 } else {
-resp.sendError(WebdavStatus.SC_CONFLICT,
-   WebdavStatus.getStatusText
-   (WebdavStatus.SC_CONFLICT));
+resp.sendError(WebdavStatus.SC_CONFLICT);
 }
 }
 
@@ -1190,8 +1188,7 @@ public class WebdavServlet extends DefaultServlet {
 XMLWriter.OPENING);
 generatedXML
 .writeText("HTTP/1.1 " + WebdavStatus.SC_LOCKED
-   + " " + WebdavStatus
-   .getStatusText(WebdavStatus.SC_LOCKED));
+   + " ");
 generatedXML.writeElement("D", "status",
 XMLWriter.CLOSING);
 
@@ -1942,8 +1939,7 @@ public class WebdavServlet extends DefaultServlet {
 generatedXML.writeText(absoluteUri + toAppend);
 generatedXML.writeElement("D", "href", XMLWriter.CLOSING);
 generatedXML.writeElement("D", "status", XMLWriter.OPENING);
-generatedXML.writeText("HTTP/1.1 " + errorCode + " "
-+ WebdavStatus.getStatusText(errorCode));
+generatedXML.writeText("HTTP/1.1 " + errorCode + " ");
 generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
 
 generatedXML.writeElement("D", "response", XMLWriter.CLOSING);
@@ -2048,8 +2044,7 @@ public class WebdavServlet extends DefaultServlet {
 String contentType, String eTag) {
 
 generatedXML.writeElement("D", "response", XMLWriter.OPENING);
-String status = "HTTP/1.1 " + WebdavStatus.SC_OK + " " +
-WebdavStatus.getStatusText(WebdavStatus.SC_OK);
+String status = "HTTP/1.1 " + WebdavStatus.SC_OK + " ";
 
 // Generating href element
 generatedXML.writeElement("D", "href", XMLWriter.OPENING);
@@ -2244,8 +2239,7 @@ public class WebdavServlet extends DefaultServlet {
 
 if (propertiesNotFoundList.hasMoreElements()) {
 
-status = "HTTP/1.1 " + WebdavStatus.SC_NOT_FOUND + " " +
-WebdavStatus.getStatusText(WebdavStatus.SC_NOT_FOUND);
+status = "HTTP/1.1 " + WebdavStatus.SC_NOT_FOUND + " ";
 
 generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
 generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
@@ -2529,19 +2523,6 @@ public class WebdavServlet extends DefaultServlet {
  */
 class WebdavStatus {
 
-
-// - Instance Variables
-
-
-/**
- * This Hashtable contains the mapping of HTTP and WebDAV
- * status codes to descriptive text.  This is a static
- * variable.
- */
-private static final Hashtable mapStatusCodes =
-new Hashtable<>();
-
-
 // -- HTTP Status Codes
 
 
@@ -2758,80 +2739,4 @@ class WebdavStatus {
  */
 public static final int SC_LOCKED = 423;
 
-
-//  Initializer
-
-
-static {
-// HTTP 1.0 status Code
-addStatusCodeMap(SC_OK, "OK");
-addStatusCodeMap(SC_CREATED, "Created");
-addStatusCodeMap(SC_ACCEPTED, "Accepted");
-addStatusCodeMap(SC_NO_CONTENT, "No Content");
-addStatusCodeMap(SC_MOVED_PERMANENTLY, "Moved Permanently");
-addStatusCodeMap(SC_MOVED_TEMPORARILY, "Moved Temporarily");
-addStatusCodeMap(SC_NOT_MODIFIED, "Not Modified");
-addStatusCodeMap(SC_BAD_REQUEST, "Bad Request");
-addStatusCodeMap(SC_UNAUTHORIZED, "Unauthorized");
-addStatusCodeMap(SC_FORBIDDEN, "Forbidden");
-addStatusCodeM

[tomcat] branch 9.0.x updated: Remove reason phrase on WebDAV Multi-Status (207) response

[michaelo]

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

michaelo 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 147fee4  Remove reason phrase on WebDAV Multi-Status (207) response
147fee4 is described below

commit 147fee447e27ec14e3001d9c727db1dcd4cb930c
Author: Michael Osipov 
AuthorDate: Wed Apr 29 14:38:52 2020 +0200

Remove reason phrase on WebDAV Multi-Status (207) response
---
 .../apache/catalina/servlets/WebdavServlet.java| 105 +
 webapps/docs/changelog.xml |   3 +
 2 files changed, 8 insertions(+), 100 deletions(-)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index b3c558d..228bab0 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -783,9 +783,7 @@ public class WebdavServlet extends DefaultServlet {
 // Removing any lock-null resource which would be present
 lockNullResources.remove(path);
 } else {
-resp.sendError(WebdavStatus.SC_CONFLICT,
-   WebdavStatus.getStatusText
-   (WebdavStatus.SC_CONFLICT));
+resp.sendError(WebdavStatus.SC_CONFLICT);
 }
 }
 
@@ -1189,8 +1187,7 @@ public class WebdavServlet extends DefaultServlet {
 XMLWriter.OPENING);
 generatedXML
 .writeText("HTTP/1.1 " + WebdavStatus.SC_LOCKED
-   + " " + WebdavStatus
-   .getStatusText(WebdavStatus.SC_LOCKED));
+   + " ");
 generatedXML.writeElement("D", "status",
 XMLWriter.CLOSING);
 
@@ -1941,8 +1938,7 @@ public class WebdavServlet extends DefaultServlet {
 generatedXML.writeText(absoluteUri + toAppend);
 generatedXML.writeElement("D", "href", XMLWriter.CLOSING);
 generatedXML.writeElement("D", "status", XMLWriter.OPENING);
-generatedXML.writeText("HTTP/1.1 " + errorCode + " "
-+ WebdavStatus.getStatusText(errorCode));
+generatedXML.writeText("HTTP/1.1 " + errorCode + " ");
 generatedXML.writeElement("D", "status", XMLWriter.CLOSING);
 
 generatedXML.writeElement("D", "response", XMLWriter.CLOSING);
@@ -2047,8 +2043,7 @@ public class WebdavServlet extends DefaultServlet {
 String contentType, String eTag) {
 
 generatedXML.writeElement("D", "response", XMLWriter.OPENING);
-String status = "HTTP/1.1 " + WebdavStatus.SC_OK + " " +
-WebdavStatus.getStatusText(WebdavStatus.SC_OK);
+String status = "HTTP/1.1 " + WebdavStatus.SC_OK + " ";
 
 // Generating href element
 generatedXML.writeElement("D", "href", XMLWriter.OPENING);
@@ -2243,8 +2238,7 @@ public class WebdavServlet extends DefaultServlet {
 
 if (propertiesNotFoundList.hasMoreElements()) {
 
-status = "HTTP/1.1 " + WebdavStatus.SC_NOT_FOUND + " " +
-WebdavStatus.getStatusText(WebdavStatus.SC_NOT_FOUND);
+status = "HTTP/1.1 " + WebdavStatus.SC_NOT_FOUND + " ";
 
 generatedXML.writeElement("D", "propstat", XMLWriter.OPENING);
 generatedXML.writeElement("D", "prop", XMLWriter.OPENING);
@@ -2528,19 +2522,6 @@ public class WebdavServlet extends DefaultServlet {
  */
 class WebdavStatus {
 
-
-// - Instance Variables
-
-
-/**
- * This Hashtable contains the mapping of HTTP and WebDAV
- * status codes to descriptive text.  This is a static
- * variable.
- */
-private static final Hashtable mapStatusCodes =
-new Hashtable<>();
-
-
 // -- HTTP Status Codes
 
 
@@ -2757,80 +2738,4 @@ class WebdavStatus {
  */
 public static final int SC_LOCKED = 423;
 
-
-//  Initializer
-
-
-static {
-// HTTP 1.0 status Code
-addStatusCodeMap(SC_OK, "OK");
-addStatusCodeMap(SC_CREATED, "Created");
-addStatusCodeMap(SC_ACCEPTED, "Accepted");
-addStatusCodeMap(SC_NO_CONTENT, "No Content");
-addStatusCodeMap(SC_MOVED_PERMANENTLY, "Moved Permanently");
-addStatusCodeMap(SC_MOVED_TEMPORARILY, "Moved Temporarily");
-addStatusCodeMap(SC_NOT_MODIFIED, "Not Modified");
-addStatusCodeMap(SC_BAD_REQUEST, "Bad Request");
-addStatusCodeMap(SC_UNAUTHORIZED, "Unauthorized");
-addStatusCodeMap(SC_FORBIDDEN, "Forbidden");
-addStatusCodeMap

[GitHub] [tomcat] k-tamura opened a new pull request #287: Fix typos

[GitBox]

k-tamura opened a new pull request #287:
URL: https://github.com/apache/tomcat/pull/287


   



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

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



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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 86cfa50c9937ea29c126f3c50883774a6dc1e159
Blamelist: Mark Thomas 

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

Fwd: Cannot find doap file: http://svn.apache.org/repos/asf/tomcat/taglibs/rdc/trunk/doap_rdc.rdf

[sebb]

Please can someone update
https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects.xml
with the new location of the DOAP?

Thanks.
-- Forwarded message -
From: Projects 
Date: Wed, 29 Apr 2020 at 03:01
Subject: Cannot find doap file:
http://svn.apache.org/repos/asf/tomcat/taglibs/rdc/trunk/doap_rdc.rdf
To: Site Development 


URL: http://svn.apache.org/repos/asf/tomcat/taglibs/rdc/trunk/doap_rdc.rdf
HTTP Error 404: Not Found
Source: 
https://svn.apache.org/repos/asf/comdev/projects.apache.org/trunk/data/projects.xml

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

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 1c7dffab075841bf7ea7fb802cc76a6ee99c03b0
Blamelist: Michael Osipov 

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 master updated: Remove java.io based sender and receiver

[remm]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new c1bbb10  Remove java.io based sender and receiver
c1bbb10 is described below

commit c1bbb10e73a110bafbf311017540dcdb4f53ec58
Author: remm 
AuthorDate: Wed Apr 29 17:03:41 2020 +0200

Remove java.io based sender and receiver

It's unlikely they are still used as they were not the default
configuration.
---
 .../catalina/tribes/transport/bio/BioReceiver.java | 154 ---
 .../tribes/transport/bio/BioReplicationTask.java   | 189 --
 .../catalina/tribes/transport/bio/BioSender.java   | 281 -
 .../tribes/transport/bio/LocalStrings.properties   |  40 ---
 .../transport/bio/LocalStrings_cs.properties   |  22 --
 .../transport/bio/LocalStrings_de.properties   |  18 --
 .../transport/bio/LocalStrings_es.properties   |  27 --
 .../transport/bio/LocalStrings_fr.properties   |  40 ---
 .../transport/bio/LocalStrings_ja.properties   |  40 ---
 .../transport/bio/LocalStrings_ko.properties   |  40 ---
 .../transport/bio/LocalStrings_pt_BR.properties|  18 --
 .../transport/bio/LocalStrings_ru.properties   |  16 --
 .../tribes/transport/bio/MultipointBioSender.java  | 156 
 .../tribes/transport/bio/PooledMultiSender.java|  62 -
 webapps/docs/changelog.xml |   4 +
 webapps/docs/config/cluster-receiver.xml   |  14 +-
 webapps/docs/config/cluster-sender.xml |  11 +-
 17 files changed, 12 insertions(+), 1120 deletions(-)

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java 
b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
deleted file mode 100644
index 3214ab5..000
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.catalina.tribes.transport.bio;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import org.apache.catalina.tribes.io.ObjectReader;
-import org.apache.catalina.tribes.transport.AbstractRxTask;
-import org.apache.catalina.tribes.transport.ReceiverBase;
-import org.apache.catalina.tribes.transport.RxTaskPool;
-import org.apache.catalina.tribes.util.StringManager;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-
-public class BioReceiver extends ReceiverBase implements Runnable {
-
-private static final Log log = LogFactory.getLog(BioReceiver.class);
-
-protected static final StringManager sm = 
StringManager.getManager(BioReceiver.class);
-
-protected ServerSocket serverSocket;
-
-public BioReceiver() {
-// NO-OP
-}
-
-@Override
-public void start() throws IOException {
-super.start();
-try {
-setPool(new RxTaskPool(getMaxThreads(),getMinThreads(),this));
-} catch (Exception x) {
-log.fatal(sm.getString("bioReceiver.threadpool.fail"), x);
-if ( x instanceof IOException ) throw (IOException)x;
-else throw new IOException(x.getMessage());
-}
-try {
-getBind();
-bind();
-String channelName = "";
-if (getChannel().getName() != null) channelName = "[" + 
getChannel().getName() + "]";
-Thread t = new Thread(this, "BioReceiver" + channelName);
-t.setDaemon(true);
-t.start();
-} catch (Exception x) {
-log.fatal(sm.getString("bioReceiver.start.fail"), x);
-if ( x instanceof IOException ) throw (IOException)x;
-else throw new IOException(x.getMessage());
-}
-}
-
-@Override
-public AbstractRxTask createRxTask() {
-return getReplicationThread();
-}
-
-protected BioReplicationTask getReplicationThread() {
-BioReplicationTask result = new BioReplicationTask(this);
-result.setOptions(getWorkerThreadOptions());
-result.setUseBufferPool(this.getUseBu

Re: Remove org.apache.catalina.tribes.transport.bio

[Rémy Maucherat]

On Tue, Apr 28, 2020 at 7:18 PM Mark Thomas  wrote:

> On 28/04/2020 17:30, Rémy Maucherat wrote:
> > Hi,
> >
> > I'm still looking at things to remove or refactor in 10 following the
> > rearchitecting failure for the Connector. One candidate could be the
> > Tribes transport, since NIO is the default and BIO is probably never
> used.
> >
> > Can it be removed ?
>
> I don't see why not.
>
> > There are a few classes here and there that could go too, for example
> > that BufferPool15Impl class. Given the name, I would say it could be
> > merged into the superclass.
>
> +1
>

Done. I wonder if this global static cache is actually that useful anymore.

Rémy


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

[tomcat] branch master updated: Remove unused entry

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new dc60ca0  Remove unused entry
dc60ca0 is described below

commit dc60ca0811e4dd87b9e9e120ee4551b40c0a3d1b
Author: Mark Thomas 
AuthorDate: Wed Apr 29 13:31:09 2020 +0100

Remove unused entry
---
 java/org/apache/catalina/core/LocalStrings_ko.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties 
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 43ce1b7..f685bac 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -72,7 +72,6 @@ aprListener.aprDestroy=APR 기반 Apache Tomcat Native 라이브러리를 셧다
 aprListener.aprInit=프로덕션 환경들에서 최적의 성능을 제공하는, APR 기반 Apache Tomcat Native 
라이브러리가, 다음 java.library.path에서 발견되지 않습니다: [{0}]
 aprListener.aprInitDebug=[{0}](이)라는 이름들을 사용하여, java.library.path [{1}]에서, APR 
기반 Apache Tomcat Native 라이브러리를 찾을 수 없습니다. 보고된 오류들: [{2}]
 aprListener.aprInitError=APR 기반 Apache Tomcat Native 라이브러리를 로드하지 못했습니다. 보고된 
오류는 [{0}]입니다.
-aprListener.config=APR/OpenSSL 설정: useAprConnector [{0}], useOpenSSL [{1}]
 aprListener.currentFIPSMode=현재의 FIPS 모드: [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener가 강제로 FIPS 모드로 들어가도록 
설정되었으나, 라이브러리가 이미 FIPS 모드 [{0}]에 있습니다.
 aprListener.flags=APR 용량정보들: IPv6 [{0}], sendfile [{1}], accept filters [{2}], 
random [{3}].


-
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 (147fee4 -> 4469b06)

[markt]

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

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


from 147fee4  Remove reason phrase on WebDAV Multi-Status (207) response
 new e6aa9b0  Back-port updates to English strings
 new 5b0e141  Update French translations (remm)
 new 4469b06  Expand and update Chinese translations

The 3 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/javax/el/LocalStrings_zh_CN.properties|   2 +
 java/javax/servlet/LocalStrings_zh_CN.properties   |   1 +
 .../servlet/http/LocalStrings_zh_CN.properties |   2 +
 .../authenticator/LocalStrings_zh_CN.properties|  16 +++
 .../jaspic/LocalStrings_zh_CN.properties   |   4 +
 .../catalina/connector/LocalStrings_fr.properties  |   1 +
 .../connector/LocalStrings_zh_CN.properties|  31 +
 .../apache/catalina/core/LocalStrings.properties   |  14 +-
 .../catalina/core/LocalStrings_zh_CN.properties| 149 +
 .../catalina/deploy/LocalStrings_zh_CN.properties  |   3 +
 .../catalina/filters/LocalStrings_zh_CN.properties |  19 +++
 .../ha/authenticator/LocalStrings_zh_CN.properties |   1 +
 .../ha/backend/LocalStrings_zh_CN.properties   |  17 +++
 .../ha/context/LocalStrings_zh_CN.properties   |   3 +
 .../ha/deploy/LocalStrings_zh_CN.properties|  21 +++
 .../ha/session/LocalStrings_zh_CN.properties   |  32 -
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  14 ++
 .../catalina/loader/LocalStrings_zh_CN.properties  |  32 +
 .../catalina/manager/LocalStrings_fr.properties|   1 +
 .../catalina/manager/LocalStrings_zh_CN.properties |   4 +-
 .../manager/host/LocalStrings_zh_CN.properties |   2 +-
 .../catalina/mapper/LocalStrings_zh_CN.properties  |  12 ++
 .../catalina/mbeans/LocalStrings_zh_CN.properties  |  46 +++
 .../catalina/realm/LocalStrings_fr.properties  |   1 +
 .../catalina/realm/LocalStrings_zh_CN.properties   |  51 +++
 .../security/LocalStrings_zh_CN.properties |   6 +
 .../servlets/LocalStrings_zh_CN.properties |  21 +++
 .../catalina/session/LocalStrings_zh_CN.properties |  33 -
 .../catalina/ssi/LocalStrings_zh_CN.properties |  30 +
 .../catalina/startup/LocalStrings_zh_CN.properties |  74 --
 .../storeconfig/LocalStrings_zh_CN.properties  |  20 +++
 .../tribes/group/LocalStrings_zh_CN.properties |   2 +
 .../interceptors/LocalStrings_zh_CN.properties |  53 ++--
 .../tribes/io/LocalStrings_zh_CN.properties|   4 +
 .../tribes/jmx/LocalStrings_zh_CN.properties   |   3 +
 .../membership/LocalStrings_zh_CN.properties   |  14 ++
 .../membership/cloud/LocalStrings_zh_CN.properties |   5 +
 .../tribes/tipis/LocalStrings_zh_CN.properties |  19 ++-
 .../tribes/transport/LocalStrings_zh_CN.properties |   3 +
 .../transport/nio/LocalStrings_zh_CN.properties|  12 ++
 .../tribes/util/LocalStrings_zh_CN.properties  |   5 +
 .../catalina/users/LocalStrings_zh_CN.properties   |   3 +
 .../catalina/util/LocalStrings_zh_CN.properties|  15 +++
 .../catalina/valves/LocalStrings_zh_CN.properties  |  47 +++
 .../valves/rewrite/LocalStrings_zh_CN.properties   |   4 +
 .../webresources/LocalStrings_zh_CN.properties |  18 +++
 .../apache/coyote/LocalStrings_zh_CN.properties|  20 +++
 .../coyote/ajp/LocalStrings_zh_CN.properties   |   6 +
 .../coyote/http11/LocalStrings_zh_CN.properties|  11 ++
 .../http11/filters/LocalStrings_zh_CN.properties   |   2 +
 .../http11/upgrade/LocalStrings_zh_CN.properties   |  10 ++
 .../coyote/http2/LocalStrings_zh_CN.properties |  66 +
 .../jasper/resources/LocalStrings_fr.properties|  12 +-
 .../jasper/resources/LocalStrings_zh_CN.properties | 138 ++-
 java/org/apache/naming/LocalStrings_fr.properties  |   2 +-
 .../apache/naming/LocalStrings_zh_CN.properties|   5 +
 .../naming/factory/LocalStrings_zh_CN.properties   |   7 +
 .../webservices}/LocalStrings_zh_CN.properties |   2 +-
 .../dbcp/dbcp2/LocalStrings_zh_CN.properties   |   6 +
 .../tomcat/util/LocalStrings_zh_CN.properties  |  10 ++
 .../tomcat/util/buf/LocalStrings_fr.properties |   2 +
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |  12 ++
 .../codec/binary}/LocalStrings_zh_CN.properties|   5 +-
 .../util/descriptor/LocalStrings_zh_CN.properties  |   5 +
 .../descriptor/tld}/LocalStrings_zh_CN.properties  |   2 +-
 .../descriptor/web/LocalStrings_zh_CN.properties   |  25 
 .../util/digester/LocalStrings_zh_CN.properties|  19 +++
 .../tomcat/util/http/LocalStrings_zh_CN.properties |   7 +
 .../util/http/parser/LocalStrings_zh_CN.properties |   6 +
 .../util/modeler/LocalStrings_zh_CN.properties |

[tomcat] 01/03: Back-port updates to English strings

[markt]

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

commit e6aa9b071b3231d89b7b4d262bed77a2cbe54bb2
Author: Mark Thomas 
AuthorDate: Wed Apr 29 17:40:33 2020 +0100

Back-port updates to English strings
---
 java/org/apache/catalina/core/LocalStrings.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index fda5ec3..f257de3 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -68,10 +68,10 @@ 
applicationServletRegistration.setServletSecurity.ise=Security constraints can''
 
 applicationSessionCookieConfig.ise=Property [{0}] cannot be added to 
SessionCookieConfig for context [{1}] as the context has been initialised
 
-aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native 
library
-aprListener.aprInit=The APR based Apache Tomcat Native library which allows 
optimal performance in production environments was not found on the 
java.library.path: [{0}]
-aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not 
be found using names [{0}] on the java.library.path [{1}]. The errors reported 
were [{2}]
-aprListener.aprInitError=The APR based Apache Tomcat Native library failed to 
load. The error reported was [{0}]
+aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
+aprListener.aprInit=The Apache Tomcat Native library which allows using 
OpenSSL was not found on the java.library.path: [{0}]
+aprListener.aprInitDebug=The Apache Tomcat Native library could not be found 
using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
+aprListener.aprInitError=The Apache Tomcat Native library failed to load. The 
error reported was [{0}]
 aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}], 
useOpenSSL [{1}]
 aprListener.currentFIPSMode=Current FIPS mode: [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode [{0}]
@@ -83,9 +83,9 @@ aprListener.initializingFIPS=Initializing FIPS mode...
 aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require 
the library to already be in FIPS mode, but it was not in FIPS mode
 aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.
 aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnInvalid=An incompatible version [{0}] of the APR based Apache 
Tomcat Native library is installed, while Tomcat requires version [{1}]
-aprListener.tcnValid=Loaded APR based Apache Tomcat Native library [{0}] using 
APR version [{1}].
-aprListener.tcnVersion=An older version [{0}] of the APR based Apache Tomcat 
Native library is installed, while Tomcat recommends a minimum version of [{1}]
+aprListener.tcnInvalid=An incompatible version [{0}] of the Apache Tomcat 
Native library is installed, while Tomcat requires version [{1}]
+aprListener.tcnValid=Loaded Apache Tomcat Native library [{0}] using APR 
version [{1}].
+aprListener.tcnVersion=An older version [{0}] of the Apache Tomcat Native 
library is installed, while Tomcat recommends a minimum version of [{1}]
 aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been 
initialized
 aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been 
initialized
 aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already 
been initialized


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

[tomcat] 02/03: Update French translations (remm)

[markt]

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

commit 5b0e1415a282fba4d5043e25e1af4c2865c308ea
Author: Mark Thomas 
AuthorDate: Wed Apr 29 17:41:58 2020 +0100

Update French translations (remm)
---
 .../org/apache/catalina/connector/LocalStrings_fr.properties |  1 +
 java/org/apache/catalina/manager/LocalStrings_fr.properties  |  1 +
 java/org/apache/catalina/realm/LocalStrings_fr.properties|  1 +
 java/org/apache/jasper/resources/LocalStrings_fr.properties  | 12 
 java/org/apache/naming/LocalStrings_fr.properties|  2 +-
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties   |  2 ++
 webapps/docs/changelog.xml   |  4 
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties 
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index dc9c608..3bdbe67 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -24,6 +24,7 @@ coyoteAdapter.nullRequest=Un dispatch asynchrone peut 
seulement se produire sur
 
 coyoteConnector.invalidEncoding=L''encodage [{0}] n''est pas reconnu par la 
JRE. Le connecteur (Connector) continuera à utiliser [{1}]
 coyoteConnector.invalidPort=Le connecteur ne peut pas démarrer, parce que la 
valeur spécifiée du port [{0}] n''est pas valide
+coyoteConnector.notAsciiSuperset=L''encodage [{0}] n''inclut pas l''ASCII 
comme requis par la RFC 7230, le connecteur va continuer à utiliser [{1}]
 coyoteConnector.parseBodyMethodNoTrace=La méthode "TRACE" NE PEUT PAS contenir 
une entité (voir RFC 2616 Section 9.6)
 coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de 
protocole a échoué
 coyoteConnector.protocolHandlerInitializationFailed=L'initialisation du 
gestionnaire de protocole a échoué
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index fd02ea2..ac83147 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -163,6 +163,7 @@ managerServlet.resourcesType=OK - Liste des ressources 
globales de type [{0}]
 managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a échoué : 
[{0}]
 managerServlet.saved=OK - Configuration serveur sauvegardée
 managerServlet.savedContext=OK - Configuration du contexte [{0}] sauvegardée
+managerServlet.savedContextFail=ECHEC - L''enregistrement de la configuration 
du Contexte [{0}] a échoué
 managerServlet.serverInfo=OK - Informations sur le serveur\n\
 Version de Tomcat : [{0}]\n\
 Nom de l''OS : [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties 
b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index e8ae559..53642c5 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -20,6 +20,7 @@ combinedRealm.authSuccess=Authentifié l''utilisateur [{0}] 
avec le domaine [{1}
 combinedRealm.getPassword=La méthode getPassword() ne doit jamais être appelée
 combinedRealm.getPrincipal=La méthode getPrincipal() ne devrait jamais être 
appelée
 combinedRealm.realmStartFail=Impossible de démarrer le royaume [{0}]
+combinedRealm.setCredentialHandler=Un CredentialHandler a été défini sur une 
instance de CombinedRealm (ou une sous classe de CombinedRealm), et 
CombinedRealm ne supporte pas de CredentialHandler
 combinedRealm.unexpectedMethod=Un appel de méthode inattendu à été effectué 
sur le royaumes combiné
 
 credentialHandler.invalidStoredCredential=Le royaume a fourni des identifiants 
[{0}] invalides à comparer avec ceux fournis par le client
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 5718f2a..f795476 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -356,8 +356,7 @@ et où les options sont :\n\
 \-threadCount   Nombre de threads à utiliser pour la compilation\n\
 \  ("2.0C" veut dire deux threads par cœur)\n
 jspc.warning.tldInWebInfLib=Les fichiers TLDs ne devraient pas être placés 
dans /WEB-INF/lib
-jspc.webfrg.footer=\n\
-\n\
+jspc.webfrg.footer=\n\
 \n
 jspc.webfrg.header=\n\
 http://xmlns.jcp.org/xml/ns/javaee"\n\
@@ -372,20 +371,17 @@ jspc.webfrg.header=\n\
 Crée automatiquement par JspC de Apache Tomcat.\n\
 -->\n\
 \n
-jspc.webinc.footer=\n\
-\n\
 \n
-jspc.webinc.header=\n\
-\n\
 \n
 jspc.webinc.insertEnd=
 jspc.webinc.insertStart=
-jspc.webxml.footer=\n\
-\n\
+jspc.webxml.footer=\n\
 \n
 jspc.webxml.header=\n\
 http://xmlns.jcp.org/xml/ns/javaee"\n\
diff --

Re: Remove org.apache.catalina.tribes.transport.bio

[Filip Hanik]

On 4/29/20 8:56 AM, Rémy Maucherat wrote:
On Tue, Apr 28, 2020 at 7:18 PM Mark Thomas > wrote:


On 28/04/2020 17:30, Rémy Maucherat wrote:
> Hi,
>
> I'm still looking at things to remove or refactor in 10
following the
> rearchitecting failure for the Connector. One candidate could be the
> Tribes transport, since NIO is the default and BIO is probably
never used.
>
> Can it be removed ?

I don't see why not.

> There are a few classes here and there that could go too, for
example
> that BufferPool15Impl class. Given the name, I would say it could be
> merged into the superclass.

+1


Done. I wonder if this global static cache is actually that useful 
anymore.


ByteBuffers when first introduced, promised a lot, and delivered very 
little. The performance implications of creating new ones were pretty 
bad, imho.


There is a good chance that much of this has changed as the JVMs have 
evolved, and that a lot of code could be removed for the benefit of 
simplicity without sacrificing performance






Rémy


Mark

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

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

[tomcat] 02/02: Expand and update Chinese strings

[markt]

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

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

commit e7a6001404e777a249d91081966cdf2e83725293
Author: Mark Thomas 
AuthorDate: Wed Apr 29 17:49:30 2020 +0100

Expand and update Chinese strings
---
 .../factory/webservices/LocalStrings_zh_CN.properties | 16 
 .../util/codec/binary/LocalStrings_zh_CN.properties   | 19 +++
 .../util/descriptor/tld/LocalStrings_zh_CN.properties | 16 
 .../net/openssl/ciphers/LocalStrings_zh_CN.properties | 16 
 webapps/docs/changelog.xml|  5 +
 5 files changed, 72 insertions(+)

diff --git 
a/java/org/apache/naming/factory/webservices/LocalStrings_zh_CN.properties 
b/java/org/apache/naming/factory/webservices/LocalStrings_zh_CN.properties
new file mode 100644
index 000..08d3248
--- /dev/null
+++ b/java/org/apache/naming/factory/webservices/LocalStrings_zh_CN.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+serviceProxy.portNotFound=找不到端口组件ref[{0}]
diff --git 
a/java/org/apache/tomcat/util/codec/binary/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/codec/binary/LocalStrings_zh_CN.properties
new file mode 100644
index 000..0624dec
--- /dev/null
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings_zh_CN.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+base64.impossibleModulus=不可能的模[{0}]
+base64.inputTooLarge=输入数组太大，输出数组将比指定的最大大小[{1}]大[{0}]
+base64.lineSeparator=行分隔符不能包含base64个字符[{0}]
+base64.nullEncodeParameter=不能用空参数编码整数
diff --git 
a/java/org/apache/tomcat/util/descriptor/tld/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/descriptor/tld/LocalStrings_zh_CN.properties
new file mode 100644
index 000..7999008
--- /dev/null
+++ b/java/org/apache/tomcat/util/descriptor/tld/LocalStrings_zh_CN.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+implicitTldRule.elementNotAllowed=隐式.tld文件中不允许元素[{0}]
diff --git 
a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties
new file mode 100644
index 000..59c4c33
--- /dev/null
+++ 
b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not

Re: CTR: requesting review of org.apache.catalina.startup.TestMultipartConfig

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 4/28/20 14:03, Mark Thomas wrote:
> On 28/04/2020 15:22, Christopher Schultz wrote:
>> All,
>>
>> I'd like a review of the test-case I wrote for the multipart
>> config stuff.
>>
>> It *works*, but perhaps there are better ways to do the things
>> that I did.
>>
>> Someone who is more familiar with all the various ways of
>> testing Tomcat would probably be able to replace some of my hacks
>> with something a little more straightforward.
>
> I don't see anything that jumps out at me as needing to be
> changed.

Excellent, thanks. Using reflection to force my way into those private
methods seemed a little ugly. I'm not familiar enough with the rest of
the unit tests to know if that's an often-used technique or if there
was a better way of exposing the internals for a unit-test.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6psB0ACgkQHPApP6U8
pFi5NhAAsyYBPv2QefM2iIFZhr8/3GnIaoCGLsslx2WNUJStj9RMVEPoJ4pa9EZ0
zxgIUPY7t4RFQ993WzntrK43JNPqS5cQ2U+KhfL86VbHGhl5Ka3ypfZLLQkPT1ER
dwJI4bE8Lp8MyRR7GuxJbLmLUmWzTBEXpxwMcBrATKQQmIkaF30fwCiTVJdWpF78
LoKYd7yHuvH4EWUWGqMpaUoRzUW5dvXA66tzfOPic2/6hTk+cghQt1Hu5M+/jjjI
sRXlle2P1TfTKc96Wr4i+hMiK7KbHKgbkPX9UHhagdE109Ldxqspk0mR4E3mR2gs
yHB1KTbLO5sxQcDuP/uuyM+1u7pyIDTkNTlzvEQfQaPd91FzWOpXZNFxwxRozbXH
E3Ftfj9ESHf390YKT0EmlG2x96PDkLHglRy0ooZTMn32GziY2u0wFXhrRVswTnVk
WDjYxJi7MK+vFL5OzFOFLMK0UBWc13iLU3TGpsudlf0bt9eSALG/7RPdgXxtTOJl
K7SQu0BqzTakS6eT/CFMjyIZfxPhwHsKOau+Dni70ZHOTs6rEOvVsTok2eDTWvdD
F421+sIstucFJIKLfbaivMiIUumPZCs9bgkeTJ5DfwQUJsIXN+GgVjCkGaStL+MO
6SzQbhg6LkiHQm1MWL5hwKGN3Q5WOKXDOmXVlwGoYybbq8IOMNk=
=RIEq
-END PGP SIGNATURE-

-
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 (103347f -> e7a6001)

[markt]

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

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


from 103347f  Don't swallow I/O exceptions when Manager tries to find a 
session
 new cdd150a  Back-port updates to English strings
 new e7a6001  Expand and update Chinese strings

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/catalina/core/LocalStrings.properties  | 14 +++---
 .../factory/webservices}/LocalStrings_zh_CN.properties |  2 +-
 .../util/codec/binary}/LocalStrings_zh_CN.properties   |  5 -
 .../util/descriptor/tld}/LocalStrings_zh_CN.properties |  2 +-
 .../net/openssl/ciphers}/LocalStrings_zh_CN.properties |  2 +-
 webapps/docs/changelog.xml |  5 +
 6 files changed, 19 insertions(+), 11 deletions(-)
 copy java/org/apache/{tomcat/util/modeler => 
naming/factory/webservices}/LocalStrings_zh_CN.properties (93%)
 copy java/org/apache/{catalina/ha/authenticator => 
tomcat/util/codec/binary}/LocalStrings_zh_CN.properties (74%)
 copy java/org/apache/{catalina/valves/rewrite => 
tomcat/util/descriptor/tld}/LocalStrings_zh_CN.properties (91%)
 copy java/org/apache/{catalina/valves/rewrite => 
tomcat/util/net/openssl/ciphers}/LocalStrings_zh_CN.properties (93%)


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

[tomcat] 01/02: Back-port updates to English strings

[markt]

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

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

commit cdd150ade400ab2841c36108d32252ea3c7a89cd
Author: Mark Thomas 
AuthorDate: Wed Apr 29 17:46:37 2020 +0100

Back-port updates to English strings
---
 java/org/apache/catalina/core/LocalStrings.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index 2b84fa8..720b7e8 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -69,10 +69,10 @@ 
applicationServletRegistration.setServletSecurity.ise=Security constraints can''
 
 applicationSessionCookieConfig.ise=Property [{0}] cannot be added to 
SessionCookieConfig for context [{1}] as the context has been initialised
 
-aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native 
library
-aprListener.aprInit=The APR based Apache Tomcat Native library which allows 
optimal performance in production environments was not found on the 
java.library.path: [{0}]
-aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not 
be found using names [{0}] on the java.library.path [{1}]. The errors reported 
were [{2}]
-aprListener.aprInitError=The APR based Apache Tomcat Native library failed to 
load. The error reported was [{0}]
+aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
+aprListener.aprInit=The Apache Tomcat Native library which allows using 
OpenSSL was not found on the java.library.path: [{0}]
+aprListener.aprInitDebug=The Apache Tomcat Native library could not be found 
using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
+aprListener.aprInitError=The Apache Tomcat Native library failed to load. The 
error reported was [{0}]
 aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}], 
useOpenSSL [{1}]
 aprListener.currentFIPSMode=Current FIPS mode: [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode [{0}]
@@ -84,9 +84,9 @@ aprListener.initializingFIPS=Initializing FIPS mode...
 aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require 
the library to already be in FIPS mode, but it was not in FIPS mode
 aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.
 aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnInvalid=An incompatible version [{0}] of the APR based Apache 
Tomcat Native library is installed, while Tomcat requires version [{1}]
-aprListener.tcnValid=Loaded APR based Apache Tomcat Native library [{0}] using 
APR version [{1}].
-aprListener.tcnVersion=An older version [{0}] of the APR based Apache Tomcat 
Native library is installed, while Tomcat recommends a minimum version of [{1}]
+aprListener.tcnInvalid=An incompatible version [{0}] of the Apache Tomcat 
Native library is installed, while Tomcat requires version [{1}]
+aprListener.tcnValid=Loaded Apache Tomcat Native library [{0}] using APR 
version [{1}].
+aprListener.tcnVersion=An older version [{0}] of the Apache Tomcat Native 
library is installed, while Tomcat recommends a minimum version of [{1}]
 aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been 
initialized
 aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been 
initialized
 aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already 
been initialized


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

Re: CTR: requesting review of org.apache.catalina.startup.TestMultipartConfig

[Mark Thomas]

On 29/04/2020 17:49, Christopher Schultz wrote:
> Mark,
> 
> On 4/28/20 14:03, Mark Thomas wrote:
>> On 28/04/2020 15:22, Christopher Schultz wrote:
>>> All,
>>>
>>> I'd like a review of the test-case I wrote for the multipart
>>> config stuff.
>>>
>>> It *works*, but perhaps there are better ways to do the things
>>> that I did.
>>>
>>> Someone who is more familiar with all the various ways of
>>> testing Tomcat would probably be able to replace some of my hacks
>>> with something a little more straightforward.
> 
>> I don't see anything that jumps out at me as needing to be
>> changed.
> 
> Excellent, thanks. Using reflection to force my way into those private
> methods seemed a little ugly. I'm not familiar enough with the rest of
> the unit tests to know if that's an often-used technique or if there
> was a better way of exposing the internals for a unit-test.

You could make the relevant methods package private but personally I
dislike that more than reflection in the tests. YMMV.

Mark

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

Re: Dropping reason phrase in WebDavServlet

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Michael,

On 4/28/20 18:06, Michael Osipov wrote:
> Am 2020-04-20 um 10:25 schrieb Mark Thomas:
>> On 18/04/2020 21:19, Michael Osipov wrote:
>>> Folks,
>>>
>>> the WebDAV servlet still sends a reason phrase on multistatus
>>> (207).I'd like to drop it in master and 9.0.x. It is
>>> inconsistent with the behavior with these versions. Any
>>> objections/opinions on dropping it?
>>
>> I agree it is inconsistent and I'm generally in favour of
>> anything that improves consistentcy, simplifies, etc.
>>
>> RFC 4918 (WebDAV) references RFC 2616 (HTTP/1.1) where the
>> language is slightly less strong (the client is "not required" to
>> examine it) than RFC 7230 (the client SHOULD ignore it). However,
>> even in RFC 2616 an empty reason phrase is valid. So I think the
>> specs support this change.
>>
>> WebDAV clients, particularly the Microsoft implementations, can
>> have very specific expectations about server behaviour that are
>> not required by the RFC. I think it would be prudent to at least
>> test this change to the WebDAV server implementation with the
>> current Microsoft WebDAV client implementations before rolling it
>> out.
>
> Finally dropped locally. Tested with CarotDAV, WinSCP and Windows
> WebDAV Mini Redirector (Windows Explorer DAV Client) set with
> anonymous and SPNEGO authenication. Works like before (with reason
> phrase).
>
> I will go ahead and apply the change to master and 9.0.x. 8.5.x
> disables the reason phrase by default. Shall this applies to it as
> well? Any objections?

Seeing how well-received the original change was (drop reason phrase),
perhaps we should limit this to master and not back-port to 9.0, etc.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6psJEACgkQHPApP6U8
pFjqChAAmskw1+bgKOe9NZ+amXvfOCk/CEzisHcgsPdROREri18PeqluS79AUG9l
x+3DiUq5/L2jf9nVyUQmj4GFxzHR3eCAyI2y0c4hlLurpnPzGZclKM2Xnmfvti68
DWVfOx7HmjuGajI0s3a7bu/KzC1W6o26uubQLwmibOA0O63acGjr49OPQ3hShDsJ
xUE+a9cF20Yz4maeAE9PY855p7XZMOnfdFW3yc7/2xPQbrEGblQLNwajlPkkvZjn
pfLAjiOLMSR2TGabEhT/AXwYuacoGeWrbb3vTbjKDrmcbd4YRN8udzSfS7bCxl9u
ssKd7kZya39WhbqYOe3NfkBMJPf8yGP4WwEEn+LY39TfbxUy/Sfq+E6Uz2hTY4Ru
5TR1honE35CQSThmBmBltkTzWYOn3s9Fm/tpPCGdrLDM40IFF09KGXCQrak3qUCD
6TdpRvrnmthN74fTsUqltLq29YDwgkNv7kVvDuIJozNJG1pjjegZDAlcngL7d6XL
uq/ylVEMzNW0PvDTDHuzN09ixNSPDzOwiX47EWV37OlN7y/GB6EbXHMG3w0flEme
pz5YMAnReO634pGVIaoJC/1K+zDXxQLk+KQnrqSKuNiO1M0bO0TbnFOSX81mkROS
jxWtB3JJC9VuskoR3j4unflOyhwwkozpzq9Y7Kl6Zf6up7Xz2aA=
=UArd
-END PGP SIGNATURE-

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

[tomcat] branch master updated: Fix IDE nag

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new d137e71  Fix IDE nag
d137e71 is described below

commit d137e71a2019d54887b8faa1e0b85465afa2a8c0
Author: Mark Thomas 
AuthorDate: Wed Apr 29 17:53:13 2020 +0100

Fix IDE nag
---
 java/org/apache/catalina/tribes/io/BufferPool.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java 
b/java/org/apache/catalina/tribes/io/BufferPool.java
index 4c77c20..0a607b7 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -28,7 +28,7 @@ public class BufferPool {
 private static final Log log = LogFactory.getLog(BufferPool.class);
 
 public static final int DEFAULT_POOL_SIZE =
-
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
 100*1024*1024); //100MB
+
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
 100*1024*1024).intValue(); //100MB
 
 protected static final StringManager sm = 
StringManager.getManager(BufferPool.class);
 


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

CI configuration

[Mark Thomas]

Hi,

I've been looking at the CI failures. It is apparent from some of the
cluster tests that the tests are impacting each other although I found
no hard evidence of harm.

However, that got me thinking about threads. We currently run buildbot
tests with 16 tests executing in parallel as the machine as 16 cores.
However:
- we often have 2 CI builds in parallel
- many of the tests use multiple threads

I have therefore reduce the number of concurrent tests from 16 to 6.
I'll monitor the impact on run time and stability.

Mark

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

Re: Dropping reason phrase in WebDavServlet

[Michael Osipov]

Am 2020-04-29 um 18:51 schrieb Christopher Schultz:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Michael,

On 4/28/20 18:06, Michael Osipov wrote:

Am 2020-04-20 um 10:25 schrieb Mark Thomas:

On 18/04/2020 21:19, Michael Osipov wrote:

Folks,

the WebDAV servlet still sends a reason phrase on multistatus
(207).I'd like to drop it in master and 9.0.x. It is
inconsistent with the behavior with these versions. Any
objections/opinions on dropping it?


I agree it is inconsistent and I'm generally in favour of
anything that improves consistentcy, simplifies, etc.

RFC 4918 (WebDAV) references RFC 2616 (HTTP/1.1) where the
language is slightly less strong (the client is "not required" to
examine it) than RFC 7230 (the client SHOULD ignore it). However,
even in RFC 2616 an empty reason phrase is valid. So I think the
specs support this change.

WebDAV clients, particularly the Microsoft implementations, can
have very specific expectations about server behaviour that are
not required by the RFC. I think it would be prudent to at least
test this change to the WebDAV server implementation with the
current Microsoft WebDAV client implementations before rolling it
out.


Finally dropped locally. Tested with CarotDAV, WinSCP and Windows
WebDAV Mini Redirector (Windows Explorer DAV Client) set with
anonymous and SPNEGO authenication. Works like before (with reason
phrase).

I will go ahead and apply the change to master and 9.0.x. 8.5.x
disables the reason phrase by default. Shall this applies to it as
well? Any objections?


Seeing how well-received the original change was (drop reason phrase),
perhaps we should limit this to master and not back-port to 9.0, etc.


I understand your concerns. Please consider that 9.0.x doesn't send the 
phrase and doesn't allow to enable it. I think it was an oversight that 
this one wasn't dropped earlier. I won't back port this to 8.5.x and 
7.0.x. Let's keep it in 9.0.x and see whether we receive complains. Is 
that acceptable?


Michael

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

Re: Dropping reason phrase in WebDavServlet

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Michael,

On 4/29/20 15:37, Michael Osipov wrote:
> Am 2020-04-29 um 18:51 schrieb Christopher Schultz:
>> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256
>>
>> Michael,
>>
>> On 4/28/20 18:06, Michael Osipov wrote:
>>> Am 2020-04-20 um 10:25 schrieb Mark Thomas:
 On 18/04/2020 21:19, Michael Osipov wrote:
> Folks,
>
> the WebDAV servlet still sends a reason phrase on
> multistatus (207).I'd like to drop it in master and 9.0.x.
> It is inconsistent with the behavior with these versions.
> Any objections/opinions on dropping it?

 I agree it is inconsistent and I'm generally in favour of
 anything that improves consistentcy, simplifies, etc.

 RFC 4918 (WebDAV) references RFC 2616 (HTTP/1.1) where the
 language is slightly less strong (the client is "not
 required" to examine it) than RFC 7230 (the client SHOULD
 ignore it). However, even in RFC 2616 an empty reason phrase
 is valid. So I think the specs support this change.

 WebDAV clients, particularly the Microsoft implementations,
 can have very specific expectations about server behaviour
 that are not required by the RFC. I think it would be prudent
 to at least test this change to the WebDAV server
 implementation with the current Microsoft WebDAV client
 implementations before rolling it out.
>>>
>>> Finally dropped locally. Tested with CarotDAV, WinSCP and
>>> Windows WebDAV Mini Redirector (Windows Explorer DAV Client)
>>> set with anonymous and SPNEGO authenication. Works like before
>>> (with reason phrase).
>>>
>>> I will go ahead and apply the change to master and 9.0.x.
>>> 8.5.x disables the reason phrase by default. Shall this applies
>>> to it as well? Any objections?
>>
>> Seeing how well-received the original change was (drop reason
>> phrase), perhaps we should limit this to master and not back-port
>> to 9.0, etc.
>
> I understand your concerns. Please consider that 9.0.x doesn't send
> the phrase and doesn't allow to enable it. I think it was an
> oversight that this one wasn't dropped earlier. I won't back port
> this to 8.5.x and 7.0.x. Let's keep it in 9.0.x and see whether we
> receive complains. Is that acceptable?

+1

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6p+m0ACgkQHPApP6U8
pFhp2RAAtLufhy8Iuaq6OywkrRyHTQ6VvFTHRPVtGpOBX5BNXBFwsfgVU4VG7K4g
AZimKlM84s5OIbz671ZOrF9+FmCv8w4n1Ae3paEPEwlRGBv6QPEnIRHpXd1Up2uQ
BBt+cZOYGHnBZ1GDC3YNhCJWCQyg8eWVlCA9TqPcG1AYwhu+3F9F1Lfsb9+gsZ0O
T6BcRJI2yRvh8kwQFtWeZ4Et4rOCfoL3ZNQYNsAmzjB/85ol+Issz2+tOM/82sl9
vA6dIL6BbyaWoNZU5i+HN30Zr+r5EfOPPiBA72CsZJZhkYdriTx8DNFl/a9qZKly
EEyIxioB5z82TtFFqD8ssKUVhnpIZkk3gC34Z7fwdJ1hRHrqZCmc6I3Eili7AdAE
P87tqQu9/egL/CMP7EX3xStXlyergJBgjl/sE/lfsHhrpjsV0mUe8BsLiiafPYVY
j4HXFx1WfL0NB3XUxEckIqlNIQKauMkvJwxXlQ9zqcCW8hirPNpwnerOl27dNWTn
t3geJ6tt9JVa2fpxh61O/x4pVj62ZhASlBtX2T3kOnliHiXMJkz8e92EjiXI+fIS
mynM8v11ehyKjmlcWaolgI97QeRaT2Swg/hl/d0ezymp9J8Fo377V8sTlnV6TNo3
D3UIeiq1IFBoY1Ad6r1N1wb2K9My+no4daRxI0aSqWzWOYeBITY=
=obsQ
-END PGP SIGNATURE-

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

[Bug 64394] New: Windows Installer should offer an option to trust the certs in the Windows truststore

[bugzilla]

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

Bug ID: 64394
   Summary: Windows Installer should offer an option to trust the
certs in the Windows truststore
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: christoph.vonwitt...@bv.aok.de
  Target Milestone: -

The Windows installer should offer a (preselected) checkbox to trust the
certificates from the Windows truststore.

This would greatly improve the usability of Tomcat for Windows Administrators.


-Djavax.net.ssl.trustStoreType=WINDOWS-ROOT

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

[Bug 64395] New: Windows Installer should offer an option to select a service account

[bugzilla]

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

Bug ID: 64395
   Summary: Windows Installer should offer an option to select a
service account
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: christoph.vonwitt...@bv.aok.de
  Target Milestone: -

The current installer installs the Tomcat Service by using the LocalSystem
account.
This account is high privilege account and should not be used for production
webservers.

Please add an option to select a service user (including gMSA -
https://docs.microsoft.com/de-de/windows-server/security/group-managed-service-accounts/group-managed-service-accounts-overview)
and set appropriate directory permissions for this user to run tomcat.

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