remm 2005/07/30 15:22:58
Modified: jk/java/org/apache/coyote/ajp AjpAprProcessor.java
Log:
- Remove now uneeded code.
Revision Changes Path
1.16 +0 -84
jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Index: AjpAprProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AjpAprProcessor.java 30 Jul 2005 21:19:58 -0000 1.15
+++ AjpAprProcessor.java 30 Jul 2005 22:22:57 -0000 1.16
@@ -139,12 +139,6 @@
/**
- * Char version of the message header.
- */
- //protected char[] headerChar = new char[8*1024];
-
-
- /**
* Body message.
*/
protected AjpMessage bodyMessage = new AjpMessage();
@@ -169,54 +163,12 @@
/**
- * Is there an expectation ?
- */
- protected boolean expectation = false;
-
-
- /**
* Socket associated with the current connection.
*/
protected long socket;
/**
- * Remote Address associated with the current connection.
- */
- protected String remoteAddr = null;
-
-
- /**
- * Remote Host associated with the current connection.
- */
- protected String remoteHost = null;
-
-
- /**
- * Local Host associated with the current connection.
- */
- protected String localName = null;
-
-
- /**
- * Local port to which the socket is connected
- */
- protected int localPort = -1;
-
-
- /**
- * Remote port to which the socket is connected
- */
- protected int remotePort = -1;
-
-
- /**
- * The local Host address.
- */
- protected String localAddr = null;
-
-
- /**
* Host name (used to avoid useless B2C conversion on the host name).
*/
protected char[] hostNameC = new char[0];
@@ -382,13 +334,6 @@
thrA.setCurrentStage(endpoint, "parsing http request");
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
- // Set the remote address
- remoteAddr = null;
- remoteHost = null;
- localAddr = null;
- remotePort = -1;
- localPort = -1;
-
// Setting up the socket
this.socket = socket;
@@ -531,18 +476,6 @@
error = true;
}
- } else if (actionCode == ActionCode.ACTION_ACK) {
-
- // Acknowlege request
-
- // Send a 100 status back if it makes sense (response not
committed
- // yet, and client specified an expectation for 100-continue)
-
- if ((response.isCommitted()) || !expectation)
- return;
-
- // No expectations in AJP
-
} else if (actionCode == ActionCode.ACTION_CLIENT_FLUSH) {
if (!response.isCommitted()) {
@@ -576,16 +509,6 @@
error = true;
}
- } else if (actionCode == ActionCode.ACTION_RESET) {
-
- // Reset response
-
- // Note: This must be called before the response is committed
-
- } else if (actionCode == ActionCode.ACTION_CUSTOM) {
-
- // Do nothing
-
} else if (actionCode == ActionCode.ACTION_START) {
started = true;
@@ -826,13 +749,6 @@
new
Integer(requestHeaderMessage.getInt()));
break;
- // FIXME: no usage for secret attribute here
- /*
- case Constants.SC_A_SECRET :
- requestHeaderMessage.getBytes(tmpMB);
- break;
- */
-
case Constants.SC_A_STORED_METHOD:
requestHeaderMessage.getBytes(request.method());
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
