Apache/httpcomponents-client
1
0
Fork 0
mirror of https://github.com/apache/httpcomponents-client.git synced 2025-02-28 05:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjusted auth, cookie to non-static parsing code

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@568037 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roland Weber 2007-08-21 09:27:57 +00:00
parent d815670db3
commit 1bbbd79a8c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java
View File

@ -38,7 +38,7 @@
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AUTH;
import org.apache.http.auth.MalformedChallengeException;
import org.apache.http.message.BasicHeaderElement;
import org.apache.http.message.BasicHeaderValueParser;
import org.apache.http.message.BufferedHeader;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.CharArrayBuffer;
@ -120,7 +120,7 @@ public void processChallenge(final Header header) throws MalformedChallengeExcep
if (!s.equalsIgnoreCase(getSchemeName())) {
throw new MalformedChallengeException("Invalid scheme identifier: " + s);
}
HeaderElement[] elements = BasicHeaderElement.parseAll(buffer, pos, buffer.length());
HeaderElement[] elements = BasicHeaderValueParser.DEFAULT.parseElements(buffer, pos, buffer.length());
if (elements.length == 0) {
throw new MalformedChallengeException("Authentication challenge is empty");
}

4
module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
View File

@ -37,7 +37,7 @@
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.cookie.SM;
import org.apache.http.message.BasicHeaderElement;
import org.apache.http.message.BasicHeaderValueParser;
import org.apache.http.message.BufferedHeader;
import org.apache.http.util.CharArrayBuffer;
@ -120,7 +120,7 @@ public Cookie[] parse(final Header header, final CookieOrigin origin)
}
HeaderElement[] elems = null;
if (isNetscapeCookie) {
elems = new HeaderElement[] { BasicHeaderElement.parse(headervalue) };
elems = new HeaderElement[] { BasicHeaderValueParser.parseHeaderElement(headervalue, null) };
} else {
elems = header.getElements();
}

4
module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
View File

@ -37,7 +37,7 @@
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.cookie.SM;
import org.apache.http.message.BasicHeaderElement;
import org.apache.http.message.BasicHeaderValueParser;
import org.apache.http.message.BufferedHeader;
import org.apache.http.util.CharArrayBuffer;
@ -105,7 +105,7 @@ public Cookie[] parse(final Header header, final CookieOrigin origin)
throw new IllegalArgumentException("Cookie origin may not be null");
}
String headervalue = header.getValue();
return parse(new HeaderElement[] { BasicHeaderElement.parse(headervalue) }, origin);
return parse(new HeaderElement[] { BasicHeaderValueParser.parseHeaderElement(headervalue, null) }, origin);
}
public Header[] formatCookies(final Cookie[] cookies) {

4
module-client/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java
View File

@ -45,7 +45,7 @@
import org.apache.http.auth.MalformedChallengeException;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.message.BasicHeader;
import org.apache.http.message.BasicHeaderElement;
import org.apache.http.message.BasicHeaderValueParser;
import org.apache.http.message.BasicHttpRequest;
/**
@ -305,7 +305,7 @@ private static Map parseAuthResponse(final Header authResponse) {
if (!s.startsWith("Digest ")) {
return null;
}
HeaderElement[] elements = BasicHeaderElement.parseAll(s.substring(7));
HeaderElement[] elements = BasicHeaderValueParser.parseElements(s.substring(7), null);
Map map = new HashMap(elements.length);
for (int i = 0; i < elements.length; i++) {
HeaderElement element = elements[i];