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 330ad1e977 Align with 10.0.x
330ad1e977 is described below
commit 330ad1e977300ffc68ed8b92c86fb4aa92f73721
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Jan 15 17:14:27 2023 +0000
Align with 10.0.x
---
java/org/apache/coyote/AsyncStateMachine.java | 1 -
java/org/apache/coyote/RequestInfo.java | 20 ++++++++++----------
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +-
.../apache/coyote/http11/LocalStrings_fr.properties | 1 +
.../apache/coyote/http11/LocalStrings_ja.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/el/MethodExpressionImpl.java | 1 -
java/org/apache/jasper/JspCompilationContext.java | 6 ++----
java/org/apache/jasper/runtime/PageContextImpl.java | 6 ++----
java/org/apache/juli/ClassLoaderLogManager.java | 12 ++----------
10 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index 472a48b18e..fb9b2b11aa 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -481,7 +481,6 @@ class AsyncStateMachine {
sm.getString("asyncStateMachine.invalidAsyncState",
"asyncRun()", state));
}
-
}
diff --git a/java/org/apache/coyote/RequestInfo.java
b/java/org/apache/coyote/RequestInfo.java
index 9a6b7778b1..08b599b712 100644
--- a/java/org/apache/coyote/RequestInfo.java
+++ b/java/org/apache/coyote/RequestInfo.java
@@ -162,21 +162,21 @@ public class RequestInfo {
* statistic information.
*/
void updateCounters() {
- bytesReceived+=req.getBytesRead();
- bytesSent+=req.getResponse().getContentWritten();
+ bytesReceived += req.getBytesRead();
+ bytesSent += req.getResponse().getContentWritten();
requestCount++;
- if( req.getResponse().getStatus() >=400 ) {
+ if (req.getResponse().getStatus() >= 400) {
errorCount++;
}
- long t0=req.getStartTime();
- long t1=System.currentTimeMillis();
- long time=t1-t0;
+ long t0 = req.getStartTime();
+ long t1 = System.currentTimeMillis();
+ long time = t1 - t0;
this.lastRequestProcessingTime = time;
- processingTime+=time;
- if( maxTime < time ) {
- maxTime=time;
- maxRequestUri=req.requestURI().toString();
+ processingTime += time;
+ if (maxTime < time) {
+ maxTime = time;
+ maxRequestUri = req.requestURI().toString();
}
}
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 9bfbcdbc82..e822c29af9 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -204,7 +204,7 @@ public abstract class AbstractAjpProtocol<S> extends
AbstractProtocol<S> {
private int packetSize = Constants.MAX_PACKET_SIZE;
public int getPacketSize() { return packetSize; }
public void setPacketSize(int packetSize) {
- if(packetSize < Constants.MAX_PACKET_SIZE) {
+ if (packetSize < Constants.MAX_PACKET_SIZE) {
this.packetSize = Constants.MAX_PACKET_SIZE;
} else {
this.packetSize = packetSize;
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index bbf6464b8f..16453c4c91 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=La requête
contenait un en-têt
http11processor.request.prepare=Echec de préparation de la requête
http11processor.request.process=Erreur de traitement de la requête
http11processor.response.finish=Erreur en finissant la réponse
+http11processor.response.invalidHeader=L''en-tête de réponse HTTP [{0}] avec
la valeur [{1}] a été enlevé de la réponse car il est invalide
http11processor.sendfile.error=Erreur d'envoi des données avec sendfile, cela
peut être causé par des attributs de démarrage ou de fin incorrects dans la
requête
http11processor.socket.info=Exception pendant la requête d'information sur le
socket.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties
b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index 28b31127a2..c77d8069aa 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=リクエストの
content-lengt
http11processor.request.prepare=リクエスト準備中のエラー
http11processor.request.process=リクエスト処理中のエラー
http11processor.response.finish=レスポンス終了処理のエラー
+http11processor.response.invalidHeader=値 [{1}] を持つHTTPレスポンスヘッダ [{0}]
は、無効であるためレスポンスから削除されました
http11processor.sendfile.error=sendfileを使ってデータを送信中にエラーが発生しました。これは開始点または終了点の無効なリクエスト属性によって引き起こされる可能性があります。
http11processor.socket.info=ソケット情報を取得する際の例外
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 76acc967fe..176a16f35f 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -35,6 +35,7 @@ http11processor.request.nonNumericContentLength=请求包含一个具有非数
http11processor.request.prepare=准备请求时出错
http11processor.request.process=错误的处理请求
http11processor.response.finish=错误完成相应
+http11processor.response.invalidHeader=HTTP响应头信息[{0}] 值[{1}]，由于无效已从响应中移除
http11processor.sendfile.error=使用sendfile发送数据时出错。可能是由于起点/终点的请求属性无效引起的
http11processor.socket.info=获取socket信息异常
diff --git a/java/org/apache/el/MethodExpressionImpl.java
b/java/org/apache/el/MethodExpressionImpl.java
index 5164309ce4..df60b8c63b 100644
--- a/java/org/apache/el/MethodExpressionImpl.java
+++ b/java/org/apache/el/MethodExpressionImpl.java
@@ -326,5 +326,4 @@ public final class MethodExpressionImpl extends
MethodExpression implements
public boolean isParmetersProvided() {
return this.getNode().isParametersProvided();
}
-
}
diff --git a/java/org/apache/jasper/JspCompilationContext.java
b/java/org/apache/jasper/JspCompilationContext.java
index 2a00edd2c9..d8f926cb4c 100644
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -178,10 +178,8 @@ public class JspCompilationContext {
public ClassLoader getJspLoader() {
if( jspLoader == null ) {
- jspLoader = new JasperLoader
- (new URL[] {baseUrl},
- getClassLoader(),
- rctxt.getPermissionCollection());
+ jspLoader = new JasperLoader(new URL[] {baseUrl}, getClassLoader(),
+ rctxt.getPermissionCollection());
}
return jspLoader;
}
diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java
b/java/org/apache/jasper/runtime/PageContextImpl.java
index 06c1eade40..f66e6e55de 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -604,10 +604,8 @@ public class PageContextImpl extends PageContext {
request.setAttribute(PageContext.EXCEPTION, t);
request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,
Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
- request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI,
- ((HttpServletRequest) request).getRequestURI());
- request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,
- config.getServletName());
+ request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI,
((HttpServletRequest) request).getRequestURI());
+ request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,
config.getServletName());
try {
forward(errorPageURL);
} catch (IllegalStateException ise) {
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index 7ab5f4a3f4..18d500e21d 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -317,24 +317,16 @@ public class ClassLoaderLogManager extends LogManager {
}
@Override
- public void readConfiguration()
- throws IOException, SecurityException {
-
+ public void readConfiguration() throws IOException, SecurityException {
checkAccess();
-
readConfiguration(getClassLoader());
-
}
@Override
- public void readConfiguration(InputStream is)
- throws IOException, SecurityException {
-
+ public void readConfiguration(InputStream is) throws IOException,
SecurityException {
checkAccess();
reset();
-
readConfiguration(is, getClassLoader());
-
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
