Author: markt
Date: Wed Jan 5 07:50:11 2011
New Revision: 1055341
URL: http://svn.apache.org/viewvc?rev=1055341&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Constants.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
Jan 5 07:50:11 2011
@@ -61,9 +61,6 @@ public abstract class AbstractHttp11Proc
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
- protected static boolean isSecurityEnabled =
- org.apache.coyote.Constants.IS_SECURITY_ENABLED;
-
/*
* Tracks how many internal filters are in the filter library so they
* are skipped when looking for pluggable filters.
@@ -360,14 +357,6 @@ public abstract class AbstractHttp11Proc
/**
- * Return the list of compressable mime-types.
- */
- public String[] findCompressableMimeTypes() {
- return (compressableMimeTypes);
- }
-
-
- /**
* Return compression level.
*/
public String getCompression() {
@@ -490,19 +479,6 @@ public abstract class AbstractHttp11Proc
/**
- * Return the list of restricted user agents.
- */
- public String[] findRestrictedUserAgents() {
- String[] sarr = new String [restrictedUserAgents.length];
-
- for (int i = 0; i < restrictedUserAgents.length; i++)
- sarr[i] = restrictedUserAgents[i].toString();
-
- return (sarr);
- }
-
-
- /**
* Set the maximum number of Keep-Alive requests to honor.
* This is to safeguard from DoS attacks. Setting to a negative
* value disables the check.
@@ -796,30 +772,6 @@ public abstract class AbstractHttp11Proc
/**
- * Add input or output filter.
- *
- * @param className class name of the filter
- */
- protected void addFilter(String className) {
- try {
- Class<?> clazz = Class.forName(className);
- Object obj = clazz.newInstance();
- if (obj instanceof InputFilter) {
- getInputBuffer().addFilter((InputFilter) obj);
- } else if (obj instanceof OutputFilter) {
- getOutputBuffer().addFilter((OutputFilter) obj);
- } else {
- getLog().warn(sm.getString("http11processor.filter.unknown",
- className));
- }
- } catch (Exception e) {
- getLog().error(sm.getString(
- "http11processor.filter.error", className), e);
- }
- }
-
-
- /**
* Add an input filter to the current request.
*
* @return false if the encoding was not found (which would mean it is
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Wed Jan
5 07:50:11 2011
@@ -188,17 +188,6 @@ public abstract class AbstractInputBuffe
/**
- * Clear filters.
- */
- public void clearFilters() {
-
- filterLibrary = new InputFilter[0];
- lastActiveFilter = -1;
-
- }
-
-
- /**
* Add an input filter to the filter library.
*/
public void addActiveFilter(InputFilter filter) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Wed
Jan 5 07:50:11 2011
@@ -28,7 +28,6 @@ import org.apache.tomcat.util.buf.ByteCh
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.HttpMessages;
-import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.res.StringManager;
public abstract class AbstractOutputBuffer implements OutputBuffer{
@@ -43,12 +42,6 @@ public abstract class AbstractOutputBuff
/**
- * Headers of the associated request.
- */
- protected MimeHeaders headers;
-
-
- /**
* Committed flag.
*/
protected boolean committed;
@@ -142,17 +135,6 @@ public abstract class AbstractOutputBuff
/**
- * Clear filters.
- */
- public void clearFilters() {
-
- filterLibrary = new OutputFilter[0];
- lastActiveFilter = -1;
-
- }
-
-
- /**
* Add an output filter to the filter library.
*/
public void addActiveFilter(OutputFilter filter) {
@@ -403,42 +385,6 @@ public abstract class AbstractOutputBuff
/**
- * Send a header.
- *
- * @param name Header name
- * @param value Header value
- */
- public void sendHeader(ByteChunk name, ByteChunk value) {
-
- write(name);
- buf[pos++] = Constants.COLON;
- buf[pos++] = Constants.SP;
- write(value);
- buf[pos++] = Constants.CR;
- buf[pos++] = Constants.LF;
-
- }
-
-
- /**
- * Send a header.
- *
- * @param name Header name
- * @param value Header value
- */
- public void sendHeader(String name, String value) {
-
- write(name);
- buf[pos++] = Constants.COLON;
- buf[pos++] = Constants.SP;
- write(value);
- buf[pos++] = Constants.CR;
- buf[pos++] = Constants.LF;
-
- }
-
-
- /**
* End the header block.
*/
public void endHeaders() {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Constants.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Constants.java Wed Jan 5
07:50:11 2011
@@ -38,8 +38,6 @@ public final class Constants {
public static final int DEFAULT_CONNECTION_LINGER = -1;
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
- public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000;
- public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
public static final boolean DEFAULT_TCP_NO_DELAY = true;
@@ -129,8 +127,6 @@ public final class Constants {
/* Various constant "strings" */
- public static final byte[] CRLF_BYTES = ByteChunk.convertToBytes(CRLF);
- public static final byte[] COLON_BYTES = ByteChunk.convertToBytes(": ");
public static final String CONNECTION = "Connection";
public static final String CLOSE = "close";
public static final byte[] CLOSE_BYTES =
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Wed
Jan 5 07:50:11 2011
@@ -35,27 +35,14 @@ import org.apache.tomcat.util.http.HttpM
public class InternalAprOutputBuffer extends AbstractOutputBuffer {
- // -------------------------------------------------------------- Constants
-
-
// ----------------------------------------------------------- Constructors
-
/**
* Default constructor.
*/
- public InternalAprOutputBuffer(Response response) {
- this(response, Constants.DEFAULT_HTTP_HEADER_BUFFER_SIZE);
- }
-
-
- /**
- * Alternate constructor.
- */
public InternalAprOutputBuffer(Response response, int headerBufferSize) {
this.response = response;
- headers = response.getMimeHeaders();
buf = new byte[headerBufferSize];
if (headerBufferSize < (8 * 1024)) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Wed Jan
5 07:50:11 2011
@@ -37,14 +37,6 @@ public class InternalInputBuffer extends
/**
* Default constructor.
*/
- public InternalInputBuffer(Request request) {
- this(request, Constants.DEFAULT_HTTP_HEADER_BUFFER_SIZE);
- }
-
-
- /**
- * Alternate constructor.
- */
public InternalInputBuffer(Request request, int headerBufferSize) {
this.request = request;
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Wed
Jan 5 07:50:11 2011
@@ -39,26 +39,14 @@ import org.apache.tomcat.util.net.NioSel
*/
public class InternalNioOutputBuffer extends AbstractOutputBuffer {
-
- // -------------------------------------------------------------- Constants
-
-
// ----------------------------------------------------------- Constructors
- /**
- * Default constructor.
- */
- public InternalNioOutputBuffer(Response response) {
- this(response, Constants.DEFAULT_HTTP_HEADER_BUFFER_SIZE);
- }
-
/**
- * Alternate constructor.
+ * Default constructor.
*/
public InternalNioOutputBuffer(Response response, int headerBufferSize) {
this.response = response;
- headers = response.getMimeHeaders();
buf = new byte[headerBufferSize];
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Wed
Jan 5 07:50:11 2011
@@ -32,28 +32,14 @@ import org.apache.tomcat.util.buf.ByteCh
public class InternalOutputBuffer extends AbstractOutputBuffer
implements ByteChunk.ByteOutputChannel {
- // -------------------------------------------------------------- Constants
-
-
// ----------------------------------------------------------- Constructors
-
/**
* Default constructor.
*/
- public InternalOutputBuffer(Response response) {
- this(response, Constants.DEFAULT_HTTP_HEADER_BUFFER_SIZE);
- }
-
-
- /**
- * Alternate constructor.
- */
public InternalOutputBuffer(Response response, int headerBufferSize) {
this.response = response;
-
- headers = response.getMimeHeaders();
buf = new byte[headerBufferSize];
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java?rev=1055341&r1=1055340&r2=1055341&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Wed Jan 5 07:50:11 2011
@@ -48,15 +48,6 @@ public class VoidOutputFilter implements
}
- // ----------------------------------------------------- Instance Variables
-
-
- /**
- * Next buffer in the pipeline.
- */
- protected OutputBuffer buffer;
-
-
// --------------------------------------------------- OutputBuffer Methods
@@ -93,7 +84,7 @@ public class VoidOutputFilter implements
*/
@Override
public void setBuffer(OutputBuffer buffer) {
- this.buffer = buffer;
+ // NO-OP
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
