nacho       02/04/12 10:44:38

  Modified:    src/share/org/apache/tomcat/modules/server
                        Http10Interceptor.java
  Log:
  * Fix: for parse host header was giving the socket port when a host header was 
present without one
  
  Revision  Changes    Path
  1.34      +7 -2      
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java
  
  Index: Http10Interceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10Interceptor.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Http10Interceptor.java    8 Feb 2002 12:43:58 -0000       1.33
  +++ Http10Interceptor.java    12 Apr 2002 17:44:38 -0000      1.34
  @@ -386,7 +386,11 @@
   
       protected void parseHostHeader() {
        MessageBytes hH=getMimeHeaders().getValue("host");
  -        serverPort = socket.getLocalPort();
  +        if (sslSupport != null){
  +            serverPort = 443;
  +        } else {
  +            serverPort = 80;
  +        }           
        if (hH != null) {
            // XXX use MessageBytes
            String hostHeader = hH.toString();
  @@ -399,8 +403,9 @@
                   }catch(NumberFormatException  nfe){
                   }
            }else serverNameMB.setString( hostHeader);
  -        return;
  +            return;
        }
  +        serverPort = socket.getLocalPort();
        if( localHost != null ) {
            serverNameMB.setString( localHost );
        }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to