You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/14 11:06:40 UTC
svn commit: r1774189 -
/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Author: markt
Date: Wed Dec 14 11:06:40 2016
New Revision: 1774189
URL: http://svn.apache.org/viewvc?rev=1774189&view=rev
Log:
Replace references to endpoint with references to protocol where a
straight swap is available.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1774189&r1=1774188&r2=1774189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Dec 14 11:06:40 2016
@@ -320,12 +320,10 @@ public class AjpProcessor extends Abstra
// Setting up the socket
this.socketWrapper = socket;
- int connectionTimeout = endpoint.getConnectionTimeout();
boolean cping = false;
-
boolean keptAlive = false;
- while (!getErrorState().isError() && !endpoint.isPaused()) {
+ while (!getErrorState().isError() && !protocol.isPaused()) {
// Parsing the request header
try {
// Get first message of the request
@@ -335,13 +333,13 @@ public class AjpProcessor extends Abstra
// Processing the request so make sure the connection rather
// than keep-alive timeout is used
- socketWrapper.setReadTimeout(connectionTimeout);
+ socketWrapper.setReadTimeout(protocol.getConnectionTimeout());
// Check message type, process right away and break if
// not regular request processing
int type = requestHeaderMessage.getByte();
if (type == Constants.JK_AJP13_CPING_REQUEST) {
- if (endpoint.isPaused()) {
+ if (protocol.isPaused()) {
recycle();
break;
}
@@ -392,7 +390,7 @@ public class AjpProcessor extends Abstra
}
}
- if (!getErrorState().isError() && !cping && endpoint.isPaused()) {
+ if (!getErrorState().isError() && !cping && protocol.isPaused()) {
// 503 - Service unavailable
response.setStatus(503);
setErrorState(ErrorState.CLOSE_CLEAN, null);
@@ -451,7 +449,7 @@ public class AjpProcessor extends Abstra
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
- if (getErrorState().isError() || endpoint.isPaused()) {
+ if (getErrorState().isError() || protocol.isPaused()) {
return SocketState.CLOSED;
} else {
if (isAsync()) {
@@ -649,7 +647,7 @@ public class AjpProcessor extends Abstra
MimeHeaders headers = request.getMimeHeaders();
// Set this every time in case limit has been changed via JMX
- headers.setLimit(endpoint.getMaxHeaderCount());
+ headers.setLimit(protocol.getMaxHeaderCount());
boolean contentLengthSet = false;
int hCount = requestHeaderMessage.getInt();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org