(tomcat) branch main updated (c8b460dd41 -> 9512145310)
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 c8b460dd41 OpenSSL might crash here when passing null on some platforms new c578fdafa6 Code clean-up - formatting. No functional change new 9512145310 Code clean-up - formatting. No functional change The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/util/CharsetMapper.java | 37 ++-- java/org/apache/catalina/util/ContextName.java | 32 ++- .../catalina/util/CustomObjectInputStream.java | 59 +++--- java/org/apache/catalina/util/DOMWriter.java | 5 +- .../org/apache/catalina/util/ErrorPageSupport.java | 10 +- java/org/apache/catalina/util/IOTools.java | 36 ++-- java/org/apache/catalina/util/Introspection.java | 56 ++--- java/org/apache/catalina/util/LifecycleBase.java | 85 +++- .../apache/catalina/util/LifecycleMBeanBase.java | 65 +++--- java/org/apache/catalina/util/ParameterMap.java| 33 ++- java/org/apache/catalina/util/RequestUtil.java | 9 +- java/org/apache/catalina/util/ResourceSet.java | 31 +-- java/org/apache/catalina/util/ServerInfo.java | 21 +- java/org/apache/catalina/util/SessionConfig.java | 14 +- .../catalina/util/SessionIdGeneratorBase.java | 97 - .../catalina/util/StandardSessionIdGenerator.java | 4 +- java/org/apache/catalina/util/Strftime.java| 232 ++--- java/org/apache/catalina/util/StringUtil.java | 10 +- java/org/apache/catalina/util/TLSUtil.java | 10 +- .../apache/catalina/util/TimeBucketCounter.java| 8 +- java/org/apache/catalina/util/ToStringUtil.java| 6 +- java/org/apache/catalina/util/TomcatCSS.java | 13 +- java/org/apache/catalina/util/URLEncoder.java | 30 ++- java/org/apache/catalina/util/XMLWriter.java | 122 ++- .../valves/rewrite/QuotedStringTokenizer.java | 48 +++-- .../valves/rewrite/RandomizedTextRewriteMap.java | 9 +- .../catalina/valves/rewrite/ResolverImpl.java | 39 ++-- .../catalina/valves/rewrite/RewriteCond.java | 39 ++-- .../apache/catalina/valves/rewrite/RewriteMap.java | 25 +-- .../catalina/valves/rewrite/RewriteRule.java | 209 ++- .../catalina/valves/rewrite/RewriteValve.java | 106 -- .../catalina/valves/rewrite/Substitution.java | 59 -- 32 files changed, 726 insertions(+), 833 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Code clean-up - formatting. 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
commit c578fdafa64c4549bea7d26aa06ec70fa20dbd33
Author: Mark Thomas
AuthorDate: Fri May 17 19:27:47 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/util/CharsetMapper.java | 37 ++--
java/org/apache/catalina/util/ContextName.java | 32 ++-
.../catalina/util/CustomObjectInputStream.java | 59 +++---
java/org/apache/catalina/util/DOMWriter.java | 5 +-
.../org/apache/catalina/util/ErrorPageSupport.java | 10 +-
java/org/apache/catalina/util/IOTools.java | 36 ++--
java/org/apache/catalina/util/Introspection.java | 56 ++---
java/org/apache/catalina/util/LifecycleBase.java | 85 +++-
.../apache/catalina/util/LifecycleMBeanBase.java | 65 +++---
java/org/apache/catalina/util/ParameterMap.java| 33 ++-
java/org/apache/catalina/util/RequestUtil.java | 9 +-
java/org/apache/catalina/util/ResourceSet.java | 31 +--
java/org/apache/catalina/util/ServerInfo.java | 21 +-
java/org/apache/catalina/util/SessionConfig.java | 14 +-
.../catalina/util/SessionIdGeneratorBase.java | 97 -
.../catalina/util/StandardSessionIdGenerator.java | 4 +-
java/org/apache/catalina/util/Strftime.java| 232 ++---
java/org/apache/catalina/util/StringUtil.java | 10 +-
java/org/apache/catalina/util/TLSUtil.java | 10 +-
.../apache/catalina/util/TimeBucketCounter.java| 8 +-
java/org/apache/catalina/util/ToStringUtil.java| 6 +-
java/org/apache/catalina/util/TomcatCSS.java | 13 +-
java/org/apache/catalina/util/URLEncoder.java | 30 ++-
java/org/apache/catalina/util/XMLWriter.java | 122 ++-
24 files changed, 445 insertions(+), 580 deletions(-)
diff --git a/java/org/apache/catalina/util/CharsetMapper.java
b/java/org/apache/catalina/util/CharsetMapper.java
index c04d1c5e4e..5bb215e62f 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -25,14 +25,11 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-
/**
- * Utility class that attempts to map from a Locale to the corresponding
- * character set to be used for interpreting input text (or generating
- * output text) when the Content-Type header does not include one. You
- * can customize the behavior of this class by modifying the mapping data
- * it loads, or by subclassing it (to change the algorithm) and then using
- * your own version for a particular web application.
+ * Utility class that attempts to map from a Locale to the corresponding
character set to be used for interpreting input
+ * text (or generating output text) when the Content-Type header does not
include one. You can customize the behavior of
+ * this class by modifying the mapping data it loads, or by subclassing it (to
change the algorithm) and then using your
+ * own version for a particular web application.
*
* @author Craig R. McClanahan
*/
@@ -45,8 +42,7 @@ public class CharsetMapper {
/**
* Default properties resource name.
*/
-public static final String DEFAULT_RESOURCE =
- "/org/apache/catalina/util/CharsetMapperDefault.properties";
+public static final String DEFAULT_RESOURCE =
"/org/apache/catalina/util/CharsetMapperDefault.properties";
// -- Constructors
@@ -65,8 +61,7 @@ public class CharsetMapper {
*
* @param name Name of a properties resource to be loaded
*
- * @exception IllegalArgumentException if the specified properties
- * resource could not be loaded for any reason.
+ * @exception IllegalArgumentException if the specified properties
resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
if (JreCompat.isGraalAvailable()) {
@@ -86,8 +81,7 @@ public class CharsetMapper {
/**
- * The mapping properties that have been initialized from the specified or
- * default properties resource.
+ * The mapping properties that have been initialized from the specified or
default properties resource.
*/
private Properties map = new Properties();
@@ -96,11 +90,11 @@ public class CharsetMapper {
/**
- * Calculate the name of a character set to be assumed, given the specified
- * Locale and the absence of a character set specified as part of the
- * content type header.
+ * Calculate the name of a character set to be assumed, given the
specified Locale and the absence of a character
+ * set specified as part of the content type header.
*
* @param locale The locale for which to calculate a character set
+ *
* @return the charset name
*/
public String ge
(tomcat) 02/02: Code clean-up - formatting. 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
commit 95121453100b34d390efcfbe0d990d0ee180c277
Author: Mark Thomas
AuthorDate: Mon May 20 08:13:53 2024 +0100
Code clean-up - formatting. No functional change
---
.../valves/rewrite/QuotedStringTokenizer.java | 48 ++---
.../valves/rewrite/RandomizedTextRewriteMap.java | 9 +-
.../catalina/valves/rewrite/ResolverImpl.java | 39 ++--
.../catalina/valves/rewrite/RewriteCond.java | 39 ++--
.../apache/catalina/valves/rewrite/RewriteMap.java | 25 +--
.../catalina/valves/rewrite/RewriteRule.java | 209 -
.../catalina/valves/rewrite/RewriteValve.java | 106 +--
.../catalina/valves/rewrite/Substitution.java | 59 +++---
8 files changed, 281 insertions(+), 253 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index a6204fb077..0d39915c00 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -32,7 +32,11 @@ public class QuotedStringTokenizer {
private int returnedTokens = 0;
enum WordMode {
-SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT
+SPACES,
+QUOTED,
+ESCAPED,
+SIMPLE,
+COMMENT
}
public QuotedStringTokenizer(String text) {
@@ -55,27 +59,27 @@ public class QuotedStringTokenizer {
while (pos < length) {
char currentChar = inputText.charAt(pos);
switch (currentMode) {
-case SPACES:
-currentMode = handleSpaces(currentToken, currentChar);
-break;
-case QUOTED:
-currentMode = handleQuoted(tokens, currentToken, currentChar);
-break;
-case ESCAPED:
-currentToken.append(currentChar);
-currentMode = WordMode.QUOTED;
-break;
-case SIMPLE:
-currentMode = handleSimple(tokens, currentToken, currentChar);
-break;
-case COMMENT:
-if (currentChar == '\r' || currentChar == '\n') {
-currentMode = WordMode.SPACES;
-}
-break;
-default:
-throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
-inputText, Integer.valueOf(pos), currentMode));
+case SPACES:
+currentMode = handleSpaces(currentToken, currentChar);
+break;
+case QUOTED:
+currentMode = handleQuoted(tokens, currentToken,
currentChar);
+break;
+case ESCAPED:
+currentToken.append(currentChar);
+currentMode = WordMode.QUOTED;
+break;
+case SIMPLE:
+currentMode = handleSimple(tokens, currentToken,
currentChar);
+break;
+case COMMENT:
+if (currentChar == '\r' || currentChar == '\n') {
+currentMode = WordMode.SPACES;
+}
+break;
+default:
+throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
inputText,
+Integer.valueOf(pos), currentMode));
}
pos++;
}
diff --git
a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
index 37a24332df..399aa98508 100644
--- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
@@ -31,17 +31,18 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implement a map for the txt: and rnd: mod_rewrite capabilities.
*/
-public class RandomizedTextRewriteMap implements RewriteMap{
+public class RandomizedTextRewriteMap implements RewriteMap {
protected static final StringManager sm =
StringManager.getManager(RandomizedTextRewriteMap.class);
private static final Random random = new Random();
-private final Map map = new HashMap<>();
+private final Map map = new HashMap<>();
/**
* Create a map from a text file according to the mod_rewrite syntax.
+ *
* @param txtFilePath the text file path
- * @param useRandom if the map should produce random results
+ * @param useRandom if the map should produce random results
*/
public RandomizedTextRewriteMap(String txtFilePath, boolean useRandom) {
String line;
@@ -49,7 +50,7 @@ pub
(tomcat) branch 10.1.x updated (6435647905 -> 5f6f162f27)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 6435647905 OpenSSL might crash here when passing null on some platforms new 9ff474b753 Code clean-up - formatting. No functional change. new 5f6f162f27 Code clean-up - formatting. No functional change. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/util/CharsetMapper.java | 37 ++-- java/org/apache/catalina/util/ContextName.java | 32 ++- .../catalina/util/CustomObjectInputStream.java | 59 +++--- java/org/apache/catalina/util/DOMWriter.java | 5 +- .../org/apache/catalina/util/ErrorPageSupport.java | 10 +- java/org/apache/catalina/util/IOTools.java | 36 ++-- java/org/apache/catalina/util/Introspection.java | 66 +++--- java/org/apache/catalina/util/LifecycleBase.java | 85 +++- .../apache/catalina/util/LifecycleMBeanBase.java | 65 +++--- java/org/apache/catalina/util/ParameterMap.java| 33 ++- java/org/apache/catalina/util/RequestUtil.java | 9 +- java/org/apache/catalina/util/ResourceSet.java | 31 +-- java/org/apache/catalina/util/ServerInfo.java | 21 +- java/org/apache/catalina/util/SessionConfig.java | 14 +- .../catalina/util/SessionIdGeneratorBase.java | 97 - .../catalina/util/StandardSessionIdGenerator.java | 4 +- java/org/apache/catalina/util/Strftime.java| 232 ++--- java/org/apache/catalina/util/StringUtil.java | 10 +- java/org/apache/catalina/util/TLSUtil.java | 10 +- .../apache/catalina/util/TimeBucketCounter.java| 8 +- java/org/apache/catalina/util/ToStringUtil.java| 6 +- java/org/apache/catalina/util/TomcatCSS.java | 13 +- java/org/apache/catalina/util/URLEncoder.java | 30 ++- java/org/apache/catalina/util/XMLWriter.java | 122 ++- .../valves/rewrite/QuotedStringTokenizer.java | 48 +++-- .../valves/rewrite/RandomizedTextRewriteMap.java | 9 +- .../catalina/valves/rewrite/ResolverImpl.java | 39 ++-- .../catalina/valves/rewrite/RewriteCond.java | 39 ++-- .../apache/catalina/valves/rewrite/RewriteMap.java | 25 +-- .../catalina/valves/rewrite/RewriteRule.java | 209 ++- .../catalina/valves/rewrite/RewriteValve.java | 106 -- .../catalina/valves/rewrite/Substitution.java | 59 -- 32 files changed, 732 insertions(+), 837 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Code clean-up - formatting. 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
commit 5f6f162f2764f3c710ba2c47b5b167fcb3e9d975
Author: Mark Thomas
AuthorDate: Mon May 20 08:17:30 2024 +0100
Code clean-up - formatting. No functional change.
---
.../valves/rewrite/QuotedStringTokenizer.java | 48 ++---
.../valves/rewrite/RandomizedTextRewriteMap.java | 9 +-
.../catalina/valves/rewrite/ResolverImpl.java | 39 ++--
.../catalina/valves/rewrite/RewriteCond.java | 39 ++--
.../apache/catalina/valves/rewrite/RewriteMap.java | 25 +--
.../catalina/valves/rewrite/RewriteRule.java | 209 -
.../catalina/valves/rewrite/RewriteValve.java | 106 +--
.../catalina/valves/rewrite/Substitution.java | 59 +++---
8 files changed, 281 insertions(+), 253 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index a6204fb077..0d39915c00 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -32,7 +32,11 @@ public class QuotedStringTokenizer {
private int returnedTokens = 0;
enum WordMode {
-SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT
+SPACES,
+QUOTED,
+ESCAPED,
+SIMPLE,
+COMMENT
}
public QuotedStringTokenizer(String text) {
@@ -55,27 +59,27 @@ public class QuotedStringTokenizer {
while (pos < length) {
char currentChar = inputText.charAt(pos);
switch (currentMode) {
-case SPACES:
-currentMode = handleSpaces(currentToken, currentChar);
-break;
-case QUOTED:
-currentMode = handleQuoted(tokens, currentToken, currentChar);
-break;
-case ESCAPED:
-currentToken.append(currentChar);
-currentMode = WordMode.QUOTED;
-break;
-case SIMPLE:
-currentMode = handleSimple(tokens, currentToken, currentChar);
-break;
-case COMMENT:
-if (currentChar == '\r' || currentChar == '\n') {
-currentMode = WordMode.SPACES;
-}
-break;
-default:
-throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
-inputText, Integer.valueOf(pos), currentMode));
+case SPACES:
+currentMode = handleSpaces(currentToken, currentChar);
+break;
+case QUOTED:
+currentMode = handleQuoted(tokens, currentToken,
currentChar);
+break;
+case ESCAPED:
+currentToken.append(currentChar);
+currentMode = WordMode.QUOTED;
+break;
+case SIMPLE:
+currentMode = handleSimple(tokens, currentToken,
currentChar);
+break;
+case COMMENT:
+if (currentChar == '\r' || currentChar == '\n') {
+currentMode = WordMode.SPACES;
+}
+break;
+default:
+throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
inputText,
+Integer.valueOf(pos), currentMode));
}
pos++;
}
diff --git
a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
index 37a24332df..399aa98508 100644
--- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
@@ -31,17 +31,18 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implement a map for the txt: and rnd: mod_rewrite capabilities.
*/
-public class RandomizedTextRewriteMap implements RewriteMap{
+public class RandomizedTextRewriteMap implements RewriteMap {
protected static final StringManager sm =
StringManager.getManager(RandomizedTextRewriteMap.class);
private static final Random random = new Random();
-private final Map map = new HashMap<>();
+private final Map map = new HashMap<>();
/**
* Create a map from a text file according to the mod_rewrite syntax.
+ *
* @param txtFilePath the text file path
- * @param useRandom if the map should produce random results
+ * @param useRandom if the map should produce random results
*/
public RandomizedTextRewriteMap(String txtFilePath, boolean useRandom) {
String line;
@@ -49,7 +50,7 @@
(tomcat) 01/02: Code clean-up - formatting. 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
commit 9ff474b753b497001d00abcd81324e6d06b9600d
Author: Mark Thomas
AuthorDate: Fri May 17 19:35:16 2024 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/util/CharsetMapper.java | 37 ++--
java/org/apache/catalina/util/ContextName.java | 32 ++-
.../catalina/util/CustomObjectInputStream.java | 59 +++---
java/org/apache/catalina/util/DOMWriter.java | 5 +-
.../org/apache/catalina/util/ErrorPageSupport.java | 10 +-
java/org/apache/catalina/util/IOTools.java | 36 ++--
java/org/apache/catalina/util/Introspection.java | 66 +++---
java/org/apache/catalina/util/LifecycleBase.java | 85 +++-
.../apache/catalina/util/LifecycleMBeanBase.java | 65 +++---
java/org/apache/catalina/util/ParameterMap.java| 33 ++-
java/org/apache/catalina/util/RequestUtil.java | 9 +-
java/org/apache/catalina/util/ResourceSet.java | 31 +--
java/org/apache/catalina/util/ServerInfo.java | 21 +-
java/org/apache/catalina/util/SessionConfig.java | 14 +-
.../catalina/util/SessionIdGeneratorBase.java | 97 -
.../catalina/util/StandardSessionIdGenerator.java | 4 +-
java/org/apache/catalina/util/Strftime.java| 232 ++---
java/org/apache/catalina/util/StringUtil.java | 10 +-
java/org/apache/catalina/util/TLSUtil.java | 10 +-
.../apache/catalina/util/TimeBucketCounter.java| 8 +-
java/org/apache/catalina/util/ToStringUtil.java| 6 +-
java/org/apache/catalina/util/TomcatCSS.java | 13 +-
java/org/apache/catalina/util/URLEncoder.java | 30 ++-
java/org/apache/catalina/util/XMLWriter.java | 122 ++-
24 files changed, 451 insertions(+), 584 deletions(-)
diff --git a/java/org/apache/catalina/util/CharsetMapper.java
b/java/org/apache/catalina/util/CharsetMapper.java
index c04d1c5e4e..5bb215e62f 100644
--- a/java/org/apache/catalina/util/CharsetMapper.java
+++ b/java/org/apache/catalina/util/CharsetMapper.java
@@ -25,14 +25,11 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-
/**
- * Utility class that attempts to map from a Locale to the corresponding
- * character set to be used for interpreting input text (or generating
- * output text) when the Content-Type header does not include one. You
- * can customize the behavior of this class by modifying the mapping data
- * it loads, or by subclassing it (to change the algorithm) and then using
- * your own version for a particular web application.
+ * Utility class that attempts to map from a Locale to the corresponding
character set to be used for interpreting input
+ * text (or generating output text) when the Content-Type header does not
include one. You can customize the behavior of
+ * this class by modifying the mapping data it loads, or by subclassing it (to
change the algorithm) and then using your
+ * own version for a particular web application.
*
* @author Craig R. McClanahan
*/
@@ -45,8 +42,7 @@ public class CharsetMapper {
/**
* Default properties resource name.
*/
-public static final String DEFAULT_RESOURCE =
- "/org/apache/catalina/util/CharsetMapperDefault.properties";
+public static final String DEFAULT_RESOURCE =
"/org/apache/catalina/util/CharsetMapperDefault.properties";
// -- Constructors
@@ -65,8 +61,7 @@ public class CharsetMapper {
*
* @param name Name of a properties resource to be loaded
*
- * @exception IllegalArgumentException if the specified properties
- * resource could not be loaded for any reason.
+ * @exception IllegalArgumentException if the specified properties
resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
if (JreCompat.isGraalAvailable()) {
@@ -86,8 +81,7 @@ public class CharsetMapper {
/**
- * The mapping properties that have been initialized from the specified or
- * default properties resource.
+ * The mapping properties that have been initialized from the specified or
default properties resource.
*/
private Properties map = new Properties();
@@ -96,11 +90,11 @@ public class CharsetMapper {
/**
- * Calculate the name of a character set to be assumed, given the specified
- * Locale and the absence of a character set specified as part of the
- * content type header.
+ * Calculate the name of a character set to be assumed, given the
specified Locale and the absence of a character
+ * set specified as part of the content type header.
*
* @param locale The locale for which to calculate a character set
+ *
* @return the charset name
*/
public Strin
(tomcat) branch 9.0.x updated: Code clean-up - formatting. 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 69372a3149 Code clean-up - formatting. No functional change
69372a3149 is described below
commit 69372a3149258d16cd5a0734094d291d1d35bafe
Author: Mark Thomas
AuthorDate: Mon May 20 08:18:22 2024 +0100
Code clean-up - formatting. No functional change
---
.../valves/rewrite/QuotedStringTokenizer.java | 48 ++---
.../valves/rewrite/RandomizedTextRewriteMap.java | 9 +-
.../catalina/valves/rewrite/ResolverImpl.java | 39 ++--
.../catalina/valves/rewrite/RewriteCond.java | 39 ++--
.../apache/catalina/valves/rewrite/RewriteMap.java | 25 +--
.../catalina/valves/rewrite/RewriteRule.java | 209 -
.../catalina/valves/rewrite/RewriteValve.java | 106 +--
.../catalina/valves/rewrite/Substitution.java | 59 +++---
8 files changed, 281 insertions(+), 253 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
index a6204fb077..0d39915c00 100644
--- a/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
+++ b/java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java
@@ -32,7 +32,11 @@ public class QuotedStringTokenizer {
private int returnedTokens = 0;
enum WordMode {
-SPACES, QUOTED, ESCAPED, SIMPLE, COMMENT
+SPACES,
+QUOTED,
+ESCAPED,
+SIMPLE,
+COMMENT
}
public QuotedStringTokenizer(String text) {
@@ -55,27 +59,27 @@ public class QuotedStringTokenizer {
while (pos < length) {
char currentChar = inputText.charAt(pos);
switch (currentMode) {
-case SPACES:
-currentMode = handleSpaces(currentToken, currentChar);
-break;
-case QUOTED:
-currentMode = handleQuoted(tokens, currentToken, currentChar);
-break;
-case ESCAPED:
-currentToken.append(currentChar);
-currentMode = WordMode.QUOTED;
-break;
-case SIMPLE:
-currentMode = handleSimple(tokens, currentToken, currentChar);
-break;
-case COMMENT:
-if (currentChar == '\r' || currentChar == '\n') {
-currentMode = WordMode.SPACES;
-}
-break;
-default:
-throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
-inputText, Integer.valueOf(pos), currentMode));
+case SPACES:
+currentMode = handleSpaces(currentToken, currentChar);
+break;
+case QUOTED:
+currentMode = handleQuoted(tokens, currentToken,
currentChar);
+break;
+case ESCAPED:
+currentToken.append(currentChar);
+currentMode = WordMode.QUOTED;
+break;
+case SIMPLE:
+currentMode = handleSimple(tokens, currentToken,
currentChar);
+break;
+case COMMENT:
+if (currentChar == '\r' || currentChar == '\n') {
+currentMode = WordMode.SPACES;
+}
+break;
+default:
+throw new
IllegalStateException(sm.getString("quotedStringTokenizer.tokenizeError",
inputText,
+Integer.valueOf(pos), currentMode));
}
pos++;
}
diff --git
a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
index 37a24332df..399aa98508 100644
--- a/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/RandomizedTextRewriteMap.java
@@ -31,17 +31,18 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Implement a map for the txt: and rnd: mod_rewrite capabilities.
*/
-public class RandomizedTextRewriteMap implements RewriteMap{
+public class RandomizedTextRewriteMap implements RewriteMap {
protected static final StringManager sm =
StringManager.getManager(RandomizedTextRewriteMap.class);
private static final Random random = new Random();
-private final Map map = new HashMap<>();
+private final Map map = new HashMap<>();
/**
* Create a map from a text file according to the mod_rewrite syntax.
+ *
* @param txtFilePath the text file path
- * @param useRandom if the map should produce random results
+ * @param useRandom
Re: (tomcat-native) branch main updated: Ensure local reference capacity is available for array allocations.
On 2024/05/17 14:37:32 Christopher Schultz wrote: > Michael, > > On 5/16/24 10:39, Michael Osipov wrote: > > Not for 1.3.x? > > Good question. I wasn't sure how much energy we are expecting to put > into tcnative 1.3.x. > > I have no problem back-porting this if its what the team wants. I expect 1.3.x to live as long as Tomcat 9.x will live. So it should be on par sans the APR stuff, of course. Everything else will cause us pain. M - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat-native) branch main updated: Ensure local reference capacity is available for array allocations.
Michael, On 5/20/24 06:37, Michael Osipov wrote: On 2024/05/17 14:37:32 Christopher Schultz wrote: Michael, On 5/16/24 10:39, Michael Osipov wrote: Not for 1.3.x? Good question. I wasn't sure how much energy we are expecting to put into tcnative 1.3.x. I have no problem back-porting this if its what the team wants. I expect 1.3.x to live as long as Tomcat 9.x will live. So it should be on par sans the APR stuff, of course. Everything else will cause us pain. Fair enough. I'll back-port, or approximate it if a direct back-port is not really possible. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
https://cwiki.apache.org/confluence/display/TOMCAT
Hi, I looked to the page, wondering how to get a "new comer" to the cwiki... That is not documented. What is the process? Create a Apache JIRA user and user it? If yes that should be in the wiki ;-) -- Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
