date:20090210

svn commit: r742913 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-02-10 Thread jfclere

Author: jfclere
Date: Tue Feb 10 09:34:34 2009
New Revision: 742913

URL: http://svn.apache.org/viewvc?rev=742913&view=rev
Log:
Add my vote.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=742913&r1=742912&r2=742913&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 10 09:34:34 2009
@@ -131,8 +131,8 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46564
   Make page encoding test case insensitive
-  +1: markt, remm
-  +0: funkman: Where's the patch?
+  http://svn.apache.org/viewvc?view=rev&revision=739176
+  +1: markt, remm, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46606
@@ -178,4 +178,4 @@
   disabled in the connector
   http://svn.apache.org/viewvc?rev=742714&view=rev
   +1: markt
-  -1: 
\ No newline at end of file
+  -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r742915 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jk/common/ChannelNioSocket.java java/org/apache/jk/common/ChannelSocket.java java/org/apache/jk/common/HandlerRequest.java

2009-02-10 Thread jfclere

Author: jfclere
Date: Tue Feb 10 09:40:19 2009
New Revision: 742915

URL: http://svn.apache.org/viewvc?rev=742915&view=rev
Log:
Make sure the 400 is returned to the browser. (like other connectors).

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=742915&r1=742914&r2=742915&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 10 09:40:19 2009
@@ -155,10 +155,6 @@
  Haven't checked what the other ones will do
   -1: 
 
-* Make sure the 400 is returned to the browser. (like other connectors).
-  http://people.apache.org/~jfclere/patches/patch400.1.txt
-  +1: jfclere, fhanik, remm
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38570
   When checking docBase against appBase, make sure we check for an exact match
   against the appBase

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java?rev=742915&r1=742914&r2=742915&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java Tue 
Feb 10 09:40:19 2009
@@ -56,6 +56,7 @@
 import org.apache.coyote.Request;
 import org.apache.coyote.RequestGroupInfo;
 import org.apache.coyote.RequestInfo;
+import org.apache.coyote.ActionCode;
 import org.apache.tomcat.util.threads.ThreadPool;
 import org.apache.tomcat.util.threads.ThreadPoolRunnable;
 
