You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by mw...@apache.org on 2007/09/06 17:03:30 UTC
svn commit: r573289 - in
/mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec:
HttpDecoder.java HttpRequestEncoder.java
Author: mwebb
Date: Thu Sep 6 08:03:27 2007
New Revision: 573289
URL: http://svn.apache.org/viewvc?rev=573289&view=rev
Log:
applied patch for JIRA entried 433 and 434
Modified:
mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java
mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java
Modified: mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java?rev=573289&r1=573288&r2=573289&view=diff
==============================================================================
--- mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java (original)
+++ mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpDecoder.java Thu Sep 6 08:03:27 2007
@@ -243,6 +243,9 @@
cookie.setExpires( DateUtil.parseDate( nameValue[1] ) );
}
+ if (name.equalsIgnoreCase(COOKIE_DOMAIN)) {
+ cookie.setDomain(nameValue[1]);
+ }
}
return cookie;
Modified: mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java?rev=573289&r1=573288&r2=573289&view=diff
==============================================================================
--- mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java (original)
+++ mina/trunk/mina-filter-codec-http/src/main/java/org/apache/mina/http/codec/HttpRequestEncoder.java Thu Sep 6 08:03:27 2007
@@ -122,8 +122,11 @@
//This header is required for HTTP/1.1
buf.putString( "Host: ", encoder );
buf.putString( url.getHost(), encoder );
- buf.putString( ":", encoder );
- buf.putString( url.getPort() + "", encoder );
+ if ((url.getProtocol().equals("http") && url.getPort() != 80 && url.getPort() != -1) &&
+ (url.getProtocol().equals("https") && url.getPort() != 443 && url.getPort() != -1)) {
+ buf.putString(":", encoder);
+ buf.putString(url.getPort() + "", encoder);
+ }
buf.put( CRLF );
//Process any headers we have