From 9972bf87b4f27d9c8f358ef8414ac1ab957a2f0f Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 19 Feb 2014 22:12:43 +0000 Subject: Imported Upstream version 3.2.8+dfsg --- .../AuthenticationHeaderValue.cs | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'mcs/class/System.Net.Http/System.Net.Http.Headers/AuthenticationHeaderValue.cs') diff --git a/mcs/class/System.Net.Http/System.Net.Http.Headers/AuthenticationHeaderValue.cs b/mcs/class/System.Net.Http/System.Net.Http.Headers/AuthenticationHeaderValue.cs index 33f87db8f0..7bb2496a94 100644 --- a/mcs/class/System.Net.Http/System.Net.Http.Headers/AuthenticationHeaderValue.cs +++ b/mcs/class/System.Net.Http/System.Net.Http.Headers/AuthenticationHeaderValue.cs @@ -26,6 +26,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Collections.Generic; + namespace System.Net.Http.Headers { public class AuthenticationHeaderValue : ICloneable @@ -85,8 +87,23 @@ namespace System.Net.Http.Headers public static bool TryParse (string input, out AuthenticationHeaderValue parsedValue) { var lexer = new Lexer (input); - var t = lexer.Scan (); - if (t != Token.Type.Token || !(lexer.PeekChar () == ' ' || lexer.PeekChar () == -1)) { + Token token; + if (TryParseElement (lexer, out parsedValue, out token) && token == Token.Type.End) + return true; + + parsedValue = null; + return false; + } + + internal static bool TryParse (string input, int minimalCount, out List result) + { + return CollectionParser.TryParse (input, minimalCount, TryParseElement, out result); + } + + static bool TryParseElement (Lexer lexer, out AuthenticationHeaderValue parsedValue, out Token t) + { + t = lexer.Scan (); + if (t != Token.Type.Token) { parsedValue = null; return false; } @@ -95,8 +112,11 @@ namespace System.Net.Http.Headers parsedValue.Scheme = lexer.GetStringValue (t); t = lexer.Scan (); - if (t != Token.Type.End) + if (t == Token.Type.Token) { + // TODO: Wrong with multi value parsing parsedValue.Parameter = lexer.GetRemainingStringValue (t.StartPosition); + t = new Token (Token.Type.End, 0, 0); + } return true; } -- cgit v1.2.3