Author: costin
Date: Sat Nov 19 20:45:01 2005
New Revision: 345716
URL: http://svn.apache.org/viewcvs?rev=345716&view=rev
Log:
Few minor cleanups ( imports, indentation ), add a parameter to
parseRequestLine to match the apr version, expose the thread pool ( for
standalone ).
Modified:
tomcat/sandbox/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/sandbox/java/org/apache/coyote/http11/Http11BaseProtocol.java
tomcat/sandbox/java/org/apache/coyote/http11/Http11Processor.java
tomcat/sandbox/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/sandbox/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/sandbox/java/org/apache/coyote/http11/InternalInputBuffer.java
Modified: tomcat/sandbox/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=345716&r1=345715&r2=345716&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/sandbox/java/org/apache/coyote/http11/Http11AprProcessor.java Sat
Nov 19 20:45:01 2005
@@ -62,7 +62,7 @@
*
* @author Remy Maucherat
*/
-public class Http11AprProcessor implements ActionHook {
+public class Http11AprProcessor extends Http11Processor implements ActionHook {
/**
Modified: tomcat/sandbox/java/org/apache/coyote/http11/Http11BaseProtocol.java
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/http11/Http11BaseProtocol.java?rev=345716&r1=345715&r2=345716&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/http11/Http11BaseProtocol.java
(original)
+++ tomcat/sandbox/java/org/apache/coyote/http11/Http11BaseProtocol.java Sat
Nov 19 20:45:01 2005
@@ -264,9 +264,17 @@
setAttribute("strategy", strategy);
}
- public String getStrategy() {
+ public String getStrategy() {
return ep.getStrategy();
- }
+ }
+
+ /** Access to the thread pool.
+ *
+ * @return tp the internal thread pool used by the protocol
+ */
+ public ThreadPool getThreadPool() {
+ return tp;
+ }
// -------------------- Tcp setup --------------------
Modified: tomcat/sandbox/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/http11/Http11Processor.java?rev=345716&r1=345715&r2=345716&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/sandbox/java/org/apache/coyote/http11/Http11Processor.java Sat Nov
19 20:45:01 2005
@@ -823,7 +823,7 @@
if( !disableUploadTimeout && keptAlive && soTimeout > 0 ) {
socket.setSoTimeout(soTimeout);
}
- inputBuffer.parseRequestLine();
+ inputBuffer.parseRequestLine(false);
request.setStartTime(System.currentTimeMillis());
thrA.setParam( threadPool, request.requestURI() );
keptAlive = true;
Modified:
tomcat/sandbox/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=345716&r1=345715&r2=345716&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/sandbox/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Sat Nov 19 20:45:01 2005
@@ -17,19 +17,15 @@
package org.apache.coyote.http11;
-import java.io.IOException;
import java.io.EOFException;
+import java.io.IOException;
import java.nio.ByteBuffer;
+import org.apache.coyote.InputBuffer;
+import org.apache.coyote.Request;
import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.jni.Status;
import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.res.StringManager;
-
-import org.apache.coyote.InputBuffer;
-import org.apache.coyote.Request;
/**
* Implementation of InputBuffer which provides HTTP request header parsing as
Modified:
tomcat/sandbox/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=345716&r1=345715&r2=345716&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/sandbox/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
Sat Nov 19 20:45:01 2005
@@ -19,17 +19,12 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.tomcat.jni.Socket;
-import org.apache.tomcat.util.buf.ByteChunk;
-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;
-
import org.apache.coyote.ActionCode;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
+import org.apache.tomcat.jni.Socket;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.http.HttpMessages;
/**
* Output buffer.
Modified: tomcat/sandbox/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=345716&r1=345715&r2=345716&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/sandbox/java/org/apache/coyote/http11/InternalInputBuffer.java Sat
Nov 19 20:45:01 2005
@@ -371,6 +371,10 @@
}
+ public boolean parseRequestLine()
+ throws IOException {
+ return parseRequestLine( false );
+ }
/**
* Read the request line. This function is meant to be used during the
@@ -381,7 +385,7 @@
* read operations, or if the given buffer is not big enough to accomodate
* the whole line.
*/
- public void parseRequestLine()
+ public boolean parseRequestLine(boolean dummy)
throws IOException {
int start = 0;
@@ -517,6 +521,8 @@
} else {
request.protocol().setString("");
}
+
+ return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
