svn commit: r1918976 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml
Author: dsoumis Date: Sat Jul 6 18:24:35 2024 New Revision: 1918976 URL: http://svn.apache.org/viewvc?rev=1918976&view=rev Log: Add new committer - Dimitris Soumis Modified: tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1918976&r1=1918975&r2=1918976&view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Sat Jul 6 18:24:35 2024 @@ -147,6 +147,9 @@ A complete list of all the Apache Commit Han Li (lihan at apache.org) +Dimitris Soumis (dsoumis at apache.org) + + Emeritus PMC members http://www.apache.org/foundation/glossary.html#Emeritus";> Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1918976&r1=1918975&r2=1918976&view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Sat Jul 6 18:24:35 2024 @@ -157,6 +157,9 @@ A complete list of all the Apache Commit Han Li (lihan at apache.org) +Dimitris Soumis (dsoumis at apache.org) + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated: Update, refactor and polish instructions of the documentation. (#25)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/main by this push: new 2b1082d95 Update, refactor and polish instructions of the documentation. (#25) 2b1082d95 is described below commit 2b1082d95f8cb05f4df3bc7cfef83a40ee8de11b Author: Dimitrios Soumis AuthorDate: Tue Jul 9 11:45:20 2024 +0300 Update, refactor and polish instructions of the documentation. (#25) * Update, refactor and polish instructions of the documentation. Remove building section for windows and refer directly to the wiki as it was more confusing than helpful. Fix changelog.xml --- xdocs/index.xml | 112 1 file changed, 47 insertions(+), 65 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index 24be0623d..9a359adab 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -61,7 +61,7 @@ list of changes. - Build tc-native requires three components to be installed: +To build TC-Native, the following components must be installed: APR library @@ -70,73 +70,53 @@ list of changes. - In debian based Linux those dependencies could be installed by something like: +For Debian-based Linux distributions, these dependencies can be installed using the following command: -apt-get install libapr1.0-dev libssl-dev +apt-get install libapr1-dev libssl-dev openjdk-11-jdk - In rpm based Linux those dependencies could be installed by something like: +For RPM-based Linux distributions, these dependencies can be installed using the following command: -yum install apr-devel openssl-devel +yum install apr-devel openssl-devel java-11-openjdk-devel -On all the POSIX systems (Linux, Solaris, HP-UX, AIX etc...) a well-known -configure and make is used to build tc-native. -In the jni/native runs: + On all POSIX-like systems (Linux, Solaris, HP-UX, AIX etc...), the well-known + configure and make are used to build TC-Native. + To see a description of all configuration parameters, run the following command in the native directory of the source distribution: ./configure --help -to read the description of all the parameters. +To create the includes and makefiles necessary for building TC-Native, use the following command: ./configure --with-apr=$HOME/APR \ --with-java-home=$JAVA_HOME \ --with-ssl=$HOME/OPENSSL \ --prefix=$CATALINA_HOME -to create the includes and makefiles to be able to build tc-native. Where: -$HOME/APR is something like /usr/bin/apr-1-config or the path -where apr is installed. -$JAVA_HOME is something like /home/jfclere/JAVA/jdk11 or the -path to a JDK installation. Any JDK should work but it is advisable to use -the same JVM version the JVM you use with Tomcat. +$HOME/APR is the path to the APR installation, such as /usr/bin/apr-1-config. +$JAVA_HOME is the path to a JDK installation, for example, /home/jfclere/JAVA/jdk11. + Any JDK version should work, but it is advisable to use the same JVM version as the one you use with Tomcat. $HOME/OPENSSL is the path where OpenSSL is installed. $CATALINA_HOME is the path where the produced libraries will be -installed. Something like $HOME/apache-tomcat-10.1.0 +installed, such as $HOME/apache-tomcat-10.1.0 -The configure is able to guess most of OpenSSL standard installations. -So most of the time the following will be enough: + The configure script can automatically detect most standard APR and OpenSSL installations. Therefore, an equivalent command is usually sufficient: ./configure --with-apr=/usr/bin/apr-1-config \ ---with-java-home=/home/jfclere/JAVA/jdk11 \ ---with-ssl=yes \ ---prefix=$CATALINA_HOME +>./configure --with-java-home=$JAVA_HOME --prefix=$CATALINA_HOME -To build the libraries and install them: + To build and install the libraries, run: make && make install -The libraries will be found in $CATALINA_HOME/lib +The libraries will be installed in $CATALINA_HOME/lib. - Download the Windows sources of tc-native and extract them. - - - Obtain the Windows sources for - http://apr.apache.org/download.cgi";>APR and - https://www.openssl.org/source/";>OpenSSL. Apply the patches from - native/srclib and build APR and OpenSSL for your platform (X86 or X64). - - -Build with nmake -f NMAKEMakefile WITH_APR=... WITH_OPENSSL=... APR_DECLARE_STATIC=1 - - -More detailed instructions including the steps to create a standard release +Detailed building instructions including the
(tomcat) branch main updated (0c4af7ea19 -> ff49f19252)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0c4af7ea19 Better documentation for SSLHostConfig.truststoreProvider default add ff49f19252 Add ParameterLimitValve to enforce request parameter limits for specific URLs (#753) No new revisions were added by this update. Summary of changes: java/org/apache/catalina/connector/Request.java| 23 +- .../apache/catalina/valves/LocalStrings.properties | 6 + .../catalina/valves/ParameterLimitValve.java | 265 + .../catalina/session/TestPersistentManager.java| 2 +- .../catalina/valves/TestParameterLimitValve.java | 428 + test/org/apache/catalina/valves/TestSSLValve.java | 70 +++- webapps/docs/changelog.xml | 5 + webapps/docs/config/valve.xml | 43 +++ 8 files changed, 823 insertions(+), 19 deletions(-) create mode 100644 java/org/apache/catalina/valves/ParameterLimitValve.java create mode 100644 test/org/apache/catalina/valves/TestParameterLimitValve.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Remove possible exclusions from compiler.xml
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit fdbb392c318ca1bd825ce64cc4367d7c910b782a Author: Dimitris Soumis AuthorDate: Wed Jun 5 10:47:17 2024 +0300 Remove possible exclusions from compiler.xml (cherry picked from commit f408255a12736fc0dade2434d9ddb9b8ed383998) --- res/ide-support/idea/compiler.xml | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/res/ide-support/idea/compiler.xml b/res/ide-support/idea/compiler.xml index c65738a15b..a699b319c1 100644 --- a/res/ide-support/idea/compiler.xml +++ b/res/ide-support/idea/compiler.xml @@ -17,14 +17,8 @@ --> - - - - \ No newline at end of file + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Added instructions on how to remove the exclusion of FFM directories in IDEA
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0f0b08ab71815fabd3126202ce00712b0086118c
Author: Igal Sapir
AuthorDate: Tue Jun 11 17:00:35 2024 -0700
Added instructions on how to remove the exclusion of FFM directories in IDEA
(cherry picked from commit 7118991902b3ae27e3ef128e86f94ef8b5dbb509)
---
build.xml | 8 +++-
res/ide-support/idea/tomcat.iml | 5 +
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 3950cb96d5..7fa3ccd89f 100644
--- a/build.xml
+++ b/build.xml
@@ -3962,8 +3962,14 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
IntelliJ IDEA project directory created.
+
The SDK was set to "${build.java.version}" so make sure that your
IDE has an SDK with that name,
-or update the Project Settings accordingly.
+or update the Project Settings accordingly. Choose [File > Project
Structure] to open the settings dialog
+and set the SDK level, language level, etc. as needed.
+
+Some folders have been excluded by default as they require the latest SDK
version and enabling of preview
+features. You can remove or comment out the exclusions to enable the
directories in the .idea/tomcat.iml
+file, or via the IDEA UI by right-clicking folders, and choosing [Mark
Directory as > Cancel Exclusion]
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 50349c2121..df08b480eb 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -22,6 +22,11 @@
+
+
-
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 (0871cda882 -> fd0d633fce)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0871cda882 Work around available tricks new 3ccf4611a4 Exclude openssl and panama directories from idea support new 0f0b08ab71 Added instructions on how to remove the exclusion of FFM directories in IDEA new fdbb392c31 Remove possible exclusions from compiler.xml new fd0d633fce Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit 6b00658 for CVE-2024-56337 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 8 +++- res/ide-support/idea/compiler.xml | 8 +--- res/ide-support/idea/tomcat.iml| 7 +++ res/ide-support/idea/workspace.xml | 8 4 files changed, 23 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Exclude openssl and panama directories from idea support
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 3ccf4611a465d417b5d93f76595b1ef4f5ec5099 Author: Dimitris Soumis AuthorDate: Wed Jun 5 10:44:50 2024 +0300 Exclude openssl and panama directories from idea support (cherry picked from commit c82308dea00441c883ab19d11e0be72d6782e760) --- res/ide-support/idea/tomcat.iml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml index 96f128d993..50349c2121 100644 --- a/res/ide-support/idea/tomcat.iml +++ b/res/ide-support/idea/tomcat.iml @@ -22,6 +22,8 @@ + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit 6b00658 for CVE-2024-56337
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit fd0d633fcefb8a763c6e8f206d0e87a29c47e936 Author: Dimitris Soumis AuthorDate: Wed Jan 29 18:34:20 2025 +0200 Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit 6b00658 for CVE-2024-56337 --- res/ide-support/idea/workspace.xml | 8 1 file changed, 8 insertions(+) diff --git a/res/ide-support/idea/workspace.xml b/res/ide-support/idea/workspace.xml index bb47d31574..9d8906a99c 100644 --- a/res/ide-support/idea/workspace.xml +++ b/res/ide-support/idea/workspace.xml @@ -30,5 +30,13 @@ + + + + + + + + \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Add ParameterLimitValve to enforce request parameter limits for specific URLs (#753)
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 62b2511e62b4099b61920b1463e464476dee014e
Author: Dimitrios Soumis
AuthorDate: Wed Jan 29 16:45:53 2025 +0200
Add ParameterLimitValve to enforce request parameter limits for specific
URLs (#753)
Introduce ParameterLimitValve to enforce request parameter limits
- Added `ParameterLimitValve`, a new valve that allows enforcing limits on
the number of parameters in HTTP requests.
- Supports defining per-URL pattern parameter limits using regular
expressions.
- Requests exceeding the configured limits are rejected with an HTTP 400
Bad Request error.
- Configuration is possible through `context.xml` and `server.xml`, or via
dynamic management.
- Includes integration tests (`TestParameterLimitValve`) to validate
enforcement behavior across different contexts.
- Added documentation detailing the valve’s attributes, configuration
options, and usage examples.
(cherry picked from commit ff49f19252aaf862faa62a624f6ffe224d76493d)
---
java/org/apache/catalina/connector/Request.java| 23 +-
.../apache/catalina/valves/LocalStrings.properties | 6 +
.../catalina/valves/ParameterLimitValve.java | 265 +
.../catalina/session/TestPersistentManager.java| 2 +-
.../catalina/valves/TestParameterLimitValve.java | 428 +
test/org/apache/catalina/valves/TestSSLValve.java | 70 +++-
webapps/docs/changelog.xml | 5 +
webapps/docs/config/valve.xml | 43 +++
8 files changed, 823 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 85125223d6..0dfc63019d 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -145,6 +145,9 @@ public class Request implements HttpServletRequest {
*/
public Request(Connector connector, org.apache.coyote.Request
coyoteRequest) {
this.connector = connector;
+if (connector != null) {
+this.maxParameterCount = connector.getMaxParameterCount();
+}
this.coyoteRequest = coyoteRequest;
inputBuffer = new InputBuffer(coyoteRequest);
}
@@ -411,6 +414,10 @@ public class Request implements HttpServletRequest {
private HttpServletRequest applicationRequest = null;
+/**
+ * The maximum number of request parameters
+ */
+private int maxParameterCount = -1;
// - Public Methods
@@ -441,6 +448,11 @@ public class Request implements HttpServletRequest {
userPrincipal = null;
subject = null;
parametersParsed = false;
+if (connector != null ) {
+maxParameterCount = connector.getMaxParameterCount();
+} else {
+maxParameterCount = -1;
+}
if (parts != null) {
for (Part part : parts) {
try {
@@ -829,6 +841,14 @@ public class Request implements HttpServletRequest {
coyoteRequest.setServerPort(port);
}
+/**
+ * Set the maximum number of request parameters (GET plus POST) for a
single request
+ *
+ * @param maxParameterCount The maximum number of request parameters
+ */
+public void setMaxParameterCount(int maxParameterCount) {
+this.maxParameterCount = maxParameterCount;
+}
// - ServletRequest Methods
@@ -2429,7 +2449,6 @@ public class Request implements HttpServletRequest {
}
}
-int maxParameterCount = getConnector().getMaxParameterCount();
Parameters parameters = coyoteRequest.getParameters();
parameters.setLimit(maxParameterCount);
@@ -2768,8 +2787,6 @@ public class Request implements HttpServletRequest {
Parameters parameters = coyoteRequest.getParameters();
-// Set this every time in case limit has been changed via JMX
-int maxParameterCount = getConnector().getMaxParameterCount();
if (parts != null && maxParameterCount > 0) {
maxParameterCount -= parts.size();
}
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties
b/java/org/apache/catalina/valves/LocalStrings.properties
index a78bfc810b..a2ae718737 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -172,3 +172,9 @@ stuckThreadDetectionValve.interrupted=Thread interrupted
after the request is fi
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}])
was previously reported to be stuck but has completed. It was active for
approximately [{1}] milliseconds.{2,choice,
(tomcat) branch 11.0.x updated (86862a7544 -> c79adf45a8)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 86862a7544 Work around available tricks new 62b2511e62 Add ParameterLimitValve to enforce request parameter limits for specific URLs (#753) new c79adf45a8 Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit bda7301 for CVE-2024-56337 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/connector/Request.java| 23 +- .../apache/catalina/valves/LocalStrings.properties | 6 + .../catalina/valves/ParameterLimitValve.java | 265 + res/ide-support/idea/workspace.xml | 8 + .../catalina/session/TestPersistentManager.java| 2 +- .../catalina/valves/TestParameterLimitValve.java | 428 + test/org/apache/catalina/valves/TestSSLValve.java | 70 +++- webapps/docs/changelog.xml | 5 + webapps/docs/config/valve.xml | 43 +++ 9 files changed, 831 insertions(+), 19 deletions(-) create mode 100644 java/org/apache/catalina/valves/ParameterLimitValve.java create mode 100644 test/org/apache/catalina/valves/TestParameterLimitValve.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit bda7301 for CVE-2024-56337
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c79adf45a88420cba206e3e3787bd73923842879 Author: Dimitris Soumis AuthorDate: Wed Jan 29 18:34:20 2025 +0200 Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit bda7301 for CVE-2024-56337 --- res/ide-support/idea/workspace.xml | 8 1 file changed, 8 insertions(+) diff --git a/res/ide-support/idea/workspace.xml b/res/ide-support/idea/workspace.xml index bb47d31574..9d8906a99c 100644 --- a/res/ide-support/idea/workspace.xml +++ b/res/ide-support/idea/workspace.xml @@ -30,5 +30,13 @@ + + + + + + + + \ No newline at end of file - 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 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 79e4d27450 Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands 79e4d27450 is described below commit 79e4d27450d67103b19e31a9040bfe5f2234e671 Author: Dimitris Soumis AuthorDate: Sat Feb 15 22:18:17 2025 +0200 Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands https://bz.apache.org/bugzilla/show_bug.cgi?id=69584 --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index ee679ad0c6..d8d90d0416 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -463,7 +463,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ @@ -549,7 +549,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ - 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 BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 2d50aa64ea Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands 2d50aa64ea is described below commit 2d50aa64eaf0fe84272fc8556abdfa82b36dfad8 Author: Dimitris Soumis AuthorDate: Sat Feb 15 22:18:17 2025 +0200 Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands https://bz.apache.org/bugzilla/show_bug.cgi?id=69584 --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index c5a996cb65..4755c1576f 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -470,7 +470,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ @@ -556,7 +556,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ - 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 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 a83979963a Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands a83979963a is described below commit a83979963ad2c0f2812323610a27883176352bba Author: Dimitris Soumis AuthorDate: Sat Feb 15 22:18:17 2025 +0200 Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands https://bz.apache.org/bugzilla/show_bug.cgi?id=69584 --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 959a637389..3ae29bc8eb 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -521,7 +521,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ @@ -607,7 +607,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ - 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 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 e9384a81ed Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands e9384a81ed is described below commit e9384a81edec9aa5ce1d7a6a2d16198ad1b83736 Author: Dimitris Soumis AuthorDate: Sat Feb 15 22:18:17 2025 +0200 Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands https://bz.apache.org/bugzilla/show_bug.cgi?id=69584 --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 8d07001214..90bd5b74d6 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -561,7 +561,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ @@ -648,7 +648,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1923858 - /tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
Author: dsoumis Date: Sun Feb 16 14:48:37 2025 New Revision: 1923858 URL: http://svn.apache.org/viewvc?rev=1923858&view=rev Log: Update footer copyright date range Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1923858&r1=1923857&r2=1923858&view=diff == --- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original) +++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Sun Feb 16 14:48:37 2025 @@ -146,7 +146,7 @@ -Copyright © 1999-2024, The Apache Software Foundation +Copyright © 1999-2025, The Apache Software Foundation Apache Tomcat, Tomcat, Apache, the Apache Tomcat logo and the Apache logo are either registered trademarks or trademarks of the Apache Software - 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: Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands"
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 68504f2a94 Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" 68504f2a94 is described below commit 68504f2a94c1e2a72ea62d8b8584c665affe49bb Author: Dimitris Soumis AuthorDate: Sun Feb 16 16:57:49 2025 +0200 Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" This reverts commit 2d50aa64eaf0fe84272fc8556abdfa82b36dfad8. --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 4755c1576f..c5a996cb65 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -470,7 +470,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ @@ -556,7 +556,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands"
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 8b4a973a8d Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" 8b4a973a8d is described below commit 8b4a973a8df4550c355a454e8f13d7760018252b Author: Dimitris Soumis AuthorDate: Sun Feb 16 16:56:46 2025 +0200 Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" This reverts commit 79e4d27450d67103b19e31a9040bfe5f2234e671. --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index d8d90d0416..ee679ad0c6 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -463,7 +463,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ @@ -549,7 +549,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Add wine check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 092b067a2aad0fe302a4286ea73950a7dfb536b2 Author: Dimitris Soumis AuthorDate: Wed Mar 5 14:39:58 2025 +0200 Add wine check in -installer-set-properties-3 Fixes the following case: If the `nsis.tool=wine` and `version.dev` is not set, all conditions are false and the `nsis.executable.unix.version.ok` property is left unset leading to a BUILD FAILED. --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 726a48f3a2..4f993d580d 100644 --- a/build.xml +++ b/build.xml @@ -2661,6 +2661,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Add skip.installer check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit a0b68a6cb4aa6e542c6b7226fe7c5699f6dc55c9 Author: Dimitris Soumis AuthorDate: Wed Mar 5 14:46:50 2025 +0200 Add skip.installer check in -installer-set-properties-3 Fixes the following case: It doesn't take into cosnideration if the `skip.installer` parameter has been provided leading to a BUILD FAILED --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 4f993d580d..d5ad123bb9 100644 --- a/build.xml +++ b/build.xml @@ -2660,6 +2660,7 @@ depends="-installer-set-properties-2"> + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (88c43c7964 -> a0b68a6cb4)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 88c43c7964 Return 400 for content and range mismatch new 092b067a2a Add wine check in -installer-set-properties-3 new a0b68a6cb4 Add skip.installer check in -installer-set-properties-3 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 2 ++ 1 file changed, 2 insertions(+) - 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 (5055be2f93 -> dc7f879f31)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 5055be2f93 Fix bad merge new 38f6482e16 Add wine check in -installer-set-properties-3 new dc7f879f31 Add skip.installer check in -installer-set-properties-3 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 2 ++ 1 file changed, 2 insertions(+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Add skip.installer check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit dc7f879f315d6ad6db9946c37e7c732c40a2d27f Author: Dimitris Soumis AuthorDate: Wed Mar 5 14:46:50 2025 +0200 Add skip.installer check in -installer-set-properties-3 Fixes the following case: It doesn't take into cosnideration if the `skip.installer` parameter has been provided leading to a BUILD FAILED --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 409d36a69d..fb9a364820 100644 --- a/build.xml +++ b/build.xml @@ -2613,6 +2613,7 @@ depends="-installer-set-properties-2"> + - 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 property reference for skip.installer in build.xml
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 0b9aed3047 Fix property reference for skip.installer in build.xml
0b9aed3047 is described below
commit 0b9aed30476e4e8332b44c79da0ccc070e490a42
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 18:18:34 2025 +0200
Fix property reference for skip.installer in build.xml
---
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index fb9a364820..5f75a63f71 100644
--- a/build.xml
+++ b/build.xml
@@ -2650,7 +2650,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2697,7 +2697,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2708,7 +2708,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Add wine check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 38f6482e16a8bf0c4dc65b946e49ea1900ae9041 Author: Dimitris Soumis AuthorDate: Wed Mar 5 14:39:58 2025 +0200 Add wine check in -installer-set-properties-3 Fixes the following case: If the `nsis.tool=wine` and `version.dev` is not set, all conditions are false and the `nsis.executable.unix.version.ok` property is left unset leading to a BUILD FAILED. --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 428b5a4da9..409d36a69d 100644 --- a/build.xml +++ b/build.xml @@ -2614,6 +2614,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Fix property reference for skip.installer in build.xml
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3c15bf21bde367f3524820b505d1d90e6aed1523
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 18:18:34 2025 +0200
Fix property reference for skip.installer in build.xml
---
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 4fc2fac229..836774a2a9 100644
--- a/build.xml
+++ b/build.xml
@@ -2678,7 +2678,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2725,7 +2725,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2736,7 +2736,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix property reference for skip.installer in build.xml
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 1da6da3b64 Fix property reference for skip.installer in build.xml
1da6da3b64 is described below
commit 1da6da3b64e82fe2a2805faf08f36246d85da7cb
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 18:18:34 2025 +0200
Fix property reference for skip.installer in build.xml
---
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index d5ad123bb9..29f145db2a 100644
--- a/build.xml
+++ b/build.xml
@@ -2697,7 +2697,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2744,7 +2744,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2755,7 +2755,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Fix property reference for skip.installer in build.xml
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 00e4f84b4b749fdae1aa6d269de814f36e3c7a0e
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 18:18:34 2025 +0200
Fix property reference for skip.installer in build.xml
---
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index b14215defd..1b2d0f5fb7 100644
--- a/build.xml
+++ b/build.xml
@@ -2675,7 +2675,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2722,7 +2722,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
@@ -2733,7 +2733,7 @@ You may need a custom build of makensis. Instructions for
this may be found in B
+ unless="${skip.installer}">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Add skip.installer check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f7d2ada9d187715149f8db757294fbf5ff6dc47d
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 14:46:50 2025 +0200
Add skip.installer check in -installer-set-properties-3
Fixes the following case: It doesn't take into cosnideration if the
`skip.installer` parameter has been provided leading to a BUILD FAILED
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index 1c40910fcf..4fc2fac229 100644
--- a/build.xml
+++ b/build.xml
@@ -2641,6 +2641,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
depends="-installer-set-properties-2">
+
-
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 (3e309fe408 -> 00e4f84b4b)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 3e309fe408 Return 400 for content and range mismatch new 73fed458d3 Add wine check in -installer-set-properties-3 new b7035995c4 Add skip.installer check in -installer-set-properties-3 new 00e4f84b4b Fix property reference for skip.installer in build.xml The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Add wine check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 73fed458d3466e59f119f0c8a7247832ccc7e5f1
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 14:39:58 2025 +0200
Add wine check in -installer-set-properties-3
Fixes the following case: If the `nsis.tool=wine` and `version.dev` is not
set, all conditions are false and the `nsis.executable.unix.version.ok`
property is left unset leading to a BUILD FAILED.
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index af590aebc7..4e98f11497 100644
--- a/build.xml
+++ b/build.xml
@@ -2639,6 +2639,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Add skip.installer check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b7035995c4a1fc34370ccbc17ad0be88928a1d34
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 14:46:50 2025 +0200
Add skip.installer check in -installer-set-properties-3
Fixes the following case: It doesn't take into cosnideration if the
`skip.installer` parameter has been provided leading to a BUILD FAILED
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index 4e98f11497..b14215defd 100644
--- a/build.xml
+++ b/build.xml
@@ -2638,6 +2638,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
depends="-installer-set-properties-2">
+
-
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 (a17e3c056d -> 3c15bf21bd)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from a17e3c056d Return 400 for content and range mismatch new bd0a97e778 Add wine check in -installer-set-properties-3 new f7d2ada9d1 Add skip.installer check in -installer-set-properties-3 new 3c15bf21bd Fix property reference for skip.installer in build.xml The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Add wine check in -installer-set-properties-3
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bd0a97e7782471da12e13aa06941cd0393907bb5
Author: Dimitris Soumis
AuthorDate: Wed Mar 5 14:39:58 2025 +0200
Add wine check in -installer-set-properties-3
Fixes the following case: If the `nsis.tool=wine` and `version.dev` is not
set, all conditions are false and the `nsis.executable.unix.version.ok`
property is left unset leading to a BUILD FAILED.
---
build.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
index 32521dd7a3..1c40910fcf 100644
--- a/build.xml
+++ b/build.xml
@@ -2642,6 +2642,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Clean up check CORS request type method (#826)
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 a4ccdba4bf Clean up check CORS request type method (#826)
a4ccdba4bf is described below
commit a4ccdba4bf7702bbaad177d9b724f9713010018b
Author: 김민종
AuthorDate: Fri Feb 14 05:42:53 2025 +0900
Clean up check CORS request type method (#826)
---
java/org/apache/catalina/filters/CorsFilter.java | 71 +---
1 file changed, 27 insertions(+), 44 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index eb5e5a2fd8..f96d26fda0 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -538,59 +538,42 @@ public class CorsFilter extends GenericFilter {
* @return the CORS type
*/
protected CORSRequestType checkRequestType(final HttpServletRequest
request) {
-CORSRequestType requestType = CORSRequestType.INVALID_CORS;
if (request == null) {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-// Section 6.1.1 and Section 6.2.1
-if (originHeader != null) {
-if (originHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (!RequestUtil.isValidOrigin(originHeader)) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (RequestUtil.isSameOrigin(request, originHeader)) {
-return CORSRequestType.NOT_CORS;
-} else {
-String method = request.getMethod();
-if (method != null) {
-if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader =
-
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
-if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.PRE_FLIGHT;
-} else if (accessControlRequestMethodHeader != null &&
-accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-} else if ("GET".equals(method) || "HEAD".equals(method)) {
-requestType = CORSRequestType.SIMPLE;
-} else if ("POST".equals(method)) {
-String mediaType =
MediaType.parseMediaTypeOnly(request.getContentType());
-if (mediaType == null) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-if
(SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES.contains(mediaType)) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-}
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
+if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
+if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+return CORSRequestType.INVALID_CORS;
+}
+String method = request.getMethod();
+if (method == null) {
+return CORSRequestType.INVALID_CORS;
+}
+if ("OPTIONS".equals(method)) {
+String accessControlRequestMethodHeader =
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+if (accessControlRequestMethodHeader != null) {
+if (!accessControlRequestMethodHeader.isEmpty()) {
+return CORSRequestType.PRE_FLIGHT;
}
+return CORSRequestType.INVALID_CORS;
}
-} else {
-requestType = CORSRequestType.NOT_CORS;
+return CORSRequestType.ACTUAL;
}
-
-return requestType;
+if ("GET".equals(method) || "HEAD".equals(method)) {
+return CORSRequestType.SIMPLE;
+}
+if ("POST".equals(method)) {
+String mediaType =
MediaType.parseMediaTypeOnly(request.getContentType());
+if (me
(tomcat) branch 11.0.x updated: Clean up check CORS request type method (#826)
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 73d5ee6afd Clean up check CORS request type method (#826)
73d5ee6afd is described below
commit 73d5ee6afdde2be495a4af39cea6d9703d6cbc9e
Author: 김민종
AuthorDate: Fri Feb 14 05:42:53 2025 +0900
Clean up check CORS request type method (#826)
(cherry picked from commit a4ccdba4bf7702bbaad177d9b724f9713010018b)
---
java/org/apache/catalina/filters/CorsFilter.java | 71 +---
1 file changed, 27 insertions(+), 44 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index eb5e5a2fd8..f96d26fda0 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -538,59 +538,42 @@ public class CorsFilter extends GenericFilter {
* @return the CORS type
*/
protected CORSRequestType checkRequestType(final HttpServletRequest
request) {
-CORSRequestType requestType = CORSRequestType.INVALID_CORS;
if (request == null) {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-// Section 6.1.1 and Section 6.2.1
-if (originHeader != null) {
-if (originHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (!RequestUtil.isValidOrigin(originHeader)) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (RequestUtil.isSameOrigin(request, originHeader)) {
-return CORSRequestType.NOT_CORS;
-} else {
-String method = request.getMethod();
-if (method != null) {
-if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader =
-
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
-if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.PRE_FLIGHT;
-} else if (accessControlRequestMethodHeader != null &&
-accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-} else if ("GET".equals(method) || "HEAD".equals(method)) {
-requestType = CORSRequestType.SIMPLE;
-} else if ("POST".equals(method)) {
-String mediaType =
MediaType.parseMediaTypeOnly(request.getContentType());
-if (mediaType == null) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-if
(SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES.contains(mediaType)) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-}
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
+if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
+if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+return CORSRequestType.INVALID_CORS;
+}
+String method = request.getMethod();
+if (method == null) {
+return CORSRequestType.INVALID_CORS;
+}
+if ("OPTIONS".equals(method)) {
+String accessControlRequestMethodHeader =
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+if (accessControlRequestMethodHeader != null) {
+if (!accessControlRequestMethodHeader.isEmpty()) {
+return CORSRequestType.PRE_FLIGHT;
}
+return CORSRequestType.INVALID_CORS;
}
-} else {
-requestType = CORSRequestType.NOT_CORS;
+return CORSRequestType.ACTUAL;
}
-
-return requestType;
+if ("GET".equals(method) || "HEAD".equals(method)) {
+return CORSRequestType.SIMPLE;
+}
+if ("POST".equals(method)) {
+Stri
(tomcat) branch 10.1.x updated: Clean up check CORS request type method (#826)
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 ad2f570cde Clean up check CORS request type method (#826)
ad2f570cde is described below
commit ad2f570cde9ae0f0e6d22ccc2e2761e921f2ba67
Author: 김민종
AuthorDate: Fri Feb 14 05:42:53 2025 +0900
Clean up check CORS request type method (#826)
(cherry picked from commit a4ccdba4bf7702bbaad177d9b724f9713010018b)
---
java/org/apache/catalina/filters/CorsFilter.java | 71 +---
1 file changed, 27 insertions(+), 44 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index eb5e5a2fd8..f96d26fda0 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -538,59 +538,42 @@ public class CorsFilter extends GenericFilter {
* @return the CORS type
*/
protected CORSRequestType checkRequestType(final HttpServletRequest
request) {
-CORSRequestType requestType = CORSRequestType.INVALID_CORS;
if (request == null) {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-// Section 6.1.1 and Section 6.2.1
-if (originHeader != null) {
-if (originHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (!RequestUtil.isValidOrigin(originHeader)) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (RequestUtil.isSameOrigin(request, originHeader)) {
-return CORSRequestType.NOT_CORS;
-} else {
-String method = request.getMethod();
-if (method != null) {
-if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader =
-
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
-if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.PRE_FLIGHT;
-} else if (accessControlRequestMethodHeader != null &&
-accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-} else if ("GET".equals(method) || "HEAD".equals(method)) {
-requestType = CORSRequestType.SIMPLE;
-} else if ("POST".equals(method)) {
-String mediaType =
MediaType.parseMediaTypeOnly(request.getContentType());
-if (mediaType == null) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-if
(SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES.contains(mediaType)) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-}
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
+if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
+if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+return CORSRequestType.INVALID_CORS;
+}
+String method = request.getMethod();
+if (method == null) {
+return CORSRequestType.INVALID_CORS;
+}
+if ("OPTIONS".equals(method)) {
+String accessControlRequestMethodHeader =
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+if (accessControlRequestMethodHeader != null) {
+if (!accessControlRequestMethodHeader.isEmpty()) {
+return CORSRequestType.PRE_FLIGHT;
}
+return CORSRequestType.INVALID_CORS;
}
-} else {
-requestType = CORSRequestType.NOT_CORS;
+return CORSRequestType.ACTUAL;
}
-
-return requestType;
+if ("GET".equals(method) || "HEAD".equals(method)) {
+return CORSRequestType.SIMPLE;
+}
+if ("POST".equals(method)) {
+Stri
(tomcat) branch 9.0.x updated: Clean up check CORS request type method (#826)
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 3d967dddad Clean up check CORS request type method (#826)
3d967dddad is described below
commit 3d967dddad8071845686e5a636fffc9763fa15d2
Author: 김민종
AuthorDate: Fri Feb 14 05:42:53 2025 +0900
Clean up check CORS request type method (#826)
(cherry picked from commit a4ccdba4bf7702bbaad177d9b724f9713010018b)
---
java/org/apache/catalina/filters/CorsFilter.java | 71 +---
1 file changed, 27 insertions(+), 44 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 743175b4e8..8520a53a93 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -538,59 +538,42 @@ public class CorsFilter extends GenericFilter {
* @return the CORS type
*/
protected CORSRequestType checkRequestType(final HttpServletRequest
request) {
-CORSRequestType requestType = CORSRequestType.INVALID_CORS;
if (request == null) {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-// Section 6.1.1 and Section 6.2.1
-if (originHeader != null) {
-if (originHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (!RequestUtil.isValidOrigin(originHeader)) {
-requestType = CORSRequestType.INVALID_CORS;
-} else if (RequestUtil.isSameOrigin(request, originHeader)) {
-return CORSRequestType.NOT_CORS;
-} else {
-String method = request.getMethod();
-if (method != null) {
-if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader =
-
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
-if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.PRE_FLIGHT;
-} else if (accessControlRequestMethodHeader != null &&
-accessControlRequestMethodHeader.isEmpty()) {
-requestType = CORSRequestType.INVALID_CORS;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-} else if ("GET".equals(method) || "HEAD".equals(method)) {
-requestType = CORSRequestType.SIMPLE;
-} else if ("POST".equals(method)) {
-String mediaType =
MediaType.parseMediaTypeOnly(request.getContentType());
-if (mediaType == null) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-if
(SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES.contains(mediaType)) {
-requestType = CORSRequestType.SIMPLE;
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
-}
-} else {
-requestType = CORSRequestType.ACTUAL;
-}
+if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
+if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+return CORSRequestType.INVALID_CORS;
+}
+String method = request.getMethod();
+if (method == null) {
+return CORSRequestType.INVALID_CORS;
+}
+if ("OPTIONS".equals(method)) {
+String accessControlRequestMethodHeader =
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+if (accessControlRequestMethodHeader != null) {
+if (!accessControlRequestMethodHeader.isEmpty()) {
+return CORSRequestType.PRE_FLIGHT;
}
+return CORSRequestType.INVALID_CORS;
}
-} else {
-requestType = CORSRequestType.NOT_CORS;
+return CORSRequestType.ACTUAL;
}
-
-return requestType;
+if ("GET".equals(method) || "HEAD".equals(method)) {
+return CORSRequestType.SIMPLE;
+}
+if ("POST".equals(method)) {
+Stri
(tomcat) branch 9.0.x updated: Refactor CORS validation order with explicit guard clauses
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 600aa488c9 Refactor CORS validation order with explicit guard clauses
600aa488c9 is described below
commit 600aa488c9ed4e17e9716d74a3c4e50cce4467f4
Author: Dimitris Soumis
AuthorDate: Fri Feb 14 12:24:28 2025 +0200
Refactor CORS validation order with explicit guard clauses
- Check for null originHeader first to prevent NPEs.
- Validate empty or invalid originHeader before performing same-origin
checks.
---
java/org/apache/catalina/filters/CorsFilter.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 8520a53a93..b8ab4e065c 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -542,12 +542,15 @@ public class CorsFilter extends GenericFilter {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+if (originHeader == null) {
return CORSRequestType.NOT_CORS;
}
-if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+if (originHeader.isEmpty() ||
!RequestUtil.isValidOrigin(originHeader)) {
return CORSRequestType.INVALID_CORS;
}
+if(RequestUtil.isSameOrigin(request, originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
String method = request.getMethod();
if (method == null) {
return CORSRequestType.INVALID_CORS;
-
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: Refactor CORS validation order with explicit guard clauses
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 556122adef Refactor CORS validation order with explicit guard clauses
556122adef is described below
commit 556122adef739d45247972bd6e68d69f96a10037
Author: Dimitris Soumis
AuthorDate: Fri Feb 14 12:24:28 2025 +0200
Refactor CORS validation order with explicit guard clauses
- Check for null originHeader first to prevent NPEs.
- Validate empty or invalid originHeader before performing same-origin
checks.
---
java/org/apache/catalina/filters/CorsFilter.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index f96d26fda0..7363aa9f62 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -542,12 +542,15 @@ public class CorsFilter extends GenericFilter {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+if (originHeader == null) {
return CORSRequestType.NOT_CORS;
}
-if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+if (originHeader.isEmpty() ||
!RequestUtil.isValidOrigin(originHeader)) {
return CORSRequestType.INVALID_CORS;
}
+if(RequestUtil.isSameOrigin(request, originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
String method = request.getMethod();
if (method == null) {
return CORSRequestType.INVALID_CORS;
-
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: Refactor CORS validation order with explicit guard clauses
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 bd74158574 Refactor CORS validation order with explicit guard clauses
bd74158574 is described below
commit bd74158574348cd6794f531d87dd7e9caeadcb85
Author: Dimitris Soumis
AuthorDate: Fri Feb 14 12:24:28 2025 +0200
Refactor CORS validation order with explicit guard clauses
- Check for null originHeader first to prevent NPEs.
- Validate empty or invalid originHeader before performing same-origin
checks.
---
java/org/apache/catalina/filters/CorsFilter.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index f96d26fda0..7363aa9f62 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -542,12 +542,15 @@ public class CorsFilter extends GenericFilter {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+if (originHeader == null) {
return CORSRequestType.NOT_CORS;
}
-if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+if (originHeader.isEmpty() ||
!RequestUtil.isValidOrigin(originHeader)) {
return CORSRequestType.INVALID_CORS;
}
+if(RequestUtil.isSameOrigin(request, originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
String method = request.getMethod();
if (method == null) {
return CORSRequestType.INVALID_CORS;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Refactor CORS validation order with explicit guard clauses
This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 e451872281 Refactor CORS validation order with explicit guard clauses
e451872281 is described below
commit e451872281c1d1e6d7f2b61d2f6f1382573e2166
Author: Dimitris Soumis
AuthorDate: Fri Feb 14 12:24:28 2025 +0200
Refactor CORS validation order with explicit guard clauses
- Check for null originHeader first to prevent NPEs.
- Validate empty or invalid originHeader before performing same-origin
checks.
---
java/org/apache/catalina/filters/CorsFilter.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index f96d26fda0..7363aa9f62 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -542,12 +542,15 @@ public class CorsFilter extends GenericFilter {
throw new
IllegalArgumentException(sm.getString("corsFilter.nullRequest"));
}
String originHeader = request.getHeader(REQUEST_HEADER_ORIGIN);
-if (originHeader == null || RequestUtil.isSameOrigin(request,
originHeader)) {
+if (originHeader == null) {
return CORSRequestType.NOT_CORS;
}
-if (originHeader.isEmpty() ||!RequestUtil.isValidOrigin(originHeader))
{
+if (originHeader.isEmpty() ||
!RequestUtil.isValidOrigin(originHeader)) {
return CORSRequestType.INVALID_CORS;
}
+if(RequestUtil.isSameOrigin(request, originHeader)) {
+return CORSRequestType.NOT_CORS;
+}
String method = request.getMethod();
if (method == null) {
return CORSRequestType.INVALID_CORS;
-
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: Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands"
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 1c80fce73f Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" 1c80fce73f is described below commit 1c80fce73f0765bd73f503677c43c2333ca5c1f2 Author: Dimitris Soumis AuthorDate: Sun Feb 16 16:59:44 2025 +0200 Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" This reverts commit e9384a81edec9aa5ce1d7a6a2d16198ad1b83736. --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 90bd5b74d6..8d07001214 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -561,7 +561,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ @@ -648,7 +648,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ - 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: Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands"
This is an automated email from the ASF dual-hosted git repository. dsoumis 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 eef88ff7aa Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" eef88ff7aa is described below commit eef88ff7aa3dda754c1b5fd7d9fea76349d213e4 Author: Dimitris Soumis AuthorDate: Sun Feb 16 16:59:25 2025 +0200 Revert "Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh commands" This reverts commit a83979963ad2c0f2812323610a27883176352bba. --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 3ae29bc8eb..959a637389 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -521,7 +521,7 @@ elif [ "$1" = "stop" ] ; then fi fi - eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ + eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ @@ -607,7 +607,7 @@ elif [ "$1" = "stop" ] ; then elif [ "$1" = "configtest" ] ; then -eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER "$JAVA_OPTS" \ +eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \ -classpath "\"$CLASSPATH\"" \ -Dcatalina.base="\"$CATALINA_BASE\"" \ -Dcatalina.home="\"$CATALINA_HOME\"" \ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
