Author: fhanik
Date: Tue May 29 13:41:53 2007
New Revision: 542645
URL: http://svn.apache.org/viewvc?view=rev&rev=542645
Log:
Remove the non blocking handling of the request, doesn't work well with the new
non thread local processor handling
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?view=diff&rev=542645&r1=542644&r2=542645
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Tue May 29 13:41:53 2007
@@ -422,11 +422,11 @@
return false;
}
if (readTimeout == -1) {
- if (!fill(false,false)) //request line parsing
+ if (!fill(false,true)) //request line parsing
return false;
} else {
// Do a simple read with a short timeout
- if ( !readSocket(true, false) ) return false;
+ if ( !readSocket(true, true) ) return false;
}
}
@@ -441,7 +441,7 @@
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) //request line parsing
+ if (!fill(true,true)) //request line parsing
return false;
}
@@ -470,7 +470,7 @@
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) //request line parsing
+ if (!fill(true,true)) //request line parsing
return false;
}
@@ -514,7 +514,7 @@
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) //reques line parsing
+ if (!fill(true,true)) //reques line parsing
return false;
}
@@ -626,7 +626,7 @@
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) {//parse header
+ if (!fill(true,true)) {//parse header
headerParsePos = HeaderParsePosition.HEADER_START;
return HeaderParseStatus.NEED_MORE_DATA;
}
@@ -664,7 +664,7 @@
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) { //parse header
+ if (!fill(true,true)) { //parse header
return HeaderParseStatus.NEED_MORE_DATA;
}
}
@@ -704,7 +704,7 @@
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) {//parse header
+ if (!fill(true,true)) {//parse header
//HEADER_VALUE, should already be set
return HeaderParseStatus.NEED_MORE_DATA;
}
@@ -725,7 +725,7 @@
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) {//parse header
+ if (!fill(true,true)) {//parse header
//HEADER_VALUE
return HeaderParseStatus.NEED_MORE_DATA;
}
@@ -756,7 +756,7 @@
}
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) {//parse header
+ if (!fill(true,true)) {//parse header
//HEADER_MULTI_LINE
return HeaderParseStatus.NEED_MORE_DATA;
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java?view=diff&rev=542645&r1=542644&r2=542645
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
Tue May 29 13:41:53 2007
@@ -17,6 +17,7 @@
import org.apache.catalina.tribes.group.GroupChannel;
import junit.framework.TestCase;
+import org.apache.catalina.tribes.transport.ReceiverBase;
/**
* @author Filip Hanik
@@ -47,6 +48,12 @@
assertEquals(count,2);
channel.stop(channel.DEFAULT);
}
+
+ public void testScrap() throws Exception {
+ System.out.println(channel.getChannelReceiver().getClass());
+ ((ReceiverBase)channel.getChannelReceiver()).setMaxThreads(1);
+ }
+
public void testDoublePartialStart() throws Exception {
//try to double start the RX
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java?view=diff&rev=542645&r1=542644&r2=542645
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
Tue May 29 13:41:53 2007
@@ -51,6 +51,7 @@
threads = new Thread[channelCount];
for ( int i=0; i<channelCount; i++ ) {
channels[i] = new GroupChannel();
+
orderitcs[i] = new OrderInterceptor();
mangleitcs[i] = new MangleOrderInterceptor();
orderitcs[i].setExpire(Long.MAX_VALUE);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?view=diff&rev=542645&r1=542644&r2=542645
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Tue May 29 13:41:53 2007
@@ -699,7 +699,7 @@
Tomcat Version 3.x 4.x 5.x 6.x 6.x
5.5.x 6.x
Support Polling NO YES
YES
Polling Size N/A Unlimited - Restricted by mem
Unlimited
- Read HTTP Request Blocking Non Blocking
Blocking
+ Read HTTP Request Blocking Blocking
Blocking
Read HTTP Body Blocking Blocking
Blocking
Write HTTP Response Blocking Blocking
Blocking
SSL Support Java SSL Java SSL
OpenSSL
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
