[PR] Test if a custom 404 page is configured but the error jsp redirects to the project root [tomcat]
PaulLodge opened a new pull request, #763: URL: https://github.com/apache/tomcat/pull/763 This test covers the regression mentioned in https://svn.apache.org/r1830547 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69377] JSP optimization via custom code generation
https://bz.apache.org/bugzilla/show_bug.cgi?id=69377 --- Comment #4 from John Engebretson --- The biggest error comes when a JSP uses the following structure: I didn't know this was a supported behavior, but it shows up throughout our application. The code generation for delegates the last brace to the conclusion of the surrounding , which does not exist in this case, and results in the generated Java missing a '}' and not compiling. Activating the feature for and results in ~33% smaller class files and clearly faster runtime, but comes with a big red flag: certain methods have become much, much larger. This is because the generated code eliminates methods entirely and inlines all of the logic into the higher-level caller. With when/choose/otherwise enabled, a few methods are too large for comfort (64KB limit and all that). I'm still considering whether to fix and use the current code, or do something similar to my original intent, which modifies the method implementation but does not increase the size of any method. -- 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: (tomcat) branch 10.1.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
On 10/10/2024 04:03, micha...@apache.org wrote:
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 098834facf BZ 69370: DefaultServlet's HTML listing uses incorrect
labels
098834facf is described below
commit 098834facf88904ee4c727f9f25b809d3cfd4ddd
Author: Michael Osipov
AuthorDate: Sat Oct 5 14:01:18 2024 +0200
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -43,19 +43,18 @@ cgiServlet.runStdErrFail=I/O problems with stderr
defaultServlet.blockExternalEntity=Blocked access to external entity with
publicId [{0}] and systemId [{0}]
defaultServlet.blockExternalEntity2=Blocked access to external entity with
name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with
name [{0}] and baseURI [{1}]
+defaultServlet.directory.parent=Up To [{0}]
+defaultServlet.directory.title=Directory Listing For [{0}]
defaultServlet.missingResource=The requested resource [{0}] is not available
defaultServlet.noResources=No static resources were found
defaultServlet.readerCloseFailed=Failed to close reader
+defaultServlet.resource.lastModified=Last Modified
+defaultServlet.resource.name=Name
+defaultServlet.resource.size=Size
defaultServlet.skipfail=Read failed because only [{0}] bytes were available
but needed to skip [{1}] bytes to reach the start of the requested range
defaultServlet.unknownBomConfig=Unrecognised value of [{0}] provided for
useBomIfPresent initialization parameter
defaultServlet.xslError=XSL transformer error
-directory.filename=Filename
-directory.lastModified=Last Modified
-directory.parent=Up To [{0}]
-directory.size=Size
-directory.title=Directory Listing For [{0}]
I've updated POEditor to reflect these changes.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] BZ69355: ExactRateLimiter [tomcat]
Chenjp commented on PR #760: URL: https://github.com/apache/tomcat/pull/760#issuecomment-2405043622 > Oh, I see the code that you use to benchmark in the PR. Have you tried to run an external tool like `ab` or `wrk2`? @isapir thanks for your suggestion, will try run ab benchmark from another PC tomorrow. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch 11.0.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
On Thu, Oct 10, 2024 at 12:05 PM wrote:
> -sb.append(" - +sb.append(" \u2013 @@ -123,6 +123,10 @@
> the base class. The primary advantage for doing this is less code to
> process init-param values. (markt)
>
> +
> +69370: DefaultServlet's HTML listing
> +uses incorrect labels. (michaelo)
> +
Usually there's no changelog entry when there is no functional impact.
"fix" is for bug fixes or minor improvements, "update" for significant
changes, and "add" for significant new features.
Rémy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Avoid possible NPE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new a2aaab004f Avoid possible NPE
a2aaab004f is described below
commit a2aaab004fc52acfe0025f58ab95d23735f03cff
Author: remm
AuthorDate: Thu Oct 10 15:50:10 2024 +0200
Avoid possible NPE
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 6 ++
webapps/docs/changelog.xml | 4
2 files changed, 10 insertions(+)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 491fcb17fd..932995a07d 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,6 +175,12 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
+if (request.getHost() == null || request.getContext() == null) {
+// Request will have no session
+getNext().invoke(request, response);
+return;
+}
+
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2c27e5c9da..7fa1fab682 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -138,6 +138,10 @@
69370: DefaultServlet's HTML listing
uses incorrect labels. (michaelo)
+
+Avoid NPE in CrawlerSessionManagerValve for partially
+mapped requests. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Avoid possible NPE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new dc75d702b2 Avoid possible NPE
dc75d702b2 is described below
commit dc75d702b2dc350d695b1ae631b140bcb300af92
Author: remm
AuthorDate: Thu Oct 10 15:50:10 2024 +0200
Avoid possible NPE
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 6 ++
webapps/docs/changelog.xml | 4
2 files changed, 10 insertions(+)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 491fcb17fd..932995a07d 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,6 +175,12 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
+if (request.getHost() == null || request.getContext() == null) {
+// Request will have no session
+getNext().invoke(request, response);
+return;
+}
+
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 41002c87f2..1809e3445b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,10 @@
69370: DefaultServlet's HTML listing
uses incorrect labels. (michaelo)
+
+Avoid NPE in CrawlerSessionManagerValve for partially
+mapped requests. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Avoid possible NPE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 16ff28c709 Avoid possible NPE
16ff28c709 is described below
commit 16ff28c709f2d41a618f7a27460608c90a615f46
Author: remm
AuthorDate: Thu Oct 10 15:50:10 2024 +0200
Avoid possible NPE
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 6 ++
webapps/docs/changelog.xml | 4
2 files changed, 10 insertions(+)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 491fcb17fd..932995a07d 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,6 +175,12 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
+if (request.getHost() == null || request.getContext() == null) {
+// Request will have no session
+getNext().invoke(request, response);
+return;
+}
+
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 02351e6c7d..001d5df5cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,10 @@
69370: DefaultServlet's HTML listing
uses incorrect labels. (michaelo)
+
+Avoid NPE in CrawlerSessionManagerValve for partially
+mapped requests. (remm)
+
-
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: Avoid possible NPE
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new d597dd0ef1 Avoid possible NPE
d597dd0ef1 is described below
commit d597dd0ef1e2ee5a3902acded19f4abfa0b1b201
Author: remm
AuthorDate: Thu Oct 10 15:50:10 2024 +0200
Avoid possible NPE
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 6 ++
webapps/docs/changelog.xml | 4
2 files changed, 10 insertions(+)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 954082fe2f..c06fcef87f 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,6 +175,12 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
+if (request.getHost() == null || request.getContext() == null) {
+// Request will have no session
+getNext().invoke(request, response);
+return;
+}
+
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 28eedd19a2..4c44c177a4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,10 @@
69370: DefaultServlet's HTML listing
uses incorrect labels. (michaelo)
+
+Avoid NPE in CrawlerSessionManagerValve for partially
+mapped requests. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69388] New: At Lovenotes Films, We Believe Capturing timeless moments of love and joy, I specialize in crafting exquisite wedding photography that tells your unique story in every frame. Best Wed
https://bz.apache.org/bugzilla/show_bug.cgi?id=69388 Bug ID: 69388 Summary: At Lovenotes Films, We Believe Capturing timeless moments of love and joy, I specialize in crafting exquisite wedding photography that tells your unique story in every frame. Best Wedding Photographer Candid Wedding Photographer. Product: Tomcat Native Version: 2.0.8 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: digital2024w...@gmail.com Target Milestone: --- Created attachment 39901 --> https://bz.apache.org/bugzilla/attachment.cgi?id=39901&action=edit At Lovenotes Films, We Believe Capturing timeless moments of love and joy At Lovenotes Films, We Believe Capturing timeless moments of love and joy, I specialize in crafting exquisite wedding photography that tells your unique story in every frame. Best Wedding Photographer Candid Wedding Photographer. https://lovenotesfilms.com/top-10-wedding-photographer-in-dehradun/";>Top 10 wedding photographer in Dehradun https://lovenotesfilms.com/";>Best Wedding Photographer In Dehradun https://lovenotesfilms.com/";>Candid Wedding Photographer https://lovenotesfilms.com/";>Wedding Photographer In Dehradun https://lovenotesfilms.com/candid-wedding-photographer/";>Top 10 wedding photographer in Dehradun https://lovenotesfilms.com/best-wedding-photographer-in-india/";>Top 10 wedding photographer in Dehradun -- 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 69388] At Lovenotes Films, We Believe Capturing timeless moments of love and joy, I specialize in crafting exquisite wedding photography that tells your unique story in every frame. Best Wedding
https://bz.apache.org/bugzilla/show_bug.cgi?id=69388 LoveNotes Films changed: What|Removed |Added URL||https://lovenotesfilms.com/ OS||All --- Comment #1 from LoveNotes Films --- At Lovenotes Films, We Believe Capturing timeless moments of love and joy, I specialize in crafting exquisite wedding photography that tells your unique story in every frame. Best Wedding Photographer Candid Wedding Photographer. https://lovenotesfilms.com/top-10-wedding-photographer-in-dehradun/";>Top 10 wedding photographer in Dehradun https://lovenotesfilms.com/";>Best Wedding Photographer In Dehradun https://lovenotesfilms.com/";>Candid Wedding Photographer https://lovenotesfilms.com/";>Wedding Photographer In Dehradun https://lovenotesfilms.com/candid-wedding-photographer/";>Top 10 wedding photographer in Dehradun https://lovenotesfilms.com/best-wedding-photographer-in-india/";>Top 10 wedding photographer in Dehradun -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-12.0.x
Build status: BUILD FAILED: Snapshot deployed to ASF Maven snapshot repository (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/120/builds/127 Blamelist: Michael Osipov Build Text: Snapshot deployed to ASF Maven snapshot repository (failure) Status Detected: new failure Build Source Stamp: [branch main] ebc6cfb227e72b70fe56c3406d59fad1ffa0e6cc Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 2 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch 11.0.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
On 2024/10/10 10:12:56 Rémy Maucherat wrote:
> On Thu, Oct 10, 2024 at 12:05 PM wrote:
> > -sb.append(" - > +sb.append(" \u2013
> If this really needed ?
>
> > @@ -123,6 +123,10 @@
> > the base class. The primary advantage for doing this is less code
> > to
> > process init-param values. (markt)
> >
> > +
> > +69370: DefaultServlet's HTML listing
> > +uses incorrect labels. (michaelo)
> > +
>
> Usually there's no changelog entry when there is no functional impact.
> "fix" is for bug fixes or minor improvements, "update" for significant
> changes, and "add" for significant new features.
Thanks for this information. It should be mentioned in the changelog.xml header
though. I will set a bookmark.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] BZ69355: ExactRateLimiter [tomcat]
Chenjp commented on PR #760: URL: https://github.com/apache/tomcat/pull/760#issuecomment-2404718668 > > Could the headers follow https://datatracker.ietf.org/doc/draft-ietf-httpapi-ratelimit-headers/ ? > > Great! Will look into the spec and implement it tomorrow. ratelimit-headers spec feature added. see ```RateLimiter#getPolicy()``` and ```RateLimitItem#toString()``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (8e90a82759 -> ebc6cfb227)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 8e90a82759 Update add ebc6cfb227 BZ 69370: DefaultServlet's HTML listing uses incorrect labels No new revisions were added by this update. Summary of changes: .../org/apache/catalina/servlets/DefaultServlet.java | 20 ++-- .../apache/catalina/servlets/LocalStrings.properties | 11 +-- .../catalina/servlets/LocalStrings_de.properties | 2 -- .../catalina/servlets/LocalStrings_es.properties | 11 +-- .../catalina/servlets/LocalStrings_fr.properties | 11 +-- .../catalina/servlets/LocalStrings_ja.properties | 11 +-- .../catalina/servlets/LocalStrings_ko.properties | 11 +-- .../catalina/servlets/LocalStrings_zh_CN.properties | 10 +- webapps/docs/changelog.xml | 4 9 files changed, 44 insertions(+), 47 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 507a76013d BZ 69370: DefaultServlet's HTML listing uses incorrect
labels
507a76013d is described below
commit 507a76013de70bcc238b59eec3509082ea254dcc
Author: Michael Osipov
AuthorDate: Sat Oct 5 14:01:18 2024 +0200
BZ 69370: DefaultServlet's HTML listing uses incorrect labels
---
.../org/apache/catalina/servlets/DefaultServlet.java | 20 ++--
.../apache/catalina/servlets/LocalStrings.properties | 11 +--
.../catalina/servlets/LocalStrings_de.properties | 2 --
.../catalina/servlets/LocalStrings_es.properties | 11 +--
.../catalina/servlets/LocalStrings_fr.properties | 11 +--
.../catalina/servlets/LocalStrings_ja.properties | 11 +--
.../catalina/servlets/LocalStrings_ko.properties | 11 +--
.../catalina/servlets/LocalStrings_zh_CN.properties | 10 +-
webapps/docs/changelog.xml | 4
9 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 1dce680db8..387049f749 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1666,7 +1666,7 @@ public class DefaultServlet extends HttpServlet {
*/
sb.append("\r\n");
sb.append("");
-sb.append(sm.getString("directory.title", directoryWebappPath));
+sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
sb.append("\r\n");
sb.append("
(tomcat) branch 9.0.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
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 78e4bd0994 BZ 69370: DefaultServlet's HTML listing uses incorrect
labels
78e4bd0994 is described below
commit 78e4bd099417481b07caf0e0da808fc5ae786272
Author: Michael Osipov
AuthorDate: Sat Oct 5 14:01:18 2024 +0200
BZ 69370: DefaultServlet's HTML listing uses incorrect labels
---
.../org/apache/catalina/servlets/DefaultServlet.java | 20 ++--
.../apache/catalina/servlets/LocalStrings.properties | 11 +--
.../catalina/servlets/LocalStrings_de.properties | 2 --
.../catalina/servlets/LocalStrings_es.properties | 11 +--
.../catalina/servlets/LocalStrings_fr.properties | 11 +--
.../catalina/servlets/LocalStrings_ja.properties | 11 +--
.../catalina/servlets/LocalStrings_ko.properties | 11 +--
.../catalina/servlets/LocalStrings_zh_CN.properties | 10 +-
webapps/docs/changelog.xml | 4
9 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 3b33c0fc29..d5500e1a01 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1752,7 +1752,7 @@ public class DefaultServlet extends HttpServlet {
*/
sb.append("\r\n");
sb.append("");
-sb.append(sm.getString("directory.title", directoryWebappPath));
+sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
sb.append("\r\n");
sb.append("
(tomcat) branch 10.1.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 098834facf BZ 69370: DefaultServlet's HTML listing uses incorrect
labels
098834facf is described below
commit 098834facf88904ee4c727f9f25b809d3cfd4ddd
Author: Michael Osipov
AuthorDate: Sat Oct 5 14:01:18 2024 +0200
BZ 69370: DefaultServlet's HTML listing uses incorrect labels
---
.../org/apache/catalina/servlets/DefaultServlet.java | 20 ++--
.../apache/catalina/servlets/LocalStrings.properties | 11 +--
.../catalina/servlets/LocalStrings_de.properties | 2 --
.../catalina/servlets/LocalStrings_es.properties | 11 +--
.../catalina/servlets/LocalStrings_fr.properties | 11 +--
.../catalina/servlets/LocalStrings_ja.properties | 11 +--
.../catalina/servlets/LocalStrings_ko.properties | 11 +--
.../catalina/servlets/LocalStrings_zh_CN.properties | 10 +-
webapps/docs/changelog.xml | 4
9 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 385ba14af9..08151a2bf0 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1692,7 +1692,7 @@ public class DefaultServlet extends HttpServlet {
*/
sb.append("\r\n");
sb.append("");
-sb.append(sm.getString("directory.title", directoryWebappPath));
+sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
sb.append("\r\n");
sb.append("
Re: [PR] BZ 69370: DefaultServlet's HTML listing uses incorrect labels [tomcat]
michael-o closed pull request #759: BZ 69370: DefaultServlet's HTML listing uses incorrect labels URL: https://github.com/apache/tomcat/pull/759 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] BZ 69370: DefaultServlet's HTML listing uses incorrect labels [tomcat]
michael-o commented on PR #759: URL: https://github.com/apache/tomcat/pull/759#issuecomment-2404653354 Merged manually. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69370] DefaultServlet's HTML listing uses incorrect labels
https://bz.apache.org/bugzilla/show_bug.cgi?id=69370 Michael Osipov changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Michael Osipov --- Fixed in: - main for 12.0.0-M1 and onwards - 11.0.x for 11.0.1 and onwards - 10.1.x for 10.1.32 and onwards - 9.0.x for 9.0.97 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
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
rmaucher commented on PR #761: URL: https://github.com/apache/tomcat/pull/761#issuecomment-2404535177 > Is there now static final for that status code? Are you talking about https://github.com/apache/tomcat/blob/main/java/jakarta/servlet/http/HttpServletResponse.java#L406 ? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
michael-o commented on PR #761: URL: https://github.com/apache/tomcat/pull/761#issuecomment-2404594880 > > Is there now static final for that status code? > > Are you talking about https://github.com/apache/tomcat/blob/main/java/jakarta/servlet/http/HttpServletResponse.java#L406 ? Yes, this one. That's why I am surprised why a literal is used. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
ChristopherSchultz commented on PR #761: URL: https://github.com/apache/tomcat/pull/761#issuecomment-2405394259 I will also be adding at least one unit test. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
ChristopherSchultz commented on PR #761: URL: https://github.com/apache/tomcat/pull/761#issuecomment-2405393185 Tomcat 11 is based on Jakarta EE 11 which does not (yet) have this constant. I originally wrote this patch just for Tomcat 11 but now that I think about it, I think I should re-write it for Tomcat 12/main so that the behavior is consistent regardless of version. So I will re-base this PR on main which will use the constant in main. The back-ports will require the use of a literal, or a constant defined somewhere other than `HttpServletResponse`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
ChristopherSchultz commented on code in PR #761:
URL: https://github.com/apache/tomcat/pull/761#discussion_r1795646509
##
java/org/apache/catalina/connector/Response.java:
##
@@ -1069,16 +1069,20 @@ public void sendError(int status, String message)
throws IOException {
return;
}
-setError();
+if(103 == status) {
Review Comment:
Oops I'll fix that. Forgot to run validate.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/1326 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 11.0.x] 16ff28c709f2d41a618f7a27460608c90a615f46 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/1123 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] d597dd0ef1e2ee5a3902acded19f4abfa0b1b201 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/1327 Blamelist: remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 11.0.x] ec2f2f2b6a463e30fc5a2290fdee9950344130cf Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
ChristopherSchultz closed pull request #761: Allow applications to trigger sending of 103 early hints URL: https://github.com/apache/tomcat/pull/761 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
ChristopherSchultz commented on PR #761: URL: https://github.com/apache/tomcat/pull/761#issuecomment-2405802038 I'm not great at github, so I ended up killing this branch and re-creating it. I will have a follow-up PR soon. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Allow applications to trigger sending of 103 early hints [tomcat]
ChristopherSchultz opened a new pull request, #764: URL: https://github.com/apache/tomcat/pull/764 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch 11.0.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
On 2024/10/10 10:12:56 Rémy Maucherat wrote:
> On Thu, Oct 10, 2024 at 12:05 PM wrote:
> > -sb.append(" - > +sb.append(" \u2013
> If this really needed ?
Consistency with the ErrorReportValve. Look at the LocalStrings of it.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch 10.1.x updated: BZ 69370: DefaultServlet's HTML listing uses incorrect labels
On 2024/10/10 12:06:38 Mark Thomas wrote:
> On 10/10/2024 04:03, micha...@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > michaelo pushed a commit to branch 10.1.x
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/10.1.x by this push:
> > new 098834facf BZ 69370: DefaultServlet's HTML listing uses incorrect
> > labels
> > 098834facf is described below
> >
> > commit 098834facf88904ee4c727f9f25b809d3cfd4ddd
> > Author: Michael Osipov
> > AuthorDate: Sat Oct 5 14:01:18 2024 +0200
>
>
>
> > --- a/java/org/apache/catalina/servlets/LocalStrings.properties
> > +++ b/java/org/apache/catalina/servlets/LocalStrings.properties
> > @@ -43,19 +43,18 @@ cgiServlet.runStdErrFail=I/O problems with stderr
> > defaultServlet.blockExternalEntity=Blocked access to external entity with
> > publicId [{0}] and systemId [{0}]
> > defaultServlet.blockExternalEntity2=Blocked access to external entity
> > with name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
> > defaultServlet.blockExternalSubset=Blocked access to external subset with
> > name [{0}] and baseURI [{1}]
> > +defaultServlet.directory.parent=Up To [{0}]
> > +defaultServlet.directory.title=Directory Listing For [{0}]
> > defaultServlet.missingResource=The requested resource [{0}] is not
> > available
> > defaultServlet.noResources=No static resources were found
> > defaultServlet.readerCloseFailed=Failed to close reader
> > +defaultServlet.resource.lastModified=Last Modified
> > +defaultServlet.resource.name=Name
> > +defaultServlet.resource.size=Size
> > defaultServlet.skipfail=Read failed because only [{0}] bytes were
> > available but needed to skip [{1}] bytes to reach the start of the
> > requested range
> > defaultServlet.unknownBomConfig=Unrecognised value of [{0}] provided for
> > useBomIfPresent initialization parameter
> > defaultServlet.xslError=XSL transformer error
> >
> > -directory.filename=Filename
> > -directory.lastModified=Last Modified
> > -directory.parent=Up To [{0}]
> > -directory.size=Size
> > -directory.title=Directory Listing For [{0}]
>
> I've updated POEditor to reflect these changes.
Thank you, appreciated! Tried POEditor myself, but didn't figure out how to
properly sync with the actual files.
M
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-12.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/120/builds/129 Blamelist: Michael Osipov , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] c46c37649e2d086ccc67f1236b2856305f2a03ce Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_12: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-10.1.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1444 Blamelist: remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] 50dfe21c55684fa0f0c9f633d89f9ee86791996f Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
rmaucher commented on code in PR #761:
URL: https://github.com/apache/tomcat/pull/761#discussion_r1794983398
##
java/org/apache/catalina/connector/Response.java:
##
@@ -1209,7 +1213,11 @@ public void setStatus(int status) {
return;
}
-getCoyoteResponse().setStatus(status);
+if(103 == status) {
+sendEarlyHints();
+} else {
+getCoyoteResponse().setStatus(status);
Review Comment:
The implementations set 103 (except AJP where it does nothing).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
michael-o commented on PR #761: URL: https://github.com/apache/tomcat/pull/761#issuecomment-2404487095 Is there now static final for that status code? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new c46c37649e Fix test
c46c37649e is described below
commit c46c37649e2d086ccc67f1236b2856305f2a03ce
Author: remm
AuthorDate: Thu Oct 10 17:59:52 2024 +0200
Fix test
Also context already had a NPE check.
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 932995a07d..7bcb863111 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,7 +175,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
-if (request.getHost() == null || request.getContext() == null) {
+Host host = request.getHost();
+if (host == null) {
// Request will have no session
getNext().invoke(request, response);
return;
@@ -184,7 +185,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
-String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
+String clientIdentifier = getClientIdentifier(host,
request.getContext(), clientIp);
if (log.isTraceEnabled()) {
log.trace(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Fix test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new ec2f2f2b6a Fix test
ec2f2f2b6a is described below
commit ec2f2f2b6a463e30fc5a2290fdee9950344130cf
Author: remm
AuthorDate: Thu Oct 10 17:59:52 2024 +0200
Fix test
Also context already had a NPE check.
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 932995a07d..7bcb863111 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,7 +175,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
-if (request.getHost() == null || request.getContext() == null) {
+Host host = request.getHost();
+if (host == null) {
// Request will have no session
getNext().invoke(request, response);
return;
@@ -184,7 +185,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
-String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
+String clientIdentifier = getClientIdentifier(host,
request.getContext(), clientIp);
if (log.isTraceEnabled()) {
log.trace(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 50dfe21c55 Fix test
50dfe21c55 is described below
commit 50dfe21c55684fa0f0c9f633d89f9ee86791996f
Author: remm
AuthorDate: Thu Oct 10 17:59:52 2024 +0200
Fix test
Also context already had a NPE check.
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 932995a07d..7bcb863111 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,7 +175,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
-if (request.getHost() == null || request.getContext() == null) {
+Host host = request.getHost();
+if (host == null) {
// Request will have no session
getNext().invoke(request, response);
return;
@@ -184,7 +185,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
-String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
+String clientIdentifier = getClientIdentifier(host,
request.getContext(), clientIp);
if (log.isTraceEnabled()) {
log.trace(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
-
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: Fix test
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 02cb461652 Fix test
02cb461652 is described below
commit 02cb4616521a27cd02068cc3c22f54badbebb25e
Author: remm
AuthorDate: Thu Oct 10 17:59:52 2024 +0200
Fix test
Also context already had a NPE check.
---
java/org/apache/catalina/valves/CrawlerSessionManagerValve.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index c06fcef87f..b21d8b083f 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -175,7 +175,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
@Override
public void invoke(Request request, Response response) throws IOException,
ServletException {
-if (request.getHost() == null || request.getContext() == null) {
+Host host = request.getHost();
+if (host == null) {
// Request will have no session
getNext().invoke(request, response);
return;
@@ -184,7 +185,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
boolean isBot = false;
String sessionId = null;
String clientIp = request.getRemoteAddr();
-String clientIdentifier = getClientIdentifier(request.getHost(),
request.getContext(), clientIp);
+String clientIdentifier = getClientIdentifier(host,
request.getContext(), clientIp);
if (log.isTraceEnabled()) {
log.trace(request.hashCode() + ": ClientIdentifier=" +
clientIdentifier + ", RequestedSessionId=" +
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
Igal,
On 10/9/24 23:50, isapir (via GitHub) wrote:
isapir commented on code in PR #761:
URL: https://github.com/apache/tomcat/pull/761#discussion_r1794575451
##
java/org/apache/catalina/connector/Response.java:
##
@@ -1069,16 +1069,20 @@ public void sendError(int status, String message)
throws IOException {
return;
}
-setError();
+if(103 == status) {
Review Comment:
Are we not putting a space before the parenthesis?
Ooh, I forgot to run validate before commit. I'll update that, as well
as adding at least one unit test.
-chris
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Allow applications to trigger sending of 103 early hints [tomcat]
markt-asf commented on PR #761: URL: https://github.com/apache/tomcat/pull/761#issuecomment-2405469155 > I originally wrote this patch just for Tomcat 11 but now that I think about it, I think I should re-write it for Tomcat 12/main so that the behavior is consistent regardless of version. Can you add a note that this `sendError()` behaviour is deprecated in 12 onwards? I'd quite like to remove it for 13 onwards. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1443 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] dc75d702b2dc350d695b1ae631b140bcb300af92 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69377] JSP optimization via custom code generation
https://bz.apache.org/bugzilla/show_bug.cgi?id=69377 --- Comment #5 from John Engebretson --- I'm going to proceed with the tag plugin mechanism, configured for strictly c:set and c:if. This captures at least half the opportunity, with no code changes required and with little risk of hitting the 64KB limit. If I had all the time in the world, I would instead do this: 1. Replace the XML mechanism with activation similar to ELInterpreterFactory and StringInterpreterFactory. 2. Modify the code to maintain the current method structure, with changes to the contents of the methods. 3. Improve the readability of the generated code. Indents need fixing and a few comments wouldn't hurt. My immediate needs are met; what should we do with the ticket? -- 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 main updated (c46c37649e -> 43018b86cc)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from c46c37649e Fix test new 0b84147c37 Update minimum Java version to 21 new dac8def47d Update Jasper to compile to Java 21 by default new 9c6304ad78 Update Javadoc references to use Java 21 new 6795092946 Remove JreCompat for Java < 21 new 2052530331 Update Derby to 10.17.1.0 new 43018b86cc Add markers so it is clearer which entries need to be removed. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 9 +- build.xml | 10 +- conf/web.xml | 4 +- .../authenticator/SpnegoAuthenticator.java | 7 +- java/org/apache/jasper/EmbeddedServletOptions.java | 4 +- java/org/apache/jasper/JspC.java | 4 +- java/org/apache/jasper/compiler/JDTCompiler.java | 14 +- .../org/apache/tomcat/util/compat/Jre19Compat.java | 84 .../org/apache/tomcat/util/compat/Jre21Compat.java | 107 --- .../org/apache/tomcat/util/compat/Jre22Compat.java | 2 +- java/org/apache/tomcat/util/compat/JreCompat.java | 150 + .../tomcat/util/compat/LocalStrings.properties | 2 - .../tomcat/util/compat/LocalStrings_fr.properties | 3 - .../tomcat/util/compat/LocalStrings_ja.properties | 3 - java/org/apache/tomcat/util/digester/package.html | 2 +- .../apache/tomcat/util/net/SocketProperties.java | 6 +- .../tomcat/util/net/openssl/OpenSSLEngine.java | 2 +- .../util/net/openssl/panama/OpenSSLEngine.java | 2 +- .../tomcat/util/threads/VirtualThreadExecutor.java | 9 +- modules/jdbc-pool/build.xml| 2 +- modules/jdbc-pool/doc/jdbc-pool.xml| 4 +- webapps/docs/changelog.xml | 19 +++ webapps/docs/config/ajp.xml| 6 +- webapps/docs/config/cluster-sender.xml | 2 +- webapps/docs/config/context.xml| 4 +- webapps/docs/config/http.xml | 6 +- webapps/docs/config/http2.xml | 2 +- webapps/docs/config/realm.xml | 2 +- webapps/docs/jasper-howto.xml | 4 +- webapps/docs/jndi-datasource-examples-howto.xml| 2 +- webapps/docs/logging.xml | 2 +- webapps/docs/tomcat-docs.xsl | 2 +- 32 files changed, 75 insertions(+), 406 deletions(-) delete mode 100644 java/org/apache/tomcat/util/compat/Jre19Compat.java delete mode 100644 java/org/apache/tomcat/util/compat/Jre21Compat.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/06: Remove JreCompat for Java < 21
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6795092946a5e3ce6a14d04b432dcdf909df776a
Author: Mark Thomas
AuthorDate: Thu Oct 10 13:09:51 2024 -0600
Remove JreCompat for Java < 21
---
.../authenticator/SpnegoAuthenticator.java | 7 +-
.../org/apache/tomcat/util/compat/Jre19Compat.java | 84
.../org/apache/tomcat/util/compat/Jre21Compat.java | 107 ---
.../org/apache/tomcat/util/compat/Jre22Compat.java | 2 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 150 +
.../tomcat/util/compat/LocalStrings.properties | 2 -
.../tomcat/util/compat/LocalStrings_fr.properties | 3 -
.../tomcat/util/compat/LocalStrings_ja.properties | 3 -
.../tomcat/util/threads/VirtualThreadExecutor.java | 9 +-
9 files changed, 9 insertions(+), 358 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index 9227238198..496c5c1c87 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -36,7 +36,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.compat.JreCompat;
import org.apache.tomcat.util.compat.JreVendor;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
@@ -208,13 +207,13 @@ public class SpnegoAuthenticator extends
AuthenticatorBase {
} else {
credentialLifetime = GSSCredential.DEFAULT_LIFETIME;
}
-gssContext =
manager.createContext(JreCompat.getInstance().callAs(subject, () -> {
+gssContext = manager.createContext(Subject.callAs(subject, () -> {
return manager.createCredential(null, credentialLifetime, new
Oid("1.3.6.1.5.5.2"),
GSSCredential.ACCEPT_ONLY);
}));
final GSSContext gssContextFinal = gssContext;
-outToken = JreCompat.getInstance().callAs(subject, () -> {
+outToken = Subject.callAs(subject, () -> {
return gssContextFinal.acceptSecContext(decoded, 0,
decoded.length);
});
@@ -228,7 +227,7 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
return false;
}
-principal = JreCompat.getInstance().callAs(subject, () -> {
+principal = Subject.callAs(subject, () -> {
return context.getRealm().authenticate(gssContextFinal,
storeDelegatedCredential);
});
} catch (GSSException e) {
diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java
b/java/org/apache/tomcat/util/compat/Jre19Compat.java
deleted file mode 100644
index 60ee0c2dc1..00
--- a/java/org/apache/tomcat/util/compat/Jre19Compat.java
+++ /dev/null
@@ -1,84 +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.tomcat.util.compat;
-
-import java.lang.reflect.Field;
-
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.res.StringManager;
-
-public class Jre19Compat extends JreCompat {
-
-private static final Log log = LogFactory.getLog(Jre19Compat.class);
-private static final StringManager sm =
StringManager.getManager(Jre19Compat.class);
-
-private static final boolean supported;
-
-static {
-// Don't need any Java 19 specific classes (yet) so just test for one
of
-// the new ones for now.
-Class c1 = null;
-try {
-c1 = Class.forName("java.lang.WrongThreadException");
-} catch (ClassNotFoundException cnfe) {
-// Must be pre-Java 19
-log.debug(sm.getString("jre19Compat.javaPre19"), cnfe);
-}
-
-supported = (c1 != null);
-}
-
-static boolean isSupported() {
-return supported;
-}
-
-@Override
-
(tomcat) 06/06: Add markers so it is clearer which entries need to be removed.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 43018b86cca787e91814341450f9460646bd5357 Author: Mark Thomas AuthorDate: Thu Oct 10 13:58:57 2024 -0600 Add markers so it is clearer which entries need to be removed. --- webapps/docs/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4101c6c50d..9d141f1883 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -126,6 +126,7 @@ Remove default value (was catalina) for the secret init parameter of the WebDAV Servlet. (remm) + 69374: Properly separate between table header and body in DefaultServlet's listing. (michaelo) @@ -159,6 +160,7 @@ certificateKeystorePassword attribute of a certificate. (remm) + Return null SSL session id on zero length byte array returned from the SSL implementation. (remm) @@ -188,6 +190,7 @@ compilerTargetVM have been updated to 21 to align with Java 21 being the minimum Java version required for Tomcat 12. (markt) + @@ -195,6 +198,7 @@ Update Derby to 10.17.1.0. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/06: Update Javadoc references to use Java 21
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9c6304ad789c5c4b6063d60c591f79aaf5d3c722
Author: Mark Thomas
AuthorDate: Thu Oct 10 12:53:22 2024 -0600
Update Javadoc references to use Java 21
---
java/org/apache/tomcat/util/digester/package.html | 2 +-
java/org/apache/tomcat/util/net/SocketProperties.java | 6 +++---
java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java| 2 +-
java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 2 +-
modules/jdbc-pool/build.xml | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 4 ++--
webapps/docs/config/ajp.xml | 6 +++---
webapps/docs/config/cluster-sender.xml| 2 +-
webapps/docs/config/context.xml | 4 ++--
webapps/docs/config/http.xml | 6 +++---
webapps/docs/config/http2.xml | 2 +-
webapps/docs/config/realm.xml | 2 +-
webapps/docs/jndi-datasource-examples-howto.xml | 2 +-
webapps/docs/logging.xml | 2 +-
14 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/org/apache/tomcat/util/digester/package.html
b/java/org/apache/tomcat/util/digester/package.html
index 7a66d0dbc2..d61d2d61e2 100644
--- a/java/org/apache/tomcat/util/digester/package.html
+++ b/java/org/apache/tomcat/util/digester/package.html
@@ -867,7 +867,7 @@ There are many good regex libraries available. (For example
Jakarta ORO,
Jakarta Regex,
GNU Regex and
-
+
Java Regex)
Not only do different people have different personal tastes when it comes to
regular expression matching but these products all offer different
functionality
diff --git a/java/org/apache/tomcat/util/net/SocketProperties.java
b/java/org/apache/tomcat/util/net/SocketProperties.java
index a7c193f3b7..433902f048 100644
--- a/java/org/apache/tomcat/util/net/SocketProperties.java
+++ b/java/org/apache/tomcat/util/net/SocketProperties.java
@@ -152,7 +152,7 @@ public class SocketProperties {
/**
* Performance preferences according to
- *
https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/Socket.html#setPerformancePreferences(int,int,int)
+ *
https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/net/Socket.html#setPerformancePreferences(int,int,int)
* All three performance attributes must be set or the JVM defaults will be
* used.
*/
@@ -160,7 +160,7 @@ public class SocketProperties {
/**
* Performance preferences according to
- *
https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/Socket.html#setPerformancePreferences(int,int,int)
+ *
https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/net/Socket.html#setPerformancePreferences(int,int,int)
* All three performance attributes must be set or the JVM defaults will be
* used.
*/
@@ -168,7 +168,7 @@ public class SocketProperties {
/**
* Performance preferences according to
- *
https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/Socket.html#setPerformancePreferences(int,int,int)
+ *
https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/net/Socket.html#setPerformancePreferences(int,int,int)
* All three performance attributes must be set or the JVM defaults will be
* used.
*/
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
index 890d473374..0087c0b6ea 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
@@ -146,7 +146,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
private volatile boolean destroyed;
// Use an invalid cipherSuite until the handshake is completed
-// See
https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLEngine.html#getSession()
+// See
https://docs.oracle.com/en/java/javase/21/docs/api/java.base/javax/net/ssl/SSLEngine.html#getSession()
private volatile String version;
private volatile String cipher;
private volatile String applicationProtocol;
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index a528df7676..5a349ba22a 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -131,7 +131,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
(tomcat) 02/06: Update Jasper to compile to Java 21 by default
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dac8def47dd9037e050853462612bac37b095ba8
Author: Mark Thomas
AuthorDate: Thu Oct 10 12:52:51 2024 -0600
Update Jasper to compile to Java 21 by default
---
conf/web.xml | 4 ++--
java/org/apache/jasper/EmbeddedServletOptions.java | 4 ++--
java/org/apache/jasper/JspC.java | 4 ++--
java/org/apache/jasper/compiler/JDTCompiler.java | 14 +++---
webapps/docs/changelog.xml | 5 +
webapps/docs/jasper-howto.xml | 4 ++--
6 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/conf/web.xml b/conf/web.xml
index d4037523fc..7d4637ac26 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -160,9 +160,9 @@
-
+
-
+
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 5bfd47eb72..6176740b32 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -124,12 +124,12 @@ public final class EmbeddedServletOptions implements
Options {
/**
* Compiler target VM.
*/
-private String compilerTargetVM = "17";
+private String compilerTargetVM = "21";
/**
* The compiler source VM.
*/
-private String compilerSourceVM = "17";
+private String compilerSourceVM = "21";
/**
* The compiler class name.
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 8656617bef..e31918cca5 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -197,8 +197,8 @@ public class JspC extends Task implements Options {
protected String compiler = null;
-protected String compilerTargetVM = "17";
-protected String compilerSourceVM = "17";
+protected String compilerTargetVM = "21";
+protected String compilerSourceVM = "21";
protected boolean classDebugInfo = true;
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a9e6347665..67fa51bbde 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -332,11 +332,11 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Source, "24");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
-settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_21);
}
} else {
-// Default to 17
-settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
+// Default to 21
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_21);
}
// Target JVM
@@ -420,12 +420,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Compliance, "24");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
-settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_21);
}
} else {
-// Default to 17
-settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
-settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_17);
+// Default to 21
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_21);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_21);
}
final IProblemFactory problemFactory = new
DefaultProblemFactory(Locale.getDefault());
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3210fba314..56e902bc72 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -183,6 +183,11 @@
Language to support mergin MapMap and SetSet
and concatenating Lists. (markt)
+
+The defaults for compilerSourceVM and
+compilerTargetVM have been updated to 21 to align with
Java
+21 being the minimum Java version required for Tomcat 12. (markt)
+
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index e0d35f7911..0ef59ec158 100644
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -106,10 +106,10 @@ set then setenv.[sh|bat] should be used
(tomcat) 05/06: Update Derby to 10.17.1.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 20525303316274ab712901f480c9711b626d4452
Author: Mark Thomas
AuthorDate: Thu Oct 10 13:51:07 2024 -0600
Update Derby to 10.17.1.0
---
build.properties.default | 9 -
webapps/docs/changelog.xml | 7 +++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e053d77440..b3f2c7365a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -318,17 +318,16 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
# - Derby, used by unit tests -
-# 10.16.1.1 is the latest version that runs on Java 17
-derby.version=10.16.1.1
+derby.version=10.17.1.0
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
+derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
derby-shared.checksum.enabled=true
derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
+derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
+derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
derby.home=${base.path}/derby-${derby.version}
derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 56e902bc72..4101c6c50d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -190,6 +190,13 @@
+
+
+
+Update Derby to 10.17.1.0. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/06: Update minimum Java version to 21
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0b84147c37cad9cabb298cfe6b2ce79689d342aa Author: Mark Thomas AuthorDate: Thu Oct 10 12:48:58 2024 -0600 Update minimum Java version to 21 --- build.xml| 10 +- webapps/docs/changelog.xml | 3 +++ webapps/docs/tomcat-docs.xsl | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 88c9ac6725..902d981f97 100644 --- a/build.xml +++ b/build.xml @@ -104,11 +104,11 @@ - + - - - + + + @@ -2416,7 +2416,7 @@ - https://docs.oracle.com/en/java/javase/17/docs/api/"/> + https://docs.oracle.com/en/java/javase/21/docs/api/"/> https://jakarta.ee/specifications/platform/11/apidocs/"/> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7fa1fab682..3210fba314 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -111,6 +111,9 @@ This release contains all of the changes up to and including those in Apache Tomcat 11.0.0 plus the additional changes listed below. (markt) + +The minimum Java version has been updated to Java 21. (markt) + diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl index 66aa1c1c77..e70311d2d4 100644 --- a/webapps/docs/tomcat-docs.xsl +++ b/webapps/docs/tomcat-docs.xsl @@ -37,7 +37,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
