[Bug 67582] How to increase website SEO rank on google.
https://bz.apache.org/bugzilla/show_bug.cgi?id=67582 Prestige Park Ridge changed: What|Removed |Added Summary|Prestige Park Ridge |How to increase website |Bangalore |SEO rank on google. -- 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 67582] Prestige Park Ridge Bangalore
https://bz.apache.org/bugzilla/show_bug.cgi?id=67582 Prestige Park Ridge changed: What|Removed |Added OS||All Keywords||APIBug URL||https://www.prestigeparkrid ||ge.net.in -- 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 67582] New: Prestige Park Ridge Bangalore
https://bz.apache.org/bugzilla/show_bug.cgi?id=67582 Bug ID: 67582 Summary: Prestige Park Ridge Bangalore Product: Tomcat 8 Version: 8.5.88 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Meta Assignee: dev@tomcat.apache.org Reporter: prestigeparkridgeapartm...@gmail.com Target Milestone: -- 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: [VOTE] Release Apache Tomcat Native 1.2.39
On Thu, Sep 28, 2023 at 3:56 PM Mark Thomas wrote: > > Version 1.2.39 includes the following changes compared to 1.2.38 > > - Fix optionalNoCA support (always disable OCSP) > - The windows binaries in this release have been built with OpenSSL >3.0.11 and APR 1.7.4 > > The proposed release artifacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.39 release is > [X] Stable, go ahead and release > [ ] Broken because of ... Rémy > Thanks, > > Mark > > > [1] > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.39 > [2] > https://github.com/apache/tomcat-native/commit/4547fa071f6de5581fa0ca3838454784fa3b5dc6 > > - > 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
[Bug 67572] Failed to load JVM DLL
https://bz.apache.org/bugzilla/show_bug.cgi?id=67572 Mark Thomas changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEEDINFO|RESOLVED --- Comment #2 from Mark Thomas --- Clean install of: - Windows 2016 Server (desktop experience) - Apply all updates - Java 21 (OpenJDK) - Tomcat 10.1.3 (windows x64 zip) Set JAVA_HOME %CATALINA_HOME%\bin\service.bat install Use tomcat10w.exe to start service Tomvcat starts without error. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.39
On 28/09/2023 14:56, Mark Thomas wrote: Version 1.2.39 includes the following changes compared to 1.2.38 - Fix optionalNoCA support (always disable OCSP) - The windows binaries in this release have been built with OpenSSL 3.0.11 and APR 1.7.4 The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.39 release is [ ] Stable, go ahead and release [X] Broken because of ... Unit tests pass on x64 Windows using proposed Windows binary and Tomcat 9.0.x Mark - 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 use of printStackTrace
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 d16b50aa6a Remove use of printStackTrace
d16b50aa6a is described below
commit d16b50aa6a55fa9127334b9d6309528e953eb5e0
Author: remm
AuthorDate: Mon Oct 2 15:21:07 2023 +0200
Remove use of printStackTrace
---
.../tomcat/util/modeler/modules/LocalStrings.properties | 16
.../modules/MbeansDescriptorsIntrospectionSource.java| 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
new file mode 100644
index 00..af8059d0a4
--- /dev/null
+++ b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source.introspectionError=Introspection error creating MBean for class [{0}]
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index 9c1a7da220..4b145333d4 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -37,10 +37,12 @@ import org.apache.tomcat.util.modeler.ManagedBean;
import org.apache.tomcat.util.modeler.OperationInfo;
import org.apache.tomcat.util.modeler.ParameterInfo;
import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.res.StringManager;
public class MbeansDescriptorsIntrospectionSource extends ModelerSource
{
private static final Log log =
LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);
+private static final StringManager sm =
StringManager.getManager(MbeansDescriptorsIntrospectionSource.class);
private Registry registry;
private String type;
@@ -367,7 +369,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
return mbean;
} catch (Exception ex) {
-ex.printStackTrace();
+log.error(sm.getString("source.introspectionError",
realClass.getName()), ex);
return null;
}
}
-
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 use of printStackTrace
This is an automated email from the ASF dual-hosted git repository.
remm 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 b879814244 Remove use of printStackTrace
b879814244 is described below
commit b879814244eaaea790338c5915b3ab420f100388
Author: remm
AuthorDate: Mon Oct 2 15:21:07 2023 +0200
Remove use of printStackTrace
---
.../tomcat/util/modeler/modules/LocalStrings.properties | 16
.../modules/MbeansDescriptorsIntrospectionSource.java| 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
new file mode 100644
index 00..af8059d0a4
--- /dev/null
+++ b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source.introspectionError=Introspection error creating MBean for class [{0}]
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index 9c1a7da220..4b145333d4 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -37,10 +37,12 @@ import org.apache.tomcat.util.modeler.ManagedBean;
import org.apache.tomcat.util.modeler.OperationInfo;
import org.apache.tomcat.util.modeler.ParameterInfo;
import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.res.StringManager;
public class MbeansDescriptorsIntrospectionSource extends ModelerSource
{
private static final Log log =
LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);
+private static final StringManager sm =
StringManager.getManager(MbeansDescriptorsIntrospectionSource.class);
private Registry registry;
private String type;
@@ -367,7 +369,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
return mbean;
} catch (Exception ex) {
-ex.printStackTrace();
+log.error(sm.getString("source.introspectionError",
realClass.getName()), ex);
return null;
}
}
-
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 use of printStackTrace
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 14f55a900e Remove use of printStackTrace
14f55a900e is described below
commit 14f55a900ebfda371dbcc4ee5803fc7805d67783
Author: remm
AuthorDate: Mon Oct 2 15:21:07 2023 +0200
Remove use of printStackTrace
---
.../tomcat/util/modeler/modules/LocalStrings.properties | 16
.../modules/MbeansDescriptorsIntrospectionSource.java| 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
new file mode 100644
index 00..af8059d0a4
--- /dev/null
+++ b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source.introspectionError=Introspection error creating MBean for class [{0}]
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index 9c1a7da220..4b145333d4 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -37,10 +37,12 @@ import org.apache.tomcat.util.modeler.ManagedBean;
import org.apache.tomcat.util.modeler.OperationInfo;
import org.apache.tomcat.util.modeler.ParameterInfo;
import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.res.StringManager;
public class MbeansDescriptorsIntrospectionSource extends ModelerSource
{
private static final Log log =
LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);
+private static final StringManager sm =
StringManager.getManager(MbeansDescriptorsIntrospectionSource.class);
private Registry registry;
private String type;
@@ -367,7 +369,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
return mbean;
} catch (Exception ex) {
-ex.printStackTrace();
+log.error(sm.getString("source.introspectionError",
realClass.getName()), ex);
return null;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove use of printStackTrace
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 38782a977f Remove use of printStackTrace
38782a977f is described below
commit 38782a977fe785dcba62506eb6d1bb72db9109e3
Author: remm
AuthorDate: Mon Oct 2 15:21:07 2023 +0200
Remove use of printStackTrace
---
.../tomcat/util/modeler/modules/LocalStrings.properties | 16
.../modules/MbeansDescriptorsIntrospectionSource.java| 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
new file mode 100644
index 00..af8059d0a4
--- /dev/null
+++ b/java/org/apache/tomcat/util/modeler/modules/LocalStrings.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source.introspectionError=Introspection error creating MBean for class [{0}]
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index 9c1a7da220..4b145333d4 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -37,10 +37,12 @@ import org.apache.tomcat.util.modeler.ManagedBean;
import org.apache.tomcat.util.modeler.OperationInfo;
import org.apache.tomcat.util.modeler.ParameterInfo;
import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.res.StringManager;
public class MbeansDescriptorsIntrospectionSource extends ModelerSource
{
private static final Log log =
LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);
+private static final StringManager sm =
StringManager.getManager(MbeansDescriptorsIntrospectionSource.class);
private Registry registry;
private String type;
@@ -367,7 +369,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
return mbean;
} catch (Exception ex) {
-ex.printStackTrace();
+log.error(sm.getString("source.introspectionError",
realClass.getName()), ex);
return null;
}
}
-
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 use of printStackTrace
This is an automated email from the ASF dual-hosted git repository.
remm 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 ba2c162d66 Remove use of printStackTrace
ba2c162d66 is described below
commit ba2c162d6690424da2d740aff435f4653e18d302
Author: remm
AuthorDate: Mon Oct 2 15:17:13 2023 +0200
Remove use of printStackTrace
---
java/org/apache/tomcat/util/http/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/http/Parameters.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/http/LocalStrings.properties
b/java/org/apache/tomcat/util/http/LocalStrings.properties
index f9b8e0d3d6..82d556b5d7 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings.properties
@@ -26,6 +26,7 @@ parameters.bytes=Start processing with input [{0}]
parameters.copyFail=Failed to create copy of original parameter values for
debug logging purposes
parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored.
parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored. Note that the name and value quoted here may be
corrupted due to the failed decoding. Use debug level logging to see the
original, non-corrupted values.
+parameters.duplicateFail=Failed to create copy of query parameters
parameters.emptyChunk=Empty parameter chunk ignored
parameters.fallToDebug=\n\
\ Note: further occurrences of Parameter errors will be logged at DEBUG level.
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index a30922a37a..883614 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -221,7 +221,7 @@ public final class Parameters {
decodedQuery.duplicate(queryMB);
} catch (IOException e) {
// Can't happen, as decodedQuery can't overflow
-e.printStackTrace();
+log.error(sm.getString("parameters.copyFail"), e);
}
processParameters(decodedQuery, queryStringCharset);
}
-
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 use of printStackTrace
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 c1decb6789 Remove use of printStackTrace
c1decb6789 is described below
commit c1decb6789f2bd867c7399f2ad5928be08a78da6
Author: remm
AuthorDate: Mon Oct 2 15:17:13 2023 +0200
Remove use of printStackTrace
---
java/org/apache/tomcat/util/http/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/http/Parameters.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/http/LocalStrings.properties
b/java/org/apache/tomcat/util/http/LocalStrings.properties
index f9b8e0d3d6..82d556b5d7 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings.properties
@@ -26,6 +26,7 @@ parameters.bytes=Start processing with input [{0}]
parameters.copyFail=Failed to create copy of original parameter values for
debug logging purposes
parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored.
parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored. Note that the name and value quoted here may be
corrupted due to the failed decoding. Use debug level logging to see the
original, non-corrupted values.
+parameters.duplicateFail=Failed to create copy of query parameters
parameters.emptyChunk=Empty parameter chunk ignored
parameters.fallToDebug=\n\
\ Note: further occurrences of Parameter errors will be logged at DEBUG level.
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index 29a6bc0f91..a0fb09bbe3 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -189,7 +189,7 @@ public final class Parameters {
decodedQuery.duplicate(queryMB);
} catch (IOException e) {
// Can't happen, as decodedQuery can't overflow
-e.printStackTrace();
+log.error(sm.getString("parameters.copyFail"), e);
}
processParameters(decodedQuery, queryStringCharset);
}
-
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 use of printStackTrace
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new c6e0dd7131 Remove use of printStackTrace
c6e0dd7131 is described below
commit c6e0dd7131a084a37fd65b301ce12a4bb5eed8c3
Author: remm
AuthorDate: Mon Oct 2 15:17:13 2023 +0200
Remove use of printStackTrace
---
java/org/apache/tomcat/util/http/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/http/Parameters.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/http/LocalStrings.properties
b/java/org/apache/tomcat/util/http/LocalStrings.properties
index 43307a8893..e0f0d494f6 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings.properties
@@ -26,6 +26,7 @@ parameters.bytes=Start processing with input [{0}]
parameters.copyFail=Failed to create copy of original parameter values for
debug logging purposes
parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored.
parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored. Note that the name and value quoted here may be
corrupted due to the failed decoding. Use debug level logging to see the
original, non-corrupted values.
+parameters.duplicateFail=Failed to create copy of query parameters
parameters.emptyChunk=Empty parameter chunk ignored
parameters.fallToDebug=\n\
\ Note: further occurrences of Parameter errors will be logged at DEBUG level.
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index 29a6bc0f91..a0fb09bbe3 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -189,7 +189,7 @@ public final class Parameters {
decodedQuery.duplicate(queryMB);
} catch (IOException e) {
// Can't happen, as decodedQuery can't overflow
-e.printStackTrace();
+log.error(sm.getString("parameters.copyFail"), e);
}
processParameters(decodedQuery, queryStringCharset);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove use of printStackTrace
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 75831f9813 Remove use of printStackTrace
75831f9813 is described below
commit 75831f981356ee81d75dac8dd0bd9ffb60f995a1
Author: remm
AuthorDate: Mon Oct 2 15:17:13 2023 +0200
Remove use of printStackTrace
---
java/org/apache/tomcat/util/http/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/http/Parameters.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/http/LocalStrings.properties
b/java/org/apache/tomcat/util/http/LocalStrings.properties
index 292706984a..29fd518c61 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings.properties
@@ -26,6 +26,7 @@ parameters.bytes=Start processing with input [{0}]
parameters.copyFail=Failed to create copy of original parameter values for
debug logging purposes
parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored.
parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored. Note that the name and value quoted here may be
corrupted due to the failed decoding. Use debug level logging to see the
original, non-corrupted values.
+parameters.duplicateFail=Failed to create copy of query parameters
parameters.emptyChunk=Empty parameter chunk ignored
parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at
byte [{1}] with a value of [{2}] ignored
parameters.maxCountFail=More than the maximum number of request parameters
(GET plus POST) for a single request ([{0}]) were detected. Any parameters
beyond this limit have been ignored. To change this limit, set the
maxParameterCount attribute on the Connector.
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index feb4c03e97..16995ccd55 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -161,7 +161,7 @@ public final class Parameters {
decodedQuery.duplicate(queryMB);
} catch (IOException e) {
// Can't happen, as decodedQuery can't overflow
-e.printStackTrace();
+log.error(sm.getString("parameters.copyFail"), e);
}
processParameters(decodedQuery, queryStringCharset);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67572] Failed to load JVM DLL
https://bz.apache.org/bugzilla/show_bug.cgi?id=67572 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO -- 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] 03/03: Remove the internal plumbing that supports HTTP/2 server push
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bd752fe8f1b8759748989437b1d29e1451227b0d
Author: Mark Thomas
AuthorDate: Mon Oct 2 12:15:41 2023 +0100
Remove the internal plumbing that supports HTTP/2 server push
---
java/org/apache/catalina/connector/Response.java | 14
.../webresources/AbstractFileResourceSet.java | 13 ++--
java/org/apache/coyote/AbstractProcessor.java | 34 --
java/org/apache/coyote/ActionCode.java | 10 ---
java/org/apache/coyote/LocalStrings.properties | 1 -
java/org/apache/coyote/LocalStrings_fr.properties | 1 -
java/org/apache/coyote/LocalStrings_ja.properties | 1 -
java/org/apache/coyote/LocalStrings_ko.properties | 1 -
.../apache/coyote/LocalStrings_zh_CN.properties| 1 -
.../coyote/http2/ConnectionSettingsBase.java | 3 +-
.../coyote/http2/Http2AsyncUpgradeHandler.java | 7 +-
.../apache/coyote/http2/Http2UpgradeHandler.java | 74 ++
.../apache/coyote/http2/LocalStrings.properties| 1 -
.../apache/coyote/http2/LocalStrings_fr.properties | 1 -
.../apache/coyote/http2/LocalStrings_ja.properties | 1 -
.../apache/coyote/http2/LocalStrings_ko.properties | 1 -
.../coyote/http2/LocalStrings_zh_CN.properties | 1 -
java/org/apache/coyote/http2/Stream.java | 56 ++--
java/org/apache/coyote/http2/StreamProcessor.java | 17 -
.../apache/coyote/http2/StreamStateMachine.java| 5 --
test/org/apache/coyote/http2/Http2TestBase.java| 8 ---
.../apache/coyote/http2/TestHttp2Section_6_5.java | 2 -
.../org/apache/coyote/http2/TesterHttp2Parser.java | 50 ---
23 files changed, 24 insertions(+), 279 deletions(-)
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index bc6cf0bba8..e2e983b7f6 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -139,12 +139,6 @@ public class Response implements HttpServletResponse {
protected final CharChunk redirectURLCC = new CharChunk();
-/*
- * Not strictly required but it makes generating HTTP/2 push requests a
lot easier if these are retained until the
- * response is recycled.
- */
-private final List cookies = new ArrayList<>();
-
private HttpServletResponse applicationResponse = null;
@@ -183,7 +177,6 @@ public class Response implements HttpServletResponse {
*/
public void recycle() {
-cookies.clear();
outputBuffer.recycle();
usingOutputStream = false;
usingWriter = false;
@@ -212,11 +205,6 @@ public class Response implements HttpServletResponse {
}
-public List getCookies() {
-return cookies;
-}
-
-
// --- Response Methods
/**
@@ -896,8 +884,6 @@ public class Response implements HttpServletResponse {
return;
}
-cookies.add(cookie);
-
String header = generateCookieString(cookie);
// if we reached here, no exception, cookie is valid
addHeader("Set-Cookie", header,
getContext().getCookieProcessor().getCharset());
diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 7a81b943b0..bdf51a5821 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -99,13 +99,12 @@ public abstract class AbstractFileResourceSet extends
AbstractResourceSet {
return null;
}
-// Ensure that the file is not outside the fileBase. This should not be
-// possible for standard requests (the request is normalized early in
-// the request processing) but might be possible for some access via
the
-// Servlet API (RequestDispatcher, HTTP/2 push etc.) therefore these
-// checks are retained as an additional safety measure
-// absoluteBase has been normalized so absPath needs to be normalized
as
-// well.
+/*
+ * Ensure that the file is not outside the fileBase. This should not
be possible for standard requests (the
+ * request is normalized early in the request processing) but might be
possible for some access via the Servlet
+ * API (e.g. RequestDispatcher) therefore these checks are retained as
an additional safety measure absoluteBase
+ * has been normalized so absPath needs to be normalized as well.
+ */
String absPath = normalize(file.getAbsolutePath());
if (absPath == null || absoluteBase.length() > absPath.length()) {
return null;
diff --git a/java/org/apache/coyote/AbstractProcessor
[tomcat] 01/03: Deprecate PushBuilder as per latest Servlet 6.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3c0791abb95342a9e5fcf90eb4a18a9c6188c269
Author: Mark Thomas
AuthorDate: Mon Oct 2 11:43:01 2023 +0100
Deprecate PushBuilder as per latest Servlet 6.1
---
java/jakarta/servlet/http/HttpServletRequest.java| 9 ++---
java/jakarta/servlet/http/HttpServletRequestWrapper.java | 3 +++
java/jakarta/servlet/http/PushBuilder.java | 3 +++
webapps/docs/changelog.xml | 5 +
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/java/jakarta/servlet/http/HttpServletRequest.java
b/java/jakarta/servlet/http/HttpServletRequest.java
index 7bb78cb999..8e36a97ccd 100644
--- a/java/jakarta/servlet/http/HttpServletRequest.java
+++ b/java/jakarta/servlet/http/HttpServletRequest.java
@@ -223,12 +223,15 @@ public interface HttpServletRequest extends
ServletRequest {
* instance obtained.
*
* @return A builder that can be used to generate push requests based on
this request or {@code null} if push is not
- * supported. Note that even if a PushBuilder instance is
returned, by the time that
- * {@link PushBuilder#push()} is called, it may no longer be
valid to push a request and the push
- * request will be ignored.
+ * supported. Some implementations may opt not to support
server push and will therefore always return
+ * {@code null}. If a PushBuilder instance is returned, by the
time that {@link PushBuilder#push()} is
+ * called, it may no longer be valid to push a request and the
push request will be ignored.
*
* @since Servlet 4.0
+ *
+ * @deprecated In favor of 103 early hints
*/
+@Deprecated
default PushBuilder newPushBuilder() {
return null;
}
diff --git a/java/jakarta/servlet/http/HttpServletRequestWrapper.java
b/java/jakarta/servlet/http/HttpServletRequestWrapper.java
index 766488be9d..ac56f2cee8 100644
--- a/java/jakarta/servlet/http/HttpServletRequestWrapper.java
+++ b/java/jakarta/servlet/http/HttpServletRequestWrapper.java
@@ -349,7 +349,10 @@ public class HttpServletRequestWrapper extends
ServletRequestWrapper implements
* request object.
*
* @since Servlet 4.0
+ *
+ * @deprecated In favor of 103 early hints
*/
+@Deprecated
@Override
public PushBuilder newPushBuilder() {
return this._getHttpServletRequest().newPushBuilder();
diff --git a/java/jakarta/servlet/http/PushBuilder.java
b/java/jakarta/servlet/http/PushBuilder.java
index 9a1092011d..46c6ed72bc 100644
--- a/java/jakarta/servlet/http/PushBuilder.java
+++ b/java/jakarta/servlet/http/PushBuilder.java
@@ -32,7 +32,10 @@ import java.util.Set;
*
*
* @since Servlet 4.0
+ *
+ * @deprecated In favor of 103 early hints
*/
+@Deprecated
public interface PushBuilder {
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8dc474f05b..0addab5e1f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,11 @@
Improve statistics collection for upgraded connections under load.
(remm)
+
+PushBuilder has been deprecated in line with the changes
+for the Servlet 6.1 specification. It will be replaced in a future
+Tomcat 11 milestone with support for 103 early hints. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Remove support for HTTP/2 server push
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d28d6836b80d0709c56a3ab24d515788498c760e
Author: Mark Thomas
AuthorDate: Mon Oct 2 11:56:41 2023 +0100
Remove support for HTTP/2 server push
---
java/org/apache/catalina/connector/Request.java| 19 -
.../apache/catalina/connector/RequestFacade.java | 14 -
.../catalina/core/ApplicationHttpRequest.java | 18 -
.../catalina/core/ApplicationPushBuilder.java | 427 -
.../apache/catalina/core/LocalStrings.properties | 5 -
.../catalina/core/LocalStrings_fr.properties | 5 -
.../catalina/core/LocalStrings_ja.properties | 5 -
.../catalina/core/LocalStrings_ko.properties | 5 -
.../catalina/core/LocalStrings_zh_CN.properties| 5 -
.../apache/catalina/filters/RemoteIpFilter.java| 16 -
.../catalina/core/TestApplicationPushBuilder.java | 72
.../catalina/filters/TesterHttpServletRequest.java | 6 -
.../apache/coyote/http2/TestHttp2Section_6_6.java | 127 --
webapps/docs/changelog.xml | 5 +
.../WEB-INF/classes/http2/SimpleImagePush.java | 59 ---
webapps/examples/WEB-INF/web.xml | 10 -
webapps/examples/servlets/index.html | 11 -
17 files changed, 5 insertions(+), 804 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 8e800464be..cc9a515f96 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -65,7 +65,6 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
-import jakarta.servlet.http.PushBuilder;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -79,7 +78,6 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.core.ApplicationFilterChain;
import org.apache.catalina.core.ApplicationMapping;
import org.apache.catalina.core.ApplicationPart;
-import org.apache.catalina.core.ApplicationPushBuilder;
import org.apache.catalina.core.ApplicationSessionCookieConfig;
import org.apache.catalina.core.AsyncContextImpl;
import org.apache.catalina.mapper.MappingData;
@@ -1866,23 +1864,6 @@ public class Request implements HttpServletRequest {
}
-@Override
-public PushBuilder newPushBuilder() {
-return newPushBuilder(this);
-}
-
-
-public PushBuilder newPushBuilder(HttpServletRequest request) {
-AtomicBoolean result = new AtomicBoolean();
-coyoteRequest.action(ActionCode.IS_PUSH_SUPPORTED, result);
-if (result.get()) {
-return new ApplicationPushBuilder(this, request);
-} else {
-return null;
-}
-}
-
-
@SuppressWarnings("unchecked")
@Override
public T upgrade(Class
httpUpgradeHandlerClass)
diff --git a/java/org/apache/catalina/connector/RequestFacade.java
b/java/org/apache/catalina/connector/RequestFacade.java
index 956790888f..1a2f335076 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -40,7 +40,6 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
-import jakarta.servlet.http.PushBuilder;
import org.apache.tomcat.util.res.StringManager;
@@ -573,19 +572,6 @@ public class RequestFacade implements HttpServletRequest {
}
-@Override
-public PushBuilder newPushBuilder() {
-checkFacade();
-return request.newPushBuilder();
-}
-
-
-public PushBuilder newPushBuilder(HttpServletRequest request) {
-checkFacade();
-return this.request.newPushBuilder(request);
-}
-
-
@Override
public boolean isTrailerFieldsReady() {
checkFacade();
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 1b93479d32..14f0855b9e 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -32,19 +32,15 @@ import java.util.NoSuchElementException;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletRequestWrapper;
import jakarta.servlet.http.HttpServletMapping;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.PushBuilder;
import org.apache.catalina.Context;
import org.apache.catalina.Globals
[tomcat] branch main updated (7ecd862b8f -> bd752fe8f1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 7ecd862b8f Update to Tomcat Native 2.0.6 new 3c0791abb9 Deprecate PushBuilder as per latest Servlet 6.1 new d28d6836b8 Remove support for HTTP/2 server push new bd752fe8f1 Remove the internal plumbing that supports HTTP/2 server push The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/jakarta/servlet/http/HttpServletRequest.java | 9 +- .../servlet/http/HttpServletRequestWrapper.java| 3 + java/jakarta/servlet/http/PushBuilder.java | 3 + java/org/apache/catalina/connector/Request.java| 19 - .../apache/catalina/connector/RequestFacade.java | 14 - java/org/apache/catalina/connector/Response.java | 14 - .../catalina/core/ApplicationHttpRequest.java | 18 - .../catalina/core/ApplicationPushBuilder.java | 427 - .../apache/catalina/core/LocalStrings.properties | 5 - .../catalina/core/LocalStrings_fr.properties | 5 - .../catalina/core/LocalStrings_ja.properties | 5 - .../catalina/core/LocalStrings_ko.properties | 5 - .../catalina/core/LocalStrings_zh_CN.properties| 5 - .../apache/catalina/filters/RemoteIpFilter.java| 16 - .../webresources/AbstractFileResourceSet.java | 13 +- java/org/apache/coyote/AbstractProcessor.java | 34 -- java/org/apache/coyote/ActionCode.java | 10 - java/org/apache/coyote/LocalStrings.properties | 1 - java/org/apache/coyote/LocalStrings_fr.properties | 1 - java/org/apache/coyote/LocalStrings_ja.properties | 1 - java/org/apache/coyote/LocalStrings_ko.properties | 1 - .../apache/coyote/LocalStrings_zh_CN.properties| 1 - .../coyote/http2/ConnectionSettingsBase.java | 3 +- .../coyote/http2/Http2AsyncUpgradeHandler.java | 7 +- .../apache/coyote/http2/Http2UpgradeHandler.java | 74 +--- .../apache/coyote/http2/LocalStrings.properties| 1 - .../apache/coyote/http2/LocalStrings_fr.properties | 1 - .../apache/coyote/http2/LocalStrings_ja.properties | 1 - .../apache/coyote/http2/LocalStrings_ko.properties | 1 - .../coyote/http2/LocalStrings_zh_CN.properties | 1 - java/org/apache/coyote/http2/Stream.java | 56 +-- java/org/apache/coyote/http2/StreamProcessor.java | 17 - .../apache/coyote/http2/StreamStateMachine.java| 5 - .../catalina/core/TestApplicationPushBuilder.java | 72 .../catalina/filters/TesterHttpServletRequest.java | 6 - test/org/apache/coyote/http2/Http2TestBase.java| 8 - .../apache/coyote/http2/TestHttp2Section_6_5.java | 2 - .../apache/coyote/http2/TestHttp2Section_6_6.java | 127 -- .../org/apache/coyote/http2/TesterHttp2Parser.java | 50 --- webapps/docs/changelog.xml | 10 + .../WEB-INF/classes/http2/SimpleImagePush.java | 59 --- webapps/examples/WEB-INF/web.xml | 10 - webapps/examples/servlets/index.html | 11 - 43 files changed, 46 insertions(+), 1086 deletions(-) delete mode 100644 java/org/apache/catalina/core/ApplicationPushBuilder.java delete mode 100644 test/org/apache/catalina/core/TestApplicationPushBuilder.java delete mode 100644 test/org/apache/coyote/http2/TestHttp2Section_6_6.java delete mode 100644 webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java - 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: Update to Tomcat Native 2.0.6
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 5500379d86 Update to Tomcat Native 2.0.6
5500379d86 is described below
commit 5500379d86939e9f8e65e1a5c6545a07329a796e
Author: Mark Thomas
AuthorDate: Mon Oct 2 10:33:37 2023 +0100
Update to Tomcat Native 2.0.6
---
build.properties.default | 8
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 5349eda91b..f8a0a79dd1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -160,14 +160,14 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=2.0.5
-tomcat-native-openssl.version=3.0.10
+tomcat-native.version=2.0.6
+tomcat-native-openssl.version=3.0.11
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4
+tomcat-native.src.checksum.value=d714fb96f880d0d565c58d25bb803fa9a144a6d87e825ad8d00aeac833b40a5512f888b94b3109853f8ee28b176b24fde95fb2d2a70ce65181a51ca7fc60cdab
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=3c599d4da5c26b3dd1ddce7add5b8126e98f0068515f8bb942cc349716ea5f88519b9a1f76b3ba9badda79955f88eaf7940a78713064ccc547a232b921c0f05b
+tomcat-native.win.checksum.value=f45083d2148d6f17549eba395f6ac4f25f4ffc5cdd45a99d25bef89aee9395d1f913c3fcc27689648c13c298a86083ad7df49311fc3178cbadfa3c2d97b0dc38
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1efba5a6b4..f09b44ec07 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,9 @@
Update Checkstyle to 10.12.3. (markt)
+
+Update Tomcat Native to 2.0.6. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update to Tomcat Native 2.0.6
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 7ecd862b8f Update to Tomcat Native 2.0.6
7ecd862b8f is described below
commit 7ecd862b8f509d245c592e97b93d25b15640a35f
Author: Mark Thomas
AuthorDate: Mon Oct 2 10:33:37 2023 +0100
Update to Tomcat Native 2.0.6
---
build.properties.default | 8
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9222378942..2bdb56af98 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -139,14 +139,14 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=2.0.5
-tomcat-native-openssl.version=3.0.10
+tomcat-native.version=2.0.6
+tomcat-native-openssl.version=3.0.11
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4
+tomcat-native.src.checksum.value=d714fb96f880d0d565c58d25bb803fa9a144a6d87e825ad8d00aeac833b40a5512f888b94b3109853f8ee28b176b24fde95fb2d2a70ce65181a51ca7fc60cdab
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=3c599d4da5c26b3dd1ddce7add5b8126e98f0068515f8bb942cc349716ea5f88519b9a1f76b3ba9badda79955f88eaf7940a78713064ccc547a232b921c0f05b
+tomcat-native.win.checksum.value=f45083d2148d6f17549eba395f6ac4f25f4ffc5cdd45a99d25bef89aee9395d1f913c3fcc27689648c13c298a86083ad7df49311fc3178cbadfa3c2d97b0dc38
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 55b6e3d61c..8dc474f05b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -192,6 +192,9 @@
Update Checkstyle to 10.12.3. (markt)
+
+Update Tomcat Native to 2.0.6. (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: Add note that optionalNoCA disables OCSP
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 b78b5bf2f0 Add note that optionalNoCA disables OCSP b78b5bf2f0 is described below commit b78b5bf2f02af31cb85427c59cc23d062fcfd562 Author: Mark Thomas AuthorDate: Mon Oct 2 10:16:22 2023 +0100 Add note that optionalNoCA disables OCSP --- webapps/docs/config/http.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index d205ca7ef0..d856f40aa3 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1331,7 +1331,8 @@ optionalNoCA if you want client certificates to be optional and you don't want Tomcat to check them against the list of trusted CAs. If the TLS provider doesn't support this option (OpenSSL does, JSSE does - not) it is treated as if optional was specified. A + not) it is treated as if optional was specified. If + optionalNoCA is configured then OCSP will also be disabled. none value (which is the default) will not require a certificate chain unless the client requests a resource protected by a security constraint that uses CLIENT-CERT authentication. - 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: Add note that optionalNoCA disables OCSP
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 0432bf7561 Add note that optionalNoCA disables OCSP 0432bf7561 is described below commit 0432bf756102f4fd3cfdf1fadbb7448ec208090f Author: Mark Thomas AuthorDate: Mon Oct 2 10:16:22 2023 +0100 Add note that optionalNoCA disables OCSP --- webapps/docs/config/http.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 1bdc7f8c1a..cc64907ee9 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1298,7 +1298,8 @@ optionalNoCA if you want client certificates to be optional and you don't want Tomcat to check them against the list of trusted CAs. If the TLS provider doesn't support this option (OpenSSL does, JSSE does - not) it is treated as if optional was specified. A + not) it is treated as if optional was specified. If + optionalNoCA is configured then OCSP will also be disabled. none value (which is the default) will not require a certificate chain unless the client requests a resource protected by a security constraint that uses CLIENT-CERT authentication. - 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: Add note that optionalNoCA disables OCSP
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 c5604099a9 Add note that optionalNoCA disables OCSP c5604099a9 is described below commit c5604099a941f66b74b65bd2ec150c41077dcc35 Author: Mark Thomas AuthorDate: Mon Oct 2 10:16:22 2023 +0100 Add note that optionalNoCA disables OCSP --- webapps/docs/config/http.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 30101b80d8..a38e3ed4ec 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1223,7 +1223,8 @@ optionalNoCA if you want client certificates to be optional and you don't want Tomcat to check them against the list of trusted CAs. If the TLS provider doesn't support this option (OpenSSL does, JSSE does - not) it is treated as if optional was specified. A + not) it is treated as if optional was specified. If + optionalNoCA is configured then OCSP will also be disabled. none value (which is the default) will not require a certificate chain unless the client requests a resource protected by a security constraint that uses CLIENT-CERT authentication. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add note that optionalNoCA disables OCSP
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 89604f3fab Add note that optionalNoCA disables OCSP 89604f3fab is described below commit 89604f3fab0b308f2f3ae31272b386cddb816096 Author: Mark Thomas AuthorDate: Mon Oct 2 10:16:22 2023 +0100 Add note that optionalNoCA disables OCSP --- webapps/docs/config/http.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 9cbab65964..96a37d3baa 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1198,7 +1198,8 @@ optionalNoCA if you want client certificates to be optional and you don't want Tomcat to check them against the list of trusted CAs. If the TLS provider doesn't support this option (OpenSSL does, JSSE does - not) it is treated as if optional was specified. A + not) it is treated as if optional was specified. If + optionalNoCA is configured then OCSP will also be disabled. none value (which is the default) will not require a certificate chain unless the client requests a resource protected by a security constraint that uses CLIENT-CERT authentication. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat Native 2.0.6 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 2.0.6 stable. The key features of this release are: - Disable OCSP if the insecure optionalNoCA certificate verification option is used - The binaries for Windows in this release have been built with OpenSSL 3.0.11 The 2.0.x branch is primarily intended for use with Tomcat 10.1.x or later but can be used with earlier versions as long as the APR/native connector is not used. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi The Apache Tomcat Native Library 2.0.x provides an API for using OpenSSL for SSL networking with Apache Tomcat. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1912682 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews.xml
Author: markt Date: Mon Oct 2 09:04:01 2023 New Revision: 1912682 URL: http://svn.apache.org/viewvc?rev=1912682&view=rev Log: Update site for Tomcat Native 2.0.6 release Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/download-native.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1912682&r1=1912681&r2=1912682&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Mon Oct 2 09:04:01 2023 @@ -10,9 +10,9 @@ archive download site. Quick Navigation -[define v]2.0.5[end] +[define v]2.0.6[end] [define w]1.2.38[end] -[define y]3.0.10[end] +[define y]3.0.11[end] [define z]1.1.1v[end] https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS | [v] | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1912682&r1=1912681&r2=1912682&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Mon Oct 2 09:04:01 2023 @@ -34,6 +34,21 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2023-10-02 Tomcat Native 2.0.6 Released + +The Apache Tomcat Project is proud to announce the release of version 2.0.6 of +Tomcat Native. The notable changes compared to 2.0.5 include: + + +Disable OCSP if the insecure optionalNoCA certificate verification option is +used +The windows binaries in this release have been built with OpenSSL +3.0.11 + + +https://tomcat.apache.org/download-native.cgi";>Download | +Change log for 2.0.5 + 2023-09-12 Tomcat Connectors 1.2.49 Released The Apache Tomcat Project is proud to announce the release of version 1.2.49 of @@ -156,21 +171,6 @@ Full details of these changes, and all t https://tomcat.apache.org/download-11.cgi";>Download -2023-08-07 Tomcat Native 2.0.5 Released - -The Apache Tomcat Project is proud to announce the release of version 2.0.5 of -Tomcat Native. The notable changes compared to 2.0.4 include: - - -Align default pass phrase prompt with HTTPd -Update autotools and associated fixes -Fix memory leak in SNI processing -The windows binaries in this release have been built with OpenSSL 3.0.10 - - -https://tomcat.apache.org/download-native.cgi";>Download | -Change log for 2.0.5 - 2023-08-07 Tomcat Native 1.2.38 Released The Apache Tomcat Project is proud to announce the release of version 1.2.38 of Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1912682&r1=1912681&r2=1912682&view=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Mon Oct 2 09:04:01 2023 @@ -125,6 +125,21 @@ Full details of these changes, and all t https://tomcat.apache.org/download-11.cgi";>Download +2023-08-07 Tomcat Native 2.0.5 Released + +The Apache Tomcat Project is proud to announce the release of version 2.0.5 of +Tomcat Native. The notable changes compared to 2.0.4 include: + + +Align default pass phrase prompt with HTTPd +Update autotools and associated fixes +Fix memory leak in SNI processing +The windows binaries in this release have been built with OpenSSL 3.0.10 + + +https://tomcat.apache.org/download-native.cgi";>Download | +Change log for 2.0.5 + 2023-07-10 Tomcat 9.0.78 Released The Apache Tomcat Project is proud to announce the release of version 9.0.78 Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1912682&r1=1912681&r2=1912682&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Mon Oct 2 09:04:01 2023 @@ -22,9 +22,9 @@ Define variables to hold the current version numbers. Documentation for ezt.py: https://code.google.com/p/ezt/wiki/Syntax --> -[define v]2.0.5[end] +[define v]2.0.6[end] [define w]1.2.38[end] -[define y]3.0.10[end] +[define y]3.0.11[end] [define z]1.1.1v[end] https://downloads.apache.org/tomcat/tomcat-connectors/KEYS";>KEYS | [v] | Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1912682&r1=1912681&r2=1912682&view=diff ===
svn commit: r1912681 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html miscellaneous/tls-renegotiation.html news/2023.html
Author: markt Date: Mon Oct 2 08:58:17 2023 New Revision: 1912681 URL: http://svn.apache.org/viewvc?rev=1912681&view=rev Log: Update docs for Tomcat Native 2.0.6 release Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html tomcat/site/trunk/docs/native-doc/news/2023.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1912681&r1=1912680&r2=1912681&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Mon Oct 2 08:58:17 2023 @@ -10,10 +10,10 @@ Headlines -7 August 2023 - TC-Native-2.0.5 +2 October 2023 - TC-Native-2.0.6 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 2.0.5 Stable. +Tomcat Native 2.0.6 Stable. The sources and the binaries for selected platforms are available from the Download page. @@ -134,6 +134,7 @@ export LD_LIBRARY_PATH Refer to the tomcat documentation to configure the connectors (See +https://tomcat.apache.org/tomcat-11.0-doc/config/http.html";>Tomcat 11.0.x, https://tomcat.apache.org/tomcat-10.1-doc/config/http.html";>Tomcat 10.1.x, https://tomcat.apache.org/tomcat-9.0-doc/config/http.html";>Tomcat 9.0.x and https://tomcat.apache.org/tomcat-8.5-doc/config/http.html";>Tomcat 8.5.x) Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1912681&r1=1912680&r2=1912681&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Mon Oct 2 08:58:17 2023 @@ -4,6 +4,17 @@ This is the Changelog for Apache Tomcat Native 2.0.x. The Tomcat Native 2.0.x branch started from the 1.2.33 tag. +Changes in 2.0.6 + + + https://bz.apache.org/bugzilla/show_bug.cgi?id=67061";>67061: If the insecure optionalNoCA certificate verification + mode is used, disable OCSP if enabled else client certificates from + unknown certificate authorities will be rejected. (markt) + + + Update the recommended minimum version of OpenSSL to 3.0.11. (markt) + + Changes in 2.0.5 Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html?rev=1912681&r1=1912680&r2=1912681&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/tls-renegotiation.html Mon Oct 2 08:58:17 2023 @@ -1,5 +1,5 @@ -The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews202220212020201920182017201620152014201320122011201020092008< /div>Introduction +The Apache Tomcat Native - Miscellaneous Documentation - http://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - Miscellaneous DocumentationLinksDocs HomeMiscellaneous DocumentationChangelogTLS renegotiationNews2022Introduction Historically there have been security issues associated with TLS renegotiation. This page describes the renegotiation behaviour of the Tomcat Modified: tomcat/site/trunk/docs/native-doc/news/2023.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2023.html?rev=1912681&r1=1912680&r2=1912681&view=diff == --- tomcat/site/trunk/docs/native-doc/news/2023.html (original) +++ tomcat/site/trunk/docs/native-doc/news/2023.html Mon Oct 2 08:58:17 2023 @@ -1,6 +1,11 @@ The Apache Tomcat Native - News - 2023 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - NewsLinksDocs Home Miscellaneous DocumentationChangelogTLS renegotiationNews202320222023 News and Status2023 News & Status + 2 October 2023 - TC-Native-2.0.6 released +The Apache Tomcat team is proud to announce the immediate +availability of Tomcat Native 2.0.6. + + 7 August 2023 - TC-Native-2.0.5 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 2.0.5.
[tomcat-native] branch main updated: Update docs for 2.0.6 release
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-native.git The following commit(s) were added to refs/heads/main by this push: new cc95c4e31 Update docs for 2.0.6 release cc95c4e31 is described below commit cc95c4e317f1cff89aa5de055dffba7ce147484a Author: Mark Thomas AuthorDate: Mon Oct 2 09:32:44 2023 +0100 Update docs for 2.0.6 release --- xdocs/index.xml | 5 +++-- xdocs/news/2023.xml | 5 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index 979df0723..46c0e12b3 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -42,10 +42,10 @@ -7 August 2023 - TC-Native-2.0.5 +2 October 2023 - TC-Native-2.0.6 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 2.0.5 Stable. +Tomcat Native 2.0.6 Stable. The sources and the binaries for selected platforms are available from the Download page. @@ -176,6 +176,7 @@ export LD_LIBRARY_PATH Refer to the tomcat documentation to configure the connectors (See +https://tomcat.apache.org/tomcat-11.0-doc/config/http.html";>Tomcat 11.0.x, https://tomcat.apache.org/tomcat-10.1-doc/config/http.html";>Tomcat 10.1.x, https://tomcat.apache.org/tomcat-9.0-doc/config/http.html";>Tomcat 9.0.x and https://tomcat.apache.org/tomcat-8.5-doc/config/http.html";>Tomcat 8.5.x) diff --git a/xdocs/news/2023.xml b/xdocs/news/2023.xml index b263b325f..4e41e082e 100644 --- a/xdocs/news/2023.xml +++ b/xdocs/news/2023.xml @@ -30,6 +30,11 @@ + +The Apache Tomcat team is proud to announce the immediate +availability of Tomcat Native 2.0.6. + + The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 2.0.5. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 03/04: Remove unused function
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-native.git
commit f9ae977f674bcb44d0cc1334646860ae9dc6fb72
Author: Mark Thomas
AuthorDate: Fri Sep 29 10:02:33 2023 +0100
Remove unused function
---
native/src/ssl.c | 39 ---
1 file changed, 39 deletions(-)
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 9b91d57d7..6dd202b0c 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -281,45 +281,6 @@ int SSL_rand_seed(const char *file)
return RAND_status();
}
-static int ssl_rand_make(const char *file, int len, int base64)
-{
-int r;
-int num = len;
-BIO *out = NULL;
-
-out = BIO_new(BIO_s_file());
-if (out == NULL)
-return 0;
-if ((r = BIO_write_filename(out, (char *)file)) < 0) {
-BIO_free_all(out);
-return 0;
-}
-if (base64) {
-BIO *b64 = BIO_new(BIO_f_base64());
-if (b64 == NULL) {
-BIO_free_all(out);
-return 0;
-}
-out = BIO_push(b64, out);
-}
-while (num > 0) {
-unsigned char buf[4096];
-int len = num;
-if (len > sizeof(buf))
-len = sizeof(buf);
-r = RAND_bytes(buf, len);
-if (r <= 0) {
-BIO_free_all(out);
-return 0;
-}
-BIO_write(out, buf, len);
-num -= len;
-}
-r = BIO_flush(out);
-BIO_free_all(out);
-return r > 0 ? 1 : 0;
-}
-
TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
{
jclass clazz;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 02/04: Remove unused function
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-native.git
commit 6fbbfb7e7804616bcd3dc80853944e03880d68ff
Author: Mark Thomas
AuthorDate: Fri Sep 29 10:01:44 2023 +0100
Remove unused function
---
native/src/ssl.c | 25 -
1 file changed, 25 deletions(-)
diff --git a/native/src/ssl.c b/native/src/ssl.c
index b114be67c..9b91d57d7 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -249,31 +249,6 @@ static int ssl_rand_load_file(const char *file)
return -1;
}
-/*
- * writes a number of random bytes (currently 1024) to
- * file which can be used to initialize the PRNG by calling
- * RAND_load_file() in a later session
- */
-static int ssl_rand_save_file(const char *file)
-{
-char buffer[APR_PATH_MAX];
-#ifndef OPENSSL_NO_EGD
-int n;
-#endif
-
-if (file == NULL)
-file = RAND_file_name(buffer, sizeof(buffer));
-#ifndef OPENSSL_NO_EGD
-else if ((n = RAND_egd(file)) > 0) {
-return 0;
-}
-#endif
-if (file == NULL || !RAND_write_file(file))
-return 0;
-else
-return 1;
-}
-
int SSL_rand_seed(const char *file)
{
unsigned char stackdata[256];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated (88e5c0d78 -> 6bc2a13af)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git from 88e5c0d78 Not everyone has the same aliases I use... new e9cab3141 Remove unused variable new 6fbbfb7e7 Remove unused function new f9ae977f6 Remove unused function new 6bc2a13af Remove unused function 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: native/src/ssl.c | 214 --- 1 file changed, 214 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 04/04: Remove unused function
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-native.git
commit 6bc2a13af64523e60f04d936c313df1f671a3ff1
Author: Mark Thomas
AuthorDate: Fri Sep 29 10:02:59 2023 +0100
Remove unused function
---
native/src/ssl.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 6dd202b0c..e0b0461a9 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -641,11 +641,6 @@ static void free_bio_methods(void)
BIO_meth_free(jbs_methods);
}
-static BIO_METHOD *BIO_jbs()
-{
-return jbs_methods;
-}
-
/*** Begin Twitter 1:1 API addition ***/
TCN_IMPLEMENT_CALL(jint, SSL, getLastErrorNumber)(TCN_STDARGS) {
UNREFERENCED_STDARGS;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/04: Remove unused variable
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-native.git commit e9cab314133824494d6adb578bff1a84491989f7 Author: Mark Thomas AuthorDate: Fri Sep 29 10:00:49 2023 +0100 Remove unused variable --- native/src/ssl.c | 145 --- 1 file changed, 145 deletions(-) diff --git a/native/src/ssl.c b/native/src/ssl.c index a1ab58fa0..b114be67c 100644 --- a/native/src/ssl.c +++ b/native/src/ssl.c @@ -43,151 +43,6 @@ static void ssl_keylog_callback(const SSL *ssl, const char *line) static jclass byteArrayClass; static jclass stringClass; -/* - * supported_ssl_opts is a bitmask that contains all supported SSL_OP_* - * options at compile-time. - * - * Note that at least up through OpenSSL 0.9.8o, checking SSL_OP_ALL will - * return JNI_FALSE because SSL_OP_ALL is a mask that covers all bug - * workarounds for OpenSSL including future workarounds that are defined - * to be in the least-significant 3 nibbles of the SSL_OP_* bit space. - * - * This implementation has chosen NOT to simply set all those lower bits - * so that the return value for SSL_OP_FUTURE_WORKAROUND will only be - * reported by versions that actually support that specific workaround. - */ -static const jint supported_ssl_opts = 0 -/* - Specifically skip SSL_OP_ALL -#ifdef SSL_OP_ALL - | SSL_OP_ALL -#endif -*/ -#ifdef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION - | SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION -#endif - -#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE - | SSL_OP_CIPHER_SERVER_PREFERENCE -#endif - -#ifdef SSL_OP_CRYPTOPRO_TLSEXT_BUG - | SSL_OP_CRYPTOPRO_TLSEXT_BUG -#endif - -#ifdef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS - | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS -#endif - -#ifdef SSL_OP_EPHEMERAL_RSA - | SSL_OP_EPHEMERAL_RSA -#endif - -#ifdef SSL_OP_LEGACY_SERVER_CONNECT - | SSL_OP_LEGACY_SERVER_CONNECT -#endif - -#ifdef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER - | SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER -#endif - -#ifdef SSL_OP_MICROSOFT_SESS_ID_BUG - | SSL_OP_MICROSOFT_SESS_ID_BUG -#endif - -#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING - | SSL_OP_MSIE_SSLV2_RSA_PADDING -#endif - -#ifdef SSL_OP_NETSCAPE_CA_DN_BUG - | SSL_OP_NETSCAPE_CA_DN_BUG -#endif - -#ifdef SSL_OP_NETSCAPE_CHALLENGE_BUG - | SSL_OP_NETSCAPE_CHALLENGE_BUG -#endif - -#ifdef SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG - | SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG -#endif - -#ifdef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG - | SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG -#endif - -#ifdef SSL_OP_NO_COMPRESSION - | SSL_OP_NO_COMPRESSION -#endif - -#ifdef SSL_OP_NO_QUERY_MTU - | SSL_OP_NO_QUERY_MTU -#endif - -#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION - | SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION -#endif - -#ifdef SSL_OP_NO_SSLv2 - | SSL_OP_NO_SSLv2 -#endif - -#ifdef SSL_OP_NO_SSLv3 - | SSL_OP_NO_SSLv3 -#endif - -#ifdef SSL_OP_NO_TICKET - | SSL_OP_NO_TICKET -#endif - -#ifdef SSL_OP_NO_TLSv1 - | SSL_OP_NO_TLSv1 -#endif - -#ifdef SSL_OP_PKCS1_CHECK_1 - | SSL_OP_PKCS1_CHECK_1 -#endif - -#ifdef SSL_OP_PKCS1_CHECK_2 - | SSL_OP_PKCS1_CHECK_2 -#endif - -#ifdef SSL_OP_NO_TLSv1_1 - | SSL_OP_NO_TLSv1_1 -#endif - -#ifdef SSL_OP_NO_TLSv1_2 - | SSL_OP_NO_TLSv1_2 -#endif - -#ifdef SSL_OP_SINGLE_DH_USE - | SSL_OP_SINGLE_DH_USE -#endif - -#ifdef SSL_OP_SINGLE_ECDH_USE - | SSL_OP_SINGLE_ECDH_USE -#endif - -#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG - | SSL_OP_SSLEAY_080_CLIENT_DH_BUG -#endif - -#ifdef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG - | SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG -#endif - -#ifdef SSL_OP_TLS_BLOCK_PADDING_BUG - | SSL_OP_TLS_BLOCK_PADDING_BUG -#endif - -#ifdef SSL_OP_TLS_D5_BUG - | SSL_OP_TLS_D5_BUG -#endif - -#ifdef SSL_OP_TLS_ROLLBACK_BUG - | SSL_OP_TLS_ROLLBACK_BUG -#endif - | 0; - /* * Grab well-defined DH parameters from OpenSSL, see the BN_get_rfc* * functions in for all available primes. - 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: Code clean-up - no functional change
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 a0d5ba947e Code clean-up - no functional change
a0d5ba947e is described below
commit a0d5ba947ee47f11ebb03720f4aeceac4736f280
Author: Mark Thomas
AuthorDate: Mon Oct 2 09:19:15 2023 +0100
Code clean-up - no functional change
---
.../catalina/security/DeployXmlPermission.java | 7 +-
.../catalina/security/SecurityClassLoad.java | 3 +-
.../apache/catalina/security/SecurityConfig.java | 49 ++--
.../apache/catalina/security/SecurityListener.java | 51 ++--
.../org/apache/catalina/security/SecurityUtil.java | 299 -
5 files changed, 165 insertions(+), 244 deletions(-)
diff --git a/java/org/apache/catalina/security/DeployXmlPermission.java
b/java/org/apache/catalina/security/DeployXmlPermission.java
index bf8ca273c5..7509be5fc1 100644
--- a/java/org/apache/catalina/security/DeployXmlPermission.java
+++ b/java/org/apache/catalina/security/DeployXmlPermission.java
@@ -19,10 +19,9 @@ package org.apache.catalina.security;
import java.security.BasicPermission;
/**
- * Grant this permission to a docBase to permit the web application to use any
- * META-INF/context.xml that might be present with in the
- * application when deployXML has been disabled at the Host level.
- * The name of the permission should be the base name for the web application.
+ * Grant this permission to a docBase to permit the web application to use any
META-INF/context.xml that
+ * might be present with in the application when deployXML has
been disabled at the Host level. The name of
+ * the permission should be the base name for the web application.
*/
public class DeployXmlPermission extends BasicPermission {
diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java
b/java/org/apache/catalina/security/SecurityClassLoad.java
index b79c75abde..7f1a6d9c95 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -17,8 +17,7 @@
package org.apache.catalina.security;
/**
- * Static class used to preload java classes when using the
- * Java SecurityManager so that the defineClassInPackage
+ * Static class used to preload java classes when using the Java
SecurityManager so that the defineClassInPackage
* RuntimePermission does not trigger an AccessControlException.
*
* @author Glenn L. Nielsen
diff --git a/java/org/apache/catalina/security/SecurityConfig.java
b/java/org/apache/catalina/security/SecurityConfig.java
index 3b16e4b2c0..89d3d1b4f1 100644
--- a/java/org/apache/catalina/security/SecurityConfig.java
+++ b/java/org/apache/catalina/security/SecurityConfig.java
@@ -23,11 +23,11 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Util class to protect Catalina against package access and insertion.
- * The code are been moved from Catalina.java
+ * Util class to protect Catalina against package access and insertion. The
code are been moved from Catalina.java
+ *
* @author the Catalina.java authors
*/
-public final class SecurityConfig{
+public final class SecurityConfig {
private static final Object singletonLock = new Object();
private static volatile SecurityConfig singleton = null;
@@ -35,19 +35,13 @@ public final class SecurityConfig{
private static final Log log = LogFactory.getLog(SecurityConfig.class);
-private static final String PACKAGE_ACCESS = "sun.,"
-+ "org.apache.catalina."
-+ ",org.apache.jasper."
-+ ",org.apache.coyote."
-+ ",org.apache.tomcat.";
+private static final String PACKAGE_ACCESS =
+"sun.," + "org.apache.catalina." + ",org.apache.jasper." +
",org.apache.coyote." + ",org.apache.tomcat.";
// FIX ME package "javax." was removed to prevent HotSpot
// fatal internal errors
-private static final String PACKAGE_DEFINITION= "java.,sun."
-+ ",org.apache.catalina."
-+ ",org.apache.coyote."
-+ ",org.apache.tomcat."
-+ ",org.apache.jasper.";
+private static final String PACKAGE_DEFINITION = "java.,sun." +
",org.apache.catalina." + ",org.apache.coyote." +
+",org.apache.tomcat." + ",org.apache.jasper.";
/**
* List of protected package from conf/catalina.properties
*/
@@ -66,11 +60,11 @@ public final class SecurityConfig{
private SecurityConfig() {
String definition = null;
String access = null;
[tomcat] branch 10.1.x updated: Code clean-up - no functional change
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 61a6fe133b Code clean-up - no functional change
61a6fe133b is described below
commit 61a6fe133b395a602b9b4e5665a36803c6f9edb5
Author: Mark Thomas
AuthorDate: Mon Oct 2 09:18:56 2023 +0100
Code clean-up - no functional change
---
.../catalina/security/DeployXmlPermission.java | 7 +-
.../catalina/security/SecurityClassLoad.java | 3 +-
.../apache/catalina/security/SecurityConfig.java | 49 ++--
.../apache/catalina/security/SecurityListener.java | 51 ++--
.../org/apache/catalina/security/SecurityUtil.java | 299 -
5 files changed, 165 insertions(+), 244 deletions(-)
diff --git a/java/org/apache/catalina/security/DeployXmlPermission.java
b/java/org/apache/catalina/security/DeployXmlPermission.java
index bf8ca273c5..7509be5fc1 100644
--- a/java/org/apache/catalina/security/DeployXmlPermission.java
+++ b/java/org/apache/catalina/security/DeployXmlPermission.java
@@ -19,10 +19,9 @@ package org.apache.catalina.security;
import java.security.BasicPermission;
/**
- * Grant this permission to a docBase to permit the web application to use any
- * META-INF/context.xml that might be present with in the
- * application when deployXML has been disabled at the Host level.
- * The name of the permission should be the base name for the web application.
+ * Grant this permission to a docBase to permit the web application to use any
META-INF/context.xml that
+ * might be present with in the application when deployXML has
been disabled at the Host level. The name of
+ * the permission should be the base name for the web application.
*/
public class DeployXmlPermission extends BasicPermission {
diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java
b/java/org/apache/catalina/security/SecurityClassLoad.java
index 8a2908ff2a..cae3005dfb 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -17,8 +17,7 @@
package org.apache.catalina.security;
/**
- * Static class used to preload java classes when using the
- * Java SecurityManager so that the defineClassInPackage
+ * Static class used to preload java classes when using the Java
SecurityManager so that the defineClassInPackage
* RuntimePermission does not trigger an AccessControlException.
*
* @author Glenn L. Nielsen
diff --git a/java/org/apache/catalina/security/SecurityConfig.java
b/java/org/apache/catalina/security/SecurityConfig.java
index 3b16e4b2c0..89d3d1b4f1 100644
--- a/java/org/apache/catalina/security/SecurityConfig.java
+++ b/java/org/apache/catalina/security/SecurityConfig.java
@@ -23,11 +23,11 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Util class to protect Catalina against package access and insertion.
- * The code are been moved from Catalina.java
+ * Util class to protect Catalina against package access and insertion. The
code are been moved from Catalina.java
+ *
* @author the Catalina.java authors
*/
-public final class SecurityConfig{
+public final class SecurityConfig {
private static final Object singletonLock = new Object();
private static volatile SecurityConfig singleton = null;
@@ -35,19 +35,13 @@ public final class SecurityConfig{
private static final Log log = LogFactory.getLog(SecurityConfig.class);
-private static final String PACKAGE_ACCESS = "sun.,"
-+ "org.apache.catalina."
-+ ",org.apache.jasper."
-+ ",org.apache.coyote."
-+ ",org.apache.tomcat.";
+private static final String PACKAGE_ACCESS =
+"sun.," + "org.apache.catalina." + ",org.apache.jasper." +
",org.apache.coyote." + ",org.apache.tomcat.";
// FIX ME package "javax." was removed to prevent HotSpot
// fatal internal errors
-private static final String PACKAGE_DEFINITION= "java.,sun."
-+ ",org.apache.catalina."
-+ ",org.apache.coyote."
-+ ",org.apache.tomcat."
-+ ",org.apache.jasper.";
+private static final String PACKAGE_DEFINITION = "java.,sun." +
",org.apache.catalina." + ",org.apache.coyote." +
+",org.apache.tomcat." + ",org.apache.jasper.";
/**
* List of protected package from conf/catalina.properties
*/
@@ -66,11 +60,11 @@ public final class SecurityConfig{
private SecurityConfig() {
String definition = null;
String access = nul
[tomcat] branch 8.5.x updated: Code clean-up - no functional change
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 a47bbee702 Code clean-up - no functional change
a47bbee702 is described below
commit a47bbee7029e2edefe88d288035467ace950a285
Author: Mark Thomas
AuthorDate: Mon Oct 2 09:19:29 2023 +0100
Code clean-up - no functional change
---
.../catalina/security/DeployXmlPermission.java | 7 +-
.../catalina/security/SecurityClassLoad.java | 3 +-
.../apache/catalina/security/SecurityConfig.java | 49 ++--
.../apache/catalina/security/SecurityListener.java | 51 ++--
.../org/apache/catalina/security/SecurityUtil.java | 303 -
5 files changed, 167 insertions(+), 246 deletions(-)
diff --git a/java/org/apache/catalina/security/DeployXmlPermission.java
b/java/org/apache/catalina/security/DeployXmlPermission.java
index bf8ca273c5..7509be5fc1 100644
--- a/java/org/apache/catalina/security/DeployXmlPermission.java
+++ b/java/org/apache/catalina/security/DeployXmlPermission.java
@@ -19,10 +19,9 @@ package org.apache.catalina.security;
import java.security.BasicPermission;
/**
- * Grant this permission to a docBase to permit the web application to use any
- * META-INF/context.xml that might be present with in the
- * application when deployXML has been disabled at the Host level.
- * The name of the permission should be the base name for the web application.
+ * Grant this permission to a docBase to permit the web application to use any
META-INF/context.xml that
+ * might be present with in the application when deployXML has
been disabled at the Host level. The name of
+ * the permission should be the base name for the web application.
*/
public class DeployXmlPermission extends BasicPermission {
diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java
b/java/org/apache/catalina/security/SecurityClassLoad.java
index 695c0b69ef..d9a3ac4868 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -17,8 +17,7 @@
package org.apache.catalina.security;
/**
- * Static class used to preload java classes when using the
- * Java SecurityManager so that the defineClassInPackage
+ * Static class used to preload java classes when using the Java
SecurityManager so that the defineClassInPackage
* RuntimePermission does not trigger an AccessControlException.
*
* @author Glenn L. Nielsen
diff --git a/java/org/apache/catalina/security/SecurityConfig.java
b/java/org/apache/catalina/security/SecurityConfig.java
index 3b16e4b2c0..89d3d1b4f1 100644
--- a/java/org/apache/catalina/security/SecurityConfig.java
+++ b/java/org/apache/catalina/security/SecurityConfig.java
@@ -23,11 +23,11 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
/**
- * Util class to protect Catalina against package access and insertion.
- * The code are been moved from Catalina.java
+ * Util class to protect Catalina against package access and insertion. The
code are been moved from Catalina.java
+ *
* @author the Catalina.java authors
*/
-public final class SecurityConfig{
+public final class SecurityConfig {
private static final Object singletonLock = new Object();
private static volatile SecurityConfig singleton = null;
@@ -35,19 +35,13 @@ public final class SecurityConfig{
private static final Log log = LogFactory.getLog(SecurityConfig.class);
-private static final String PACKAGE_ACCESS = "sun.,"
-+ "org.apache.catalina."
-+ ",org.apache.jasper."
-+ ",org.apache.coyote."
-+ ",org.apache.tomcat.";
+private static final String PACKAGE_ACCESS =
+"sun.," + "org.apache.catalina." + ",org.apache.jasper." +
",org.apache.coyote." + ",org.apache.tomcat.";
// FIX ME package "javax." was removed to prevent HotSpot
// fatal internal errors
-private static final String PACKAGE_DEFINITION= "java.,sun."
-+ ",org.apache.catalina."
-+ ",org.apache.coyote."
-+ ",org.apache.tomcat."
-+ ",org.apache.jasper.";
+private static final String PACKAGE_DEFINITION = "java.,sun." +
",org.apache.catalina." + ",org.apache.coyote." +
+",org.apache.tomcat." + ",org.apache.jasper.";
/**
* List of protected package from conf/catalina.properties
*/
@@ -66,11 +60,11 @@ public final class SecurityConfig{
private SecurityConfig() {
String definition = null;
String access = null;
[tomcat] branch main updated: Code clean-up - no functional change
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 08af6a5767 Code clean-up - no functional change
08af6a5767 is described below
commit 08af6a57671f6fce40e59c9342ec5e4b1dd327b1
Author: Mark Thomas
AuthorDate: Mon Oct 2 09:17:37 2023 +0100
Code clean-up - no functional change
---
.../apache/catalina/security/SecurityListener.java | 51 +-
1 file changed, 20 insertions(+), 31 deletions(-)
diff --git a/java/org/apache/catalina/security/SecurityListener.java
b/java/org/apache/catalina/security/SecurityListener.java
index 6df8412935..2371e30f7d 100644
--- a/java/org/apache/catalina/security/SecurityListener.java
+++ b/java/org/apache/catalina/security/SecurityListener.java
@@ -36,11 +36,9 @@ public class SecurityListener implements LifecycleListener {
private static final Log log = LogFactory.getLog(SecurityListener.class);
-private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE);
+private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE);
-private static final String UMASK_PROPERTY_NAME =
-Constants.PACKAGE + ".SecurityListener.UMASK";
+private static final String UMASK_PROPERTY_NAME = Constants.PACKAGE +
".SecurityListener.UMASK";
private static final String UMASK_FORMAT = "%04o";
@@ -50,8 +48,8 @@ public class SecurityListener implements LifecycleListener {
private final Set checkedOsUsers = new HashSet<>();
/**
- * The minimum umask that must be configured for the operating system user
- * running Tomcat. The umask is handled as an octal.
+ * The minimum umask that must be configured for the operating system user
running Tomcat. The umask is handled as
+ * an octal.
*/
private Integer minimumUmask = Integer.valueOf(7);
@@ -66,8 +64,7 @@ public class SecurityListener implements LifecycleListener {
// This is the earliest event in Lifecycle
if (event.getType().equals(Lifecycle.BEFORE_INIT_EVENT)) {
if (!(event.getLifecycle() instanceof Server)) {
-log.warn(sm.getString("listener.notServer",
-event.getLifecycle().getClass().getSimpleName()));
+log.warn(sm.getString("listener.notServer",
event.getLifecycle().getClass().getSimpleName()));
}
doChecks();
}
@@ -75,14 +72,12 @@ public class SecurityListener implements LifecycleListener {
/**
- * Set the list of operating system users not permitted to run Tomcat. By
- * default, only root is prevented from running Tomcat. Calling this method
- * with null or the empty string will clear the list of users and
- * effectively disables this check. User names will always be checked in a
- * case insensitive manner using the system default Locale.
+ * Set the list of operating system users not permitted to run Tomcat. By
default, only root is prevented from
+ * running Tomcat. Calling this method with null or the empty string will
clear the list of users and effectively
+ * disables this check. User names will always be checked in a case
insensitive manner using the system default
+ * Locale.
*
- * @param userNameList A comma separated list of operating system users
not
- * permitted to run Tomcat
+ * @param userNameList A comma separated list of operating system users
not permitted to run Tomcat
*/
public void setCheckedOsUsers(String userNameList) {
if (userNameList == null || userNameList.length() == 0) {
@@ -99,10 +94,9 @@ public class SecurityListener implements LifecycleListener {
/**
- * Returns the current list of operating system users not permitted to run
- * Tomcat.
+ * Returns the current list of operating system users not permitted to run
Tomcat.
*
- * @return A comma separated list of operating system user names.
+ * @return A comma separated list of operating system user names.
*/
public String getCheckedOsUsers() {
return StringUtils.join(checkedOsUsers);
@@ -126,7 +120,7 @@ public class SecurityListener implements LifecycleListener {
/**
* Get the minimum umask that must be configured before Tomcat will start.
*
- * @return The 4-digit umask as used by the OS command umask
+ * @return The 4-digit umask as used by the OS command umask
*/
public String getMinimumUmask() {
return String.format(UMASK_FORMAT, minimumUmask);
@@ -149,8 +143,7 @@ public class SecurityListener implements LifecycleListener {
if (checkedOsUsers.contains(userNameLC)) {
// Have to throw Error to force start process to be aborted
-throw new
svn commit: r64285 - /dev/tomcat/tomcat-connectors/native/2.0.6/ /release/tomcat/tomcat-connectors/native/2.0.6/ /release/tomcat/tomcat-connectors/native/README.html
Author: markt Date: Mon Oct 2 08:04:34 2023 New Revision: 64285 Log: Release Tomcat Native 2.0.6 Added: release/tomcat/tomcat-connectors/native/2.0.6/ - copied from r64284, dev/tomcat/tomcat-connectors/native/2.0.6/ Removed: dev/tomcat/tomcat-connectors/native/2.0.6/ Modified: release/tomcat/tomcat-connectors/native/README.html Modified: release/tomcat/tomcat-connectors/native/README.html == --- release/tomcat/tomcat-connectors/native/README.html (original) +++ release/tomcat/tomcat-connectors/native/README.html Mon Oct 2 08:04:34 2023 @@ -1,6 +1,6 @@ The Apache Tomcat Native The latest releases are: -1.2.37 -2.0.4 +1.2.38 +2.0.6 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat Native 2.0.6
The following votes were cast: Binding: +1: markt, remm, schultz No other votes were cast. The vote therefore passes. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67572] Failed to load JVM DLL
https://bz.apache.org/bugzilla/show_bug.cgi?id=67572 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- Windows version? -- 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 67572] New: Failed to load JVM DLL
https://bz.apache.org/bugzilla/show_bug.cgi?id=67572 Bug ID: 67572 Summary: Failed to load JVM DLL Product: Tomcat 10 Version: unspecified Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Servlet Assignee: dev@tomcat.apache.org Reporter: air...@163.com Target Milestone: -- tomcat-10.1.13 jdk-21 start failure. commons-daemon.log [2023-10-02 14:15:55] [info] [22452] Apache Commons Daemon procrun (1.3.4.0 64-bit) started. [2023-10-02 14:15:55] [info] [22452] Running Service 'Tomcat10'... [2023-10-02 14:15:55] [info] [24572] Starting service... [2023-10-02 14:15:55] [error] [24572] Found 'D:\Program Files\Java\jdk-21\bin\server\jvm.dll' but couldn't load it. [2023-10-02 14:15:55] [error] [24572] 拒绝访问。 [2023-10-02 14:15:55] [error] [24572] Invalid JVM DLL handle. [2023-10-02 14:15:55] [error] [24572] 拒绝访问。 [2023-10-02 14:15:55] [error] [24572] 拒绝访问。 [2023-10-02 14:15:55] [error] [24572] Failed to load JVM DLL 'D:\Program Files\Java\jdk-21\bin\server\jvm.dll', home '(null)'. [2023-10-02 14:15:55] [error] [24572] 拒绝访问。 [2023-10-02 14:15:55] [error] [24572] Failed creating Java 'D:\Program Files\Java\jdk-21\bin\server\jvm.dll'. [2023-10-02 14:15:55] [error] [24572] 拒绝访问。 [2023-10-02 14:15:55] [error] [24572] ServiceStart returned 1. [2023-10-02 14:15:55] [error] [24572] 拒绝访问。 [2023-10-02 14:15:55] [info] [22452] Run service finished. [2023-10-02 14:15:55] [info] [22452] Apache Commons Daemon procrun finished. but if i copy jdk\bin\msvcp140.dll and jdk\bin\vcruntime140.dll to tomcat\bin, tomcat is working successfully. -- 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
