From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 5 Jun 2011 09:02:48 +0000 (+0000)
Subject: Start to align the parseHost method across the Http11 processors
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4171a04a4326d433f6247d700f6dd1e7b551e030;p=tomcat7.0

Start to align the parseHost method across the Http11 processors

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1132217 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index f4e984958..583e25613 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -829,7 +829,7 @@ public class Http11AprProcessor extends AbstractHttp11Processor {
     /**
      * Parse host.
      */
-    public void parseHost(MessageBytes valueMB) {
+    protected void parseHost(MessageBytes valueMB) {
 
         if (valueMB == null || valueMB.isNull()) {
             // HTTP/1.0
diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index 43be314fb..b717faf12 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -872,7 +872,7 @@ public class Http11NioProcessor extends AbstractHttp11Processor {
     /**
      * Parse host.
      */
-    public void parseHost(MessageBytes valueMB) {
+    protected void parseHost(MessageBytes valueMB) {
 
         if (valueMB == null || valueMB.isNull()) {
             // HTTP/1.0
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index dfd70eaa3..2ddbf65ed 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -796,7 +796,7 @@ public class Http11Processor extends AbstractHttp11Processor {
             // 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.