Author: markt
Date: Sun Jun 5 09:43:55 2011
New Revision: 1132356
URL: http://svn.apache.org/viewvc?rev=1132356&view=rev
Log:
Fully align parseHost
- remove unnecessary code from BIO
- improve comment for all
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=1132356&r1=1132355&r2=1132356&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:43:55 2011
@@ -833,8 +833,9 @@ public class Http11AprProcessor extends
if (valueMB == null || valueMB.isNull()) {
// HTTP/1.0
- // Default is what the socket tells us. Overridden if a host is
- // found/parsed
+ // If no host header, use the port info from the endpoint
+ // The host will be obtained lazily from the socket if required
+ // using ActionCode#REQ_LOCAL_NAME_ATTRIBUTE
request.setServerPort(endpoint.getPort());
return;
}
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=1132356&r1=1132355&r2=1132356&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:43:55 2011
@@ -876,8 +876,9 @@ public class Http11NioProcessor extends
if (valueMB == null || valueMB.isNull()) {
// HTTP/1.0
- // Default is what the socket tells us. Overridden if a host is
- // found/parsed
+ // If no host header, use the port info from the endpoint
+ // The host will be obtained lazily from the socket if required
+ // using ActionCode#REQ_LOCAL_NAME_ATTRIBUTE
request.setServerPort(endpoint.getPort());
return;
}
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=1132356&r1=1132355&r2=1132356&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:43:55 2011
@@ -794,13 +794,10 @@ public class Http11Processor extends Abs
if (valueMB == null || valueMB.isNull()) {
// HTTP/1.0
- // Default is what the socket tells us. Overridden if a host is
- // found/parsed
+ // If no host header, use the port info from the endpoint
+ // The host will be obtained lazily from the socket if required
+ // using ActionCode#REQ_LOCAL_NAME_ATTRIBUTE
request.setServerPort(endpoint.getPort());
- InetAddress localAddress = socket.getSocket().getLocalAddress();
- // Setting the socket-related fields. The adapter doesn't know
- // about socket.
- request.serverName().setString(localAddress.getHostName());
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
