[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675 --- Comment #31 from Valentin Tyanov --- Hey, is there a scheduled date for the January release? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-8.5.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/704 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 8.5.x] 38832d7389c70f4fb8cffdd9d354914d9e0bb512 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
(tomcat) branch main updated: Forgot the code cleanup
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 786285c1ae Forgot the code cleanup
786285c1ae is described below
commit 786285c1ae2479c5dc020326a911d3fe020e845c
Author: remm
AuthorDate: Tue Jan 2 14:13:36 2024 +0100
Forgot the code cleanup
---
.../util/openssl/PEM_read_bio_PrivateKey$cb.java| 21 +++--
.../util/openssl/PEM_read_bio_X509_AUX$cb.java | 21 +++--
2 files changed, 14 insertions(+), 28 deletions(-)
diff --git
a/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java
b/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java
index a753174b69..7c7303dd4e 100644
--- a/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java
+++ b/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java
@@ -19,29 +19,22 @@
package org.apache.tomcat.util.openssl;
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemorySegment;
import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
-import java.nio.ByteOrder;
-import java.lang.foreign.*;
-import static java.lang.foreign.ValueLayout.*;
/**
- * {@snippet lang=c :
- * int (*PEM_read_bio_PrivateKey$cb)(char* buf,int size,int rwflag,void*
userdata);
+ * {@snippet lang = c : * int (*PEM_read_bio_PrivateKey$cb)(char* buf,int
size,int rwflag,void* userdata);
* }
*/
public interface PEM_read_bio_PrivateKey$cb {
int apply(MemorySegment buf, int size, int rwflag, MemorySegment userdata);
-FunctionDescriptor $DESC = FunctionDescriptor.of(
-openssl_h.C_INT,
-openssl_h.C_POINTER,
-openssl_h.C_INT,
-openssl_h.C_INT,
-openssl_h.C_POINTER
-);
+FunctionDescriptor $DESC = FunctionDescriptor.of(openssl_h.C_INT,
openssl_h.C_POINTER, openssl_h.C_INT,
+openssl_h.C_INT, openssl_h.C_POINTER);
MethodHandle UP$MH =
openssl_h.upcallHandle(PEM_read_bio_PrivateKey$cb.class, "apply", $DESC);
diff --git a/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java
b/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java
index be273cf02d..a04ac3200d 100644
--- a/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java
+++ b/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java
@@ -19,29 +19,22 @@
package org.apache.tomcat.util.openssl;
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemorySegment;
import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
-import java.nio.ByteOrder;
-import java.lang.foreign.*;
-import static java.lang.foreign.ValueLayout.*;
/**
- * {@snippet lang=c :
- * int (*PEM_read_bio_X509_AUX$cb)(char* buf,int size,int rwflag,void*
userdata);
+ * {@snippet lang = c : * int (*PEM_read_bio_X509_AUX$cb)(char* buf,int
size,int rwflag,void* userdata);
* }
*/
public interface PEM_read_bio_X509_AUX$cb {
int apply(MemorySegment buf, int size, int rwflag, MemorySegment userdata);
-FunctionDescriptor $DESC = FunctionDescriptor.of(
-openssl_h.C_INT,
-openssl_h.C_POINTER,
-openssl_h.C_INT,
-openssl_h.C_INT,
-openssl_h.C_POINTER
-);
+FunctionDescriptor $DESC = FunctionDescriptor.of(openssl_h.C_INT,
openssl_h.C_POINTER, openssl_h.C_INT,
+openssl_h.C_INT, openssl_h.C_POINTER);
MethodHandle UP$MH =
openssl_h.upcallHandle(PEM_read_bio_X509_AUX$cb.class, "apply", $DESC);
-
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/1080 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 10.1.x] 0ef767c109ae1915e917bcd29804b68fff987277 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
(tomcat) branch main updated: Cleanup typing for password callbacks
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 705e3644d7 Cleanup typing for password callbacks
705e3644d7 is described below
commit 705e3644d7552298d1e6f6809ea4404153427ad4
Author: remm
AuthorDate: Tue Jan 2 13:51:56 2024 +0100
Cleanup typing for password callbacks
Although this adds two more classes, removing type hacks is likely
better.
Also essentially removes the default password callback since right now I
don't see where it is used. Will test further if anything bad happens.
---
.../util/net/openssl/panama/OpenSSLContext.java| 36 +-
.../util/openssl/PEM_read_bio_PrivateKey$cb.java | 65 ++
.../util/openssl/PEM_read_bio_X509_AUX$cb.java | 65 ++
java/org/apache/tomcat/util/openssl/openssl_h.java | 1000 ++--
4 files changed, 646 insertions(+), 520 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 13691d58d8..a1ae1a1b87 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -66,6 +66,8 @@ import org.apache.tomcat.util.net.openssl.OpenSSLConf;
import org.apache.tomcat.util.net.openssl.OpenSSLConfCmd;
import org.apache.tomcat.util.net.openssl.OpenSSLStatus;
import org.apache.tomcat.util.net.openssl.OpenSSLUtil;
+import org.apache.tomcat.util.openssl.PEM_read_bio_PrivateKey$cb;
+import org.apache.tomcat.util.openssl.PEM_read_bio_X509_AUX$cb;
import org.apache.tomcat.util.openssl.SSL_CTX_set_alpn_select_cb$cb;
import org.apache.tomcat.util.openssl.SSL_CTX_set_cert_verify_callback$cb;
import org.apache.tomcat.util.openssl.SSL_CTX_set_default_passwd_cb$cb;
@@ -133,9 +135,6 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
private boolean noOcspCheck = false;
-// Password callback
-private final MemorySegment openSSLCallbackPassword;
-
private static final ConcurrentHashMap states = new
ConcurrentHashMap<>();
private static ContextState getState(MemorySegment ctx) {
return states.get(Long.valueOf(ctx.address()));
@@ -279,8 +278,8 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// Probably not needed
// Set int pem_password_cb(char *buf, int size, int rwflag, void
*u) callback
-openSSLCallbackPassword =
SSL_CTX_set_default_passwd_cb$cb.allocate(new PasswordCallback(), contextArena);
-SSL_CTX_set_default_passwd_cb(sslCtx, openSSLCallbackPassword);
+SSL_CTX_set_default_passwd_cb(sslCtx,
+SSL_CTX_set_default_passwd_cb$cb.allocate(new
PasswordCallback(null), contextArena));
if (negotiableProtocols != null && negotiableProtocols.size() > 0)
{
alpn = true;
@@ -891,15 +890,16 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
}
-private static ThreadLocal callbackPasswordTheadLocal = new
ThreadLocal<>();
-
-private static class PasswordCallback implements
SSL_CTX_set_default_passwd_cb$cb {
+private static class PasswordCallback implements
SSL_CTX_set_default_passwd_cb$cb, PEM_read_bio_X509_AUX$cb,
PEM_read_bio_PrivateKey$cb {
+private final String callbackPassword;
+PasswordCallback(String callbackPassword) {
+this.callbackPassword = callbackPassword;
+}
@Override
public int apply(MemorySegment /* char **/ buf, int bufsiz, int
verify, MemorySegment /* void **/ cb) {
if (log.isDebugEnabled()) {
log.debug("Return password for certificate");
}
-String callbackPassword = callbackPasswordTheadLocal.get();
if (callbackPassword != null && callbackPassword.length() > 0) {
try (var localArena = Arena.ofConfined()) {
MemorySegment callbackPasswordNative =
localArena.allocateFrom(callbackPassword);
@@ -1020,12 +1020,9 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
key = MemorySegment.NULL;
for (int i = 0; i < 3; i++) {
-try {
-callbackPasswordTheadLocal.set(keyPassToUse);
-key = PEM_read_bio_PrivateKey(keyBIO,
MemorySegment.NULL, openSSLCallbackPassword, MemorySegment.NULL);
-} finally {
-callbackPasswordTheadLocal.set(null);
-}
+key = PEM_read_bio_PrivateKey(keyBIO,
MemorySegment.NULL,
+
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/831 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] ed8cc4f3beddbdc7d9634cc287660322804007fd 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
[Bug 68436] Hide "Not loading a JDBC driver as driverClassName property is null" warning
https://bz.apache.org/bugzilla/show_bug.cgi?id=68436 Mark Thomas changed: What|Removed |Added Product|Tomcat 10 |Tomcat Modules Component|Catalina|jdbc-pool Target Milestone|-- |--- --- Comment #1 from Mark Thomas --- Correcting product -- 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 68348] Support for Partitioned cookie attribute
https://bz.apache.org/bugzilla/show_bug.cgi?id=68348 --- Comment #1 from Mark Thomas --- I'd be a lot happier adding this if this work was included in the current RFC6265bis work rather than having been deferred until after RFC6265. My concern is primarily that the current approach may change between now and whichever RFC it appears in. Unfortunately, with the CHIPS trial due to start this month, I don't think it is realistic to wait for an agreed RFC before implementing this feature in Tomcat. My intention is to add this feature but with a note in the Javadoc and the configuration docs that it is not final and there may be breaking changes once the feature is finalised in an RFC. -- 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-8.5.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/703 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 8.5.x] 69b8f398d64f336d4954d69aead1b19f5126fd4f 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 68436] New: Hide "Not loading a JDBC driver as driverClassName property is null" warning
https://bz.apache.org/bugzilla/show_bug.cgi?id=68436
Bug ID: 68436
Summary: Hide "Not loading a JDBC driver as driverClassName
property is null" warning
Product: Tomcat 10
Version: unspecified
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: mail...@yahoo.com
Target Milestone: --
Unnecessary warning fills up the webapp logging file, this happens every time a
db pool creates a new connection and no classname is given.
>> Not loading a JDBC driver as driverClassName property is null.
Using the same webapp for mysqljar and mariadbjar system may use a
configuration without driverClassName field. Destination tomcat may provide
both or one of jdbc jar files without a webapp developer knowledge.
What is an empty driverClassName="" attribute was given then it's an explicit
choice and Tomcat did not need to write a warning log?
See source code:
https://github.com/apache/tomcat/blob/ed8cc4f3beddbdc7d9634cc287660322804007fd/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java#L292
if (poolProperties.getDriverClassName()==null) {
//rely on DriverManager
log.warn("Not loading a JDBC driver as driverClassName property is null.");
} else {...
See contextxml db connection example:
--
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: January releases
On Tue, Jan 2, 2024 at 12:30 PM Mark Thomas wrote: > > Hi all, > > What do we think about a January release? The changelog is fairly short > but there is a fix for the regression in parsing keys/certs generated by > older OpenSSL versions. Yes, I was looking at the changelog earlier (hence updating the 9.0 release date), and I thought that regression was annoying. Rémy > I was planning on implementing a fix for BZ 68348 [1] and could tag > after that if there is general agreement to do a release round this month. > > Mark > > > [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=68348 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
January releases
Hi all, What do we think about a January release? The changelog is fairly short but there is a fix for the regression in parsing keys/certs generated by older OpenSSL versions. I was planning on implementing a fix for BZ 68348 [1] and could tag after that if there is general agreement to do a release round this month. Mark [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=68348 - 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: Align embedded MIME type mappings with BZ 68378 updates to web.xml
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 38832d7389 Align embedded MIME type mappings with BZ 68378 updates to web.xml 38832d7389 is described below commit 38832d7389c70f4fb8cffdd9d354914d9e0bb512 Author: Mark Thomas AuthorDate: Tue Jan 2 11:11:24 2024 + Align embedded MIME type mappings with BZ 68378 updates to web.xml --- java/org/apache/catalina/startup/MimeTypeMappings.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index f885260ee0..123a9af42f 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -294,6 +294,7 @@ gdl=model/vnd.gdl geo=application/vnd.dynageo gex=application/vnd.geometry-explorer ggb=application/vnd.geogebra.file +ggs=application/vnd.geogebra.slides ggt=application/vnd.geogebra.tool ghf=application/vnd.groove-help gif=image/gif @@ -470,6 +471,7 @@ mif=application/x-mif mime=message/rfc822 mj2=video/mj2 mjp2=video/mj2 +mjs=text/javascript mk3d=video/x-matroska mka=audio/x-matroska mks=video/x-matroska @@ -577,6 +579,7 @@ onetoc2=application/onenote opf=application/oebps-package+xml opml=text/x-opml oprc=application/vnd.palm +opus=audio/ogg org=application/vnd.lotus-organizer osf=application/vnd.yamaha.openscoreformat osfpvg=application/vnd.yamaha.openscoreformat.osfpvg+xml - 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: Align embedded MIME type mappings with BZ 68378 updates to web.xml
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 bc4e49dea9 Align embedded MIME type mappings with BZ 68378 updates to web.xml bc4e49dea9 is described below commit bc4e49dea918af8bff112fad238a07a62c33c813 Author: Mark Thomas AuthorDate: Tue Jan 2 11:11:24 2024 + Align embedded MIME type mappings with BZ 68378 updates to web.xml --- java/org/apache/catalina/startup/MimeTypeMappings.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index f885260ee0..123a9af42f 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -294,6 +294,7 @@ gdl=model/vnd.gdl geo=application/vnd.dynageo gex=application/vnd.geometry-explorer ggb=application/vnd.geogebra.file +ggs=application/vnd.geogebra.slides ggt=application/vnd.geogebra.tool ghf=application/vnd.groove-help gif=image/gif @@ -470,6 +471,7 @@ mif=application/x-mif mime=message/rfc822 mj2=video/mj2 mjp2=video/mj2 +mjs=text/javascript mk3d=video/x-matroska mka=audio/x-matroska mks=video/x-matroska @@ -577,6 +579,7 @@ onetoc2=application/onenote opf=application/oebps-package+xml opml=text/x-opml oprc=application/vnd.palm +opus=audio/ogg org=application/vnd.lotus-organizer osf=application/vnd.yamaha.openscoreformat osfpvg=application/vnd.yamaha.openscoreformat.osfpvg+xml - 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: Align embedded MIME type mappings with BZ 68378 updates to web.xml
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 0ef767c109 Align embedded MIME type mappings with BZ 68378 updates to web.xml 0ef767c109 is described below commit 0ef767c109ae1915e917bcd29804b68fff987277 Author: Mark Thomas AuthorDate: Tue Jan 2 11:11:24 2024 + Align embedded MIME type mappings with BZ 68378 updates to web.xml --- java/org/apache/catalina/startup/MimeTypeMappings.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index f885260ee0..123a9af42f 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -294,6 +294,7 @@ gdl=model/vnd.gdl geo=application/vnd.dynageo gex=application/vnd.geometry-explorer ggb=application/vnd.geogebra.file +ggs=application/vnd.geogebra.slides ggt=application/vnd.geogebra.tool ghf=application/vnd.groove-help gif=image/gif @@ -470,6 +471,7 @@ mif=application/x-mif mime=message/rfc822 mj2=video/mj2 mjp2=video/mj2 +mjs=text/javascript mk3d=video/x-matroska mka=audio/x-matroska mks=video/x-matroska @@ -577,6 +579,7 @@ onetoc2=application/onenote opf=application/oebps-package+xml opml=text/x-opml oprc=application/vnd.palm +opus=audio/ogg org=application/vnd.lotus-organizer osf=application/vnd.yamaha.openscoreformat osfpvg=application/vnd.yamaha.openscoreformat.osfpvg+xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Align embedded MIME type mappings with BZ 68378 updates to web.xml
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new ed8cc4f3be Align embedded MIME type mappings with BZ 68378 updates to web.xml ed8cc4f3be is described below commit ed8cc4f3beddbdc7d9634cc287660322804007fd Author: Mark Thomas AuthorDate: Tue Jan 2 11:11:24 2024 + Align embedded MIME type mappings with BZ 68378 updates to web.xml --- java/org/apache/catalina/startup/MimeTypeMappings.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/catalina/startup/MimeTypeMappings.properties b/java/org/apache/catalina/startup/MimeTypeMappings.properties index f885260ee0..123a9af42f 100644 --- a/java/org/apache/catalina/startup/MimeTypeMappings.properties +++ b/java/org/apache/catalina/startup/MimeTypeMappings.properties @@ -294,6 +294,7 @@ gdl=model/vnd.gdl geo=application/vnd.dynageo gex=application/vnd.geometry-explorer ggb=application/vnd.geogebra.file +ggs=application/vnd.geogebra.slides ggt=application/vnd.geogebra.tool ghf=application/vnd.groove-help gif=image/gif @@ -470,6 +471,7 @@ mif=application/x-mif mime=message/rfc822 mj2=video/mj2 mjp2=video/mj2 +mjs=text/javascript mk3d=video/x-matroska mka=audio/x-matroska mks=video/x-matroska @@ -577,6 +579,7 @@ onetoc2=application/onenote opf=application/oebps-package+xml opml=text/x-opml oprc=application/vnd.palm +opus=audio/ogg org=application/vnd.lotus-organizer osf=application/vnd.yamaha.openscoreformat osfpvg=application/vnd.yamaha.openscoreformat.osfpvg+xml - 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/1079 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] 3e1b8dd4d25e2e1f2378054dc9efde9d02cc75f9 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 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/830 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] 32e8b51030684b96b40204361c188550bac3ab5c 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
(tomcat) branch 9.0.x updated: Add release date
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 f43f978cc4 Add release date f43f978cc4 is described below commit f43f978cc4c438797f8c9c6e2405cc6ff05a50b6 Author: remm AuthorDate: Tue Jan 2 11:15:26 2024 +0100 Add release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ee023e5954..8971d4be46 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -152,7 +152,7 @@ - + - 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/829 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] f640e5d2e012acf6dafc0e9c6cdcb996102742ec 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
[Bug 68378] Add MIME type mapping for *.mjs (JavaScript module)
https://bz.apache.org/bugzilla/show_bug.cgi?id=68378 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- I've updated res/scripts/check-mime.pl and then run it. It picked up this addition and two others. Fixed in: - 11.0.x for 11.0.0-M16 onwards - 10.1.x for 10.1.18 onwards - 9.0.x for 9.0.85 onwards - 8.5.x for 8.5.98 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 8.5.x updated: Fix BZ 68378 - add mime type for mjs and others - aligning with httpd
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 69b8f398d6 Fix BZ 68378 - add mime type for mjs and others - aligning with httpd 69b8f398d6 is described below commit 69b8f398d64f336d4954d69aead1b19f5126fd4f Author: Mark Thomas AuthorDate: Tue Jan 2 09:21:54 2024 + Fix BZ 68378 - add mime type for mjs and others - aligning with httpd --- conf/web.xml | 12 webapps/docs/changelog.xml | 11 +++ 2 files changed, 23 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index f81950e00e..5d5e920273 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -1763,6 +1763,10 @@ ggb application/vnd.geogebra.file + +ggs +application/vnd.geogebra.slides + ggt application/vnd.geogebra.tool @@ -2467,6 +2471,10 @@ mjp2 video/mj2 + +mjs +text/javascript + mk3d video/x-matroska @@ -2905,6 +2913,10 @@ oprc application/vnd.palm + +opus +audio/ogg + org application/vnd.lotus-organizer diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 462a848a8e..7e2812e97f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,17 @@ issues do not "pop up" wrt. others). --> + + + +68378: Align extension to MIME type mappings in the global +web.xml with those in httpd by adding +application/vnd.geogebra.slides for ggs, +text/javascript for mjs and +audio/ogg for opus. (markt) + + + - 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 BZ 68378 - add mime type for mjs and others - aligning with httpd
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 e5710b9811 Fix BZ 68378 - add mime type for mjs and others - aligning with httpd e5710b9811 is described below commit e5710b98112a08dfca5ec7104400f34df7dd8fb7 Author: Mark Thomas AuthorDate: Tue Jan 2 09:21:54 2024 + Fix BZ 68378 - add mime type for mjs and others - aligning with httpd --- conf/web.xml | 12 webapps/docs/changelog.xml | 11 +++ 2 files changed, 23 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index 2c7874dcc0..b38c6a1b5f 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -1770,6 +1770,10 @@ ggb application/vnd.geogebra.file + +ggs +application/vnd.geogebra.slides + ggt application/vnd.geogebra.tool @@ -2474,6 +2478,10 @@ mjp2 video/mj2 + +mjs +text/javascript + mk3d video/x-matroska @@ -2912,6 +2920,10 @@ oprc application/vnd.palm + +opus +audio/ogg + org application/vnd.lotus-organizer diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2bb1a6f150..ee023e5954 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,17 @@ issues do not "pop up" wrt. others). --> + + + +68378: Align extension to MIME type mappings in the global +web.xml with those in httpd by adding +application/vnd.geogebra.slides for ggs, +text/javascript for mjs and +audio/ogg for opus. (markt) + + + - 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 BZ 68378 - add mime type for mjs and others - aligning with httpd
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 3e1b8dd4d2 Fix BZ 68378 - add mime type for mjs and others - aligning with httpd 3e1b8dd4d2 is described below commit 3e1b8dd4d25e2e1f2378054dc9efde9d02cc75f9 Author: Mark Thomas AuthorDate: Tue Jan 2 09:21:54 2024 + Fix BZ 68378 - add mime type for mjs and others - aligning with httpd --- conf/web.xml | 12 webapps/docs/changelog.xml | 11 +++ 2 files changed, 23 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index d01ab9b005..085d84e82c 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -1770,6 +1770,10 @@ ggb application/vnd.geogebra.file + +ggs +application/vnd.geogebra.slides + ggt application/vnd.geogebra.tool @@ -2474,6 +2478,10 @@ mjp2 video/mj2 + +mjs +text/javascript + mk3d video/x-matroska @@ -2912,6 +2920,10 @@ oprc application/vnd.palm + +opus +audio/ogg + org application/vnd.lotus-organizer diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4ee4ad02bf..558e4bd850 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,17 @@ issues do not "pop up" wrt. others). --> + + + +68378: Align extension to MIME type mappings in the global +web.xml with those in httpd by adding +application/vnd.geogebra.slides for ggs, +text/javascript for mjs and +audio/ogg for opus. (markt) + + + - 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: Remove wasm from TOMCAT_ONLY as it is now also defined in httpd
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 fa553a3469 Remove wasm from TOMCAT_ONLY as it is now also defined in httpd fa553a3469 is described below commit fa553a346985ade16ff533bf58e358578f3e3224 Author: Mark Thomas AuthorDate: Tue Jan 2 09:13:08 2024 + Remove wasm from TOMCAT_ONLY as it is now also defined in httpd --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index e3359bd8d5..23a6b6a3e2 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,7 +94,6 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic -wasm application/wasm z application/x-compress ); - 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: Remove wasm from TOMCAT_ONLY as it is now also defined in httpd
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 8a6e5d7ebf Remove wasm from TOMCAT_ONLY as it is now also defined in httpd 8a6e5d7ebf is described below commit 8a6e5d7ebf9890e7305e9778409ac14288576d03 Author: Mark Thomas AuthorDate: Tue Jan 2 09:13:08 2024 + Remove wasm from TOMCAT_ONLY as it is now also defined in httpd --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index e3359bd8d5..23a6b6a3e2 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,7 +94,6 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic -wasm application/wasm z application/x-compress ); - 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: Remove wasm from TOMCAT_ONLY as it is now also defined in httpd
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new b46890b1ee Remove wasm from TOMCAT_ONLY as it is now also defined in httpd b46890b1ee is described below commit b46890b1ee56cbd68ef22aa3f5c745c528b07b5c Author: Mark Thomas AuthorDate: Tue Jan 2 09:13:08 2024 + Remove wasm from TOMCAT_ONLY as it is now also defined in httpd --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index e3359bd8d5..23a6b6a3e2 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,7 +94,6 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic -wasm application/wasm z application/x-compress ); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix BZ 68378 - add mime type for mjs and others - aligning with httpd
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 32e8b51030 Fix BZ 68378 - add mime type for mjs and others - aligning with httpd 32e8b51030 is described below commit 32e8b51030684b96b40204361c188550bac3ab5c Author: Mark Thomas AuthorDate: Tue Jan 2 09:21:54 2024 + Fix BZ 68378 - add mime type for mjs and others - aligning with httpd --- conf/web.xml | 12 webapps/docs/changelog.xml | 7 +++ 2 files changed, 19 insertions(+) diff --git a/conf/web.xml b/conf/web.xml index 175c308c79..fc79046e3f 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -1750,6 +1750,10 @@ ggb application/vnd.geogebra.file + +ggs +application/vnd.geogebra.slides + ggt application/vnd.geogebra.tool @@ -2454,6 +2458,10 @@ mjp2 video/mj2 + +mjs +text/javascript + mk3d video/x-matroska @@ -2892,6 +2900,10 @@ oprc application/vnd.palm + +opus +audio/ogg + org application/vnd.lotus-organizer diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 1fd8f931cb..3a97e225ab 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -112,6 +112,13 @@ the default servlet via the init param directoryRedirectStatusCode. (funkman/markt) + +68378: Align extension to MIME type mappings in the global +web.xml with those in httpd by adding +application/vnd.geogebra.slides for ggs, +text/javascript for mjs and +audio/ogg for opus. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Remove wasm from TOMCAT_ONLY as it is now also defined in httpd
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new f640e5d2e0 Remove wasm from TOMCAT_ONLY as it is now also defined in httpd f640e5d2e0 is described below commit f640e5d2e012acf6dafc0e9c6cdcb996102742ec Author: Mark Thomas AuthorDate: Tue Jan 2 09:13:08 2024 + Remove wasm from TOMCAT_ONLY as it is now also defined in httpd --- res/scripts/check-mime.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/res/scripts/check-mime.pl b/res/scripts/check-mime.pl index e3359bd8d5..23a6b6a3e2 100755 --- a/res/scripts/check-mime.pl +++ b/res/scripts/check-mime.pl @@ -94,7 +94,6 @@ my %TOMCAT_ONLY = qw( qtif image/x-quicktime shtml text/x-server-parsed-html ulw audio/basic -wasm application/wasm z application/x-compress ); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