@@ -854,6 +855,7 @@
 status= invoke( recv, ep );
 if( status != JkHandler.OK ) {
 log.warn("processCallbacks status " + status );
+ep.action(ActionCode.ACTION_CLOSE, 
ep.getRequest().getResponse());
 return false;
 }
 synchronized(this) {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java?rev=742915&r1=742914&r2=742915&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java Tue Feb 
10 09:40:19 2009
@@ -45,6 +45,7 @@
 import org.apache.coyote.Request;
 import org.apache.coyote.RequestGroupInfo;
 import org.apache.coyote.RequestInfo;
+import org.apache.coyote.ActionCode;
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.threads.ThreadPool;
 import org.apache.tomcat.util.threads.ThreadPoolRunnable;
@@ -697,6 +698,7 @@
 status= this.invoke( recv, ep );
 if( status!= JkHandler.OK ) {
 log.warn("processCallbacks status " + status );
+ep.action(ActionCode.ACTION_CLOSE, 
ep.getRequest().getResponse());
 break;
 }
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java?rev=742915&r1=742914&r2=742915&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java Tue Feb 
10 09:40:19 2009
@@ -265,8 +265,16 @@
  ((Request)ep.getRequest()).unparsedURI());
 }
 } catch( Exception ex ) {
+/* If we are here it is because we have a bad header or 
something like that */
 log.error( "Error decoding request ", ex );
 msg.dump( "Incomming message");
+Response res=ep.getRequest().getResponse();
+if ( res==null ) {
+res=new Response();
+ep.getRequest().setResponse(res);
+}
+res.setMessage("Bad Request");
+res.setStatus(400);
 return ERROR;
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r742962 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java

2009-02-10 Thread remm

Author: remm
Date: Tue Feb 10 13:33:58 2009
New Revision: 742962

URL: http://svn.apache.org/viewvc?rev=742962&view=rev
Log:
- Fix apparent bad cut & paste from the HTTP connector for parseHost, and use 
the code from the org.apache.jk connector instead.

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=742962&r1=742961&r2=742962&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Tue Feb 10 
13:33:58 2009
@@ -848,9 +848,13 @@
 
 if (valueMB == null || (valueMB != null && valueMB.isNull()) ) {
 // HTTP/1.0
-// Default is what the socket tells us. Overriden if a host is
-// found/parsed
-request.setServerPort(endpoint.getPort());
+request.setServerPort(request.getLocalPort());
+try {
+request.serverName().duplicate(request.localName());
+} catch (IOException e) {
+response.setStatus(400);
+error = true;
+}
 return;
 }
 

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=742962&r1=742961&r2=742962&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Feb 10 
13:33:58 2009
@@ -854,9 +854,13 @@
 
 if (valueMB == null || (valueMB != null && valueMB.isNull()) ) {
 // HTTP/1.0
-// Default is what the socket tells us. Overriden if a host is
-// found/parsed
-request.setServerPort(endpoint.getPort());
+request.setServerPort(request.getLocalPort());
+try {
+request.serverName().duplicate(request.localName());
+} catch (IOException e) {
+response.setStatus(400);
+error = true;
+}
 return;
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r742978 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-02-10 Thread remm

Author: remm
Date: Tue Feb 10 14:20:17 2009
New Revision: 742978

URL: http://svn.apache.org/viewvc?rev=742978&view=rev
Log:
- Add patch.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=742978&r1=742977&r2=742978&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 10 14:20:17 2009
@@ -159,14 +159,14 @@
   When checking docBase against appBase, make sure we check for an exact match
   against the appBase
   http://svn.apache.org/viewvc?rev=742677&view=rev
-  +1: markt
+  +1: markt, remm
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39013
   When testing for invalid docBase, test for an exact match with the appBase
   dir
   http://svn.apache.org/viewvc?rev=742697&view=rev
-  +1: markt
+  +1: markt, remm
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39396
@@ -175,3 +175,8 @@
   http://svn.apache.org/viewvc?rev=742714&view=rev
   +1: markt
   -1: 
+
+* Fix HTTP/1.0 handling in the new AJP connectors
+  http://svn.apache.org/viewvc?rev=742962&view=rev
+  +1: remm
+  -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r743022 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-02-10 Thread jfclere

Author: jfclere
Date: Tue Feb 10 17:02:40 2009
New Revision: 743022

URL: http://svn.apache.org/viewvc?rev=743022&view=rev
Log:
Cast my vote.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=743022&r1=743021&r2=743022&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 10 17:02:40 2009
@@ -178,5 +178,5 @@
 
 * Fix HTTP/1.0 handling in the new AJP connectors
   http://svn.apache.org/viewvc?rev=742962&view=rev
-  +1: remm
+  +1: remm, jfclere
   -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 46571] read timeout while reading response

2009-02-10 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=46571


Scott Severtson  changed:

   What|Removed |Added

 CC||sc...@severtson.us




--- Comment #3 from Scott Severtson   2009-02-10 12:39:25 
PST ---
A similar but not identical case:

Solaris 10 Generic_138889-03 on x86 (occurs on both 32/64 bit hardware)
Tomcat 6.0.18
Tomcat Native 1.1.16
APR 1.3.3
Apache 2.2.11
Using mod_proxy_ajp and AjpAprProtocol

All tools compiled with GCC 3.4.3

mod_proxy_ajp times out waiting for tomcat to respond with:
The timeout specified has expired: ajp_ilink_receive() can't receive header

This occurs intermittently while loading a JSP consisting of:
 <%=System.currentTimeMillis()%>

I've proxied the AJP port, and can see the request being issued from
mod_proxy_ajp, but no response is generated. I've added an AccessLogValve, but
the requests that timeout are not logged.

Switching from AjpAprProtocol to AjpProtocol works around the problem, as
Tomcat Native is no longer in use.

Sounds like polling is broken on Solaris. 

I am available to assist anyone with investigation/debugging - please let me
know how I can help. 


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r742913 - /tomcat/tc6.0.x/trunk/STATUS.txt

svn commit: r742915 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jk/common/ChannelNioSocket.java java/org/apache/jk/common/ChannelSocket.java java/org/apache/jk/common/HandlerRequest.java

svn commit: r742962 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java

svn commit: r742978 - /tomcat/tc6.0.x/trunk/STATUS.txt

svn commit: r743022 - /tomcat/tc6.0.x/trunk/STATUS.txt

DO NOT REPLY [Bug 46571] read timeout while reading response

6 matches

Site Navigation

Mail list logo

Footer information