Author: remy.maucherat(a)jboss.com Date: 2009-02-09 08:37:00 -0500 (Mon, 09 Feb 2009) New Revision: 922 Modified: trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java trunk/java/org/apache/coyote/ajp/AjpProcessor.java trunk/webapps/docs/changelog.xml Log: - HTTP/1.0 handling difference in the new AJP connectors. Modified: trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2009-02-04 14:38:37 UTC (rev 921) +++ trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 2009-02-09 13:37:00 UTC (rev 922) @@ -846,9 +846,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: trunk/java/org/apache/coyote/ajp/AjpProcessor.java =================================================================== --- trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2009-02-04 14:38:37 UTC (rev 921) +++ trunk/java/org/apache/coyote/ajp/AjpProcessor.java 2009-02-09 13:37:00 UTC (rev 922) @@ -851,9 +851,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: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-02-04 14:38:37 UTC (rev 921) +++ trunk/webapps/docs/changelog.xml 2009-02-09 13:37:00 UTC (rev 922) @@ -58,6 +58,9 @@ </subsection> <subsection name="Coyote"> <changelog> + <fix> + HTTP/1.0 handling differed from the old org.apache.jk connector. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">