You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ol...@apache.org on 2005/05/04 19:31:44 UTC
svn commit: r168150 -
/jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java
Author: olegk
Date: Wed May 4 10:31:44 2005
New Revision: 168150
URL: http://svn.apache.org/viewcvs?rev=168150&view=rev
Log:
PR #34721 (Virtual host setting does not apply when parsing and matching cookies)
Contributed by Oleg Kalnichevski
Reviewed by Ortwin Glück
Modified:
jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java
Modified: jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java?rev=168150&r1=168149&r2=168150&view=diff
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java (original)
+++ jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java Wed May 4 10:31:44 2005
@@ -1176,7 +1176,11 @@
}
CookieSpec matcher = getCookieSpec(state);
- Cookie[] cookies = matcher.match(conn.getHost(), conn.getPort(),
+ String host = this.params.getVirtualHost();
+ if (host == null) {
+ host = conn.getHost();
+ }
+ Cookie[] cookies = matcher.match(host, conn.getPort(),
getPath(), conn.isSecure(), state.getCookies());
if ((cookies != null) && (cookies.length > 0)) {
if (getParams().isParameterTrue(HttpMethodParams.SINGLE_COOKIE_HEADER)) {
@@ -1468,12 +1472,16 @@
}
CookieSpec parser = getCookieSpec(state);
+ String host = this.params.getVirtualHost();
+ if (host == null) {
+ host = conn.getHost();
+ }
for (int i = 0; i < headers.length; i++) {
Header header = headers[i];
Cookie[] cookies = null;
try {
cookies = parser.parse(
- conn.getHost(),
+ host,
conn.getPort(),
getPath(),
conn.isSecure(),
@@ -1490,7 +1498,7 @@
Cookie cookie = cookies[j];
try {
parser.validate(
- conn.getHost(),
+ host,
conn.getPort(),
getPath(),
conn.isSecure(),
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org