Author: markt
Date: Sun Jun 5 09:02:48 2011
New Revision: 1132217
URL: http://svn.apache.org/viewvc?rev=1132217&view=rev
Log:
Start to align the parseHost method across the Http11 processors
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1132217&r1=1132216&r2=1132217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sun Jun
5 09:02:48 2011
@@ -829,7 +829,7 @@ public class Http11AprProcessor extends
/**
* Parse host.
*/
- public void parseHost(MessageBytes valueMB) {
+ protected void parseHost(MessageBytes valueMB) {
if (valueMB == null || valueMB.isNull()) {
// HTTP/1.0
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1132217&r1=1132216&r2=1132217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sun Jun
5 09:02:48 2011
@@ -872,7 +872,7 @@ public class Http11NioProcessor extends
/**
* Parse host.
*/
- public void parseHost(MessageBytes valueMB) {
+ protected void parseHost(MessageBytes valueMB) {
if (valueMB == null || valueMB.isNull()) {
// HTTP/1.0
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1132217&r1=1132216&r2=1132217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sun Jun 5
09:02:48 2011
@@ -796,7 +796,7 @@ public class Http11Processor extends Abs
// HTTP/1.0
// Default is what the socket tells us. Overridden if a host is
// found/parsed
- request.setServerPort(socket.getSocket().getLocalPort());
+ request.setServerPort(endpoint.getPort());
InetAddress localAddress = socket.getSocket().getLocalAddress();
// Setting the socket-related fields. The adapter doesn't know
// about socket.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
