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 cd99777010 Revert "BZ69521: Allow more non latin languages in EL"
new 2679a04e99 Alphabetical order
new 2c0f7161c3 Correct description
new cce258602b Suppress false positive warning
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:
.../catalina/webresources/DirResourceSet.java | 1 +
webapps/docs/config/resources.xml | 30 +++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
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 2679a04e990ee29edd920624b203eb6c33e0e388
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 8 16:25:13 2025 +0000
Alphabetical order
---
webapps/docs/config/resources.xml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml
index ef6a3aec37..738122a37d 100644
--- a/webapps/docs/config/resources.xml
+++ b/webapps/docs/config/resources.xml
@@ -77,6 +77,20 @@
disclosure, among other security problems.</b></p>
</attribute>
+ <attribute name="archiveIndexStrategy" required="false">
+ <p>If this is <code>simple</code> then a hash map will be used for
+ JAR archive lookups, unless useBloomFilterForArchives in
+ <a href="context.html">Context</a> is explicitly defined.</p>
+ <p>If this is <code>bloom</code> then a bloom filter will be used to
+ speed up archive lookups. This can be beneficial to the deployment
+ speed to web applications that contain very large amount of JARs.</p>
+ <p>If this is <code>purged</code> then a bloom filter will be used to
+ speed up archive lookups, but can be purged at runtime. It is recommended
+ to use <code>bloom</code> to avoid reinitializing the bloom filters.</p>
+ <p>If not specified, the default value of <code>simple</code> will be
+ used.</p>
+ </attribute>
+
<attribute name="cacheMaxSize" required="false">
<p>The maximum size of the static resource cache in kilobytes.
If not specified, the default value is <code>10240</code>
@@ -148,20 +162,6 @@
used.</p>
</attribute>
- <attribute name="archiveIndexStrategy" required="false">
- <p>If this is <code>simple</code> then a hash map will be used for
- JAR archive lookups, unless useBloomFilterForArchives in
- <a href="context.html">Context</a> is explicitly defined.</p>
- <p>If this is <code>bloom</code> then a bloom filter will be used to
- speed up archive lookups. This can be beneficial to the deployment
- speed to web applications that contain very large amount of JARs.</p>
- <p>If this is <code>purged</code> then a bloom filter will be used to
- speed up archive lookups, but can be purged at runtime. It is recommended
- to use <code>bloom</code> to avoid reinitializing the bloom filters.</p>
- <p>If not specified, the default value of <code>simple</code> will be
- used.</p>
- </attribute>
-
</attributes>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
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 cce258602b6082835e668b35a35bde8a2ddd4d5b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 8 16:33:44 2025 +0000
Suppress false positive warning
---
java/org/apache/catalina/webresources/DirResourceSet.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java b/java/org/apache/catalina/webresources/DirResourceSet.java
index 026c61a065..512adf8b8a 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -96,6 +96,7 @@ public class DirResourceSet extends AbstractFileResourceSet implements WebResour
}
+ @SuppressWarnings("null") // lock can never be null when lock.key is read
@Override
public WebResource getResource(String path) {
checkPath(path);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
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 2c0f7161c363901c1f95264361149a78ed3012d0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 8 16:25:47 2025 +0000
Correct description
---
webapps/docs/config/resources.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml
index 738122a37d..012d4b450f 100644
--- a/webapps/docs/config/resources.xml
+++ b/webapps/docs/config/resources.xml
@@ -138,7 +138,7 @@
<attribute name="readOnly" required="false">
<p>If the value of this flag is <code>true</code>, then writing will
- be enabled on the main resource set. The default value is
+ be disabled on the main resource set. The default value is
<code>false</code>.</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org