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 d918b679c0 Missed files in previous commit
d918b679c0 is described below
commit d918b679c0696b962230c9088edd7b145fc9137c
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Nov 8 20:23:06 2023 +0000
Missed files in previous commit
---
java/org/apache/catalina/connector/ClientAbortException.java | 2 ++
java/org/apache/catalina/connector/InputBuffer.java | 1 +
java/org/apache/catalina/connector/Request.java | 1 +
java/org/apache/catalina/core/ApplicationDispatcher.java | 2 +-
java/org/apache/catalina/core/StandardWrapperValve.java | 2 +-
java/org/apache/coyote/BadRequestException.java | 2 +-
6 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/connector/ClientAbortException.java
b/java/org/apache/catalina/connector/ClientAbortException.java
index aee20c1d67..0ee9edca38 100644
--- a/java/org/apache/catalina/connector/ClientAbortException.java
+++ b/java/org/apache/catalina/connector/ClientAbortException.java
@@ -16,6 +16,8 @@
*/
package org.apache.catalina.connector;
+import org.apache.coyote.BadRequestException;
+
/**
* Extend IOException to identify it as being caused by an abort of a request
by a remote client.
*
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index b124f587e7..a674a7183c 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -29,6 +29,7 @@ import jakarta.servlet.ReadListener;
import jakarta.servlet.RequestDispatcher;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.BadRequestException;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.B2CConverter;
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index a0df03b587..111599a7b3 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -86,6 +86,7 @@ import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.TLSUtil;
import org.apache.catalina.util.URLEncoder;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.BadRequestException;
import org.apache.coyote.UpgradeToken;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.juli.logging.Log;
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 5e49d45166..420286ad9b 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -38,11 +38,11 @@ import org.apache.catalina.AsyncDispatcher;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.connector.BadRequestException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.Response;
import org.apache.catalina.connector.ResponseFacade;
+import org.apache.coyote.BadRequestException;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index 81592f6982..9f59f6001d 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -31,10 +31,10 @@ import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.connector.BadRequestException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.BadRequestException;
import org.apache.coyote.CloseNowException;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.MessageBytes;
diff --git a/java/org/apache/coyote/BadRequestException.java
b/java/org/apache/coyote/BadRequestException.java
index 71a792d7fb..d02f1be6e6 100644
--- a/java/org/apache/coyote/BadRequestException.java
+++ b/java/org/apache/coyote/BadRequestException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.connector;
+package org.apache.coyote;
import java.io.IOException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
