Author: remm
Date: Mon Feb 16 15:58:00 2009
New Revision: 744951
URL: http://svn.apache.org/viewvc?rev=744951&view=rev
Log:
- Fix HTTP/1.0 handling.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=744951&r1=744950&r2=744951&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Feb 16 15:58:00 2009
@@ -159,11 +159,6 @@
+1: markt
-1:
-* Fix HTTP/1.0 handling in the new AJP connectors
- http://svn.apache.org/viewvc?rev=742962&view=rev
- +1: remm, jfclere, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46666
keepAliveTimeout should be used regardless of setting of disableUploadTimeout
http://svn.apache.org/viewvc?rev=744160&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=744951&r1=744950&r2=744951&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Mon
Feb 16 15:58:00 2009
@@ -839,9 +839,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/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=744951&r1=744950&r2=744951&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Feb
16 15:58:00 2009
@@ -845,9 +845,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=744951&r1=744950&r2=744951&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Feb 16 15:58:00 2009
@@ -329,6 +329,9 @@
<add>
Enable the thread pool limits to be modified via JMX. (markt)
</add>
+ <fix>
+ Fix HTTP/1.0 redirects handling with APR AJP connector. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
