mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.Net.Http/System.Net.Http.Headers/HeaderInfo.cs
View File

@@ -134,9 +134,11 @@ namespace System.Net.Http.Headers
this.HeaderKind = headerKind;
}
public static HeaderInfo CreateSingle<T> (string name, TryParseDelegate<T> parser, HttpHeaderKind headerKind)
public static HeaderInfo CreateSingle<T> (string name, TryParseDelegate<T> parser, HttpHeaderKind headerKind, Func<object, string> toString = null)
{
return new HeaderTypeInfo<T, object> (name, parser, headerKind);
return new HeaderTypeInfo<T, object> (name, parser, headerKind) {
CustomToString = toString
};
}
//
@@ -152,6 +154,10 @@ namespace System.Net.Http.Headers
return CreateCollection (headers, this);
}
public Func<object, string> CustomToString {
get; private set;
}
public virtual string Separator {
get {
// Needed for AllowsMany only

67
mcs/class/System.Net.Http/System.Net.Http.Headers/HttpHeaders.cs
View File

@@ -48,7 +48,7 @@ namespace System.Net.Http.Headers
public readonly Func<object, string> CustomToString;
public HeaderBucket (object parsed, Func<object, string> converter = null)
public HeaderBucket (object parsed, Func<object, string> converter)
{
this.Parsed = parsed;
this.CustomToString = converter;
@@ -104,18 +104,18 @@ namespace System.Net.Http.Headers
HeaderInfo.CreateSingle<byte[]> ("Content-MD5", Parser.MD5.TryParse, HttpHeaderKind.Content),
HeaderInfo.CreateSingle<ContentRangeHeaderValue> ("Content-Range", ContentRangeHeaderValue.TryParse, HttpHeaderKind.Content),
HeaderInfo.CreateSingle<MediaTypeHeaderValue> ("Content-Type", MediaTypeHeaderValue.TryParse, HttpHeaderKind.Content),
HeaderInfo.CreateSingle<DateTimeOffset> ("Date", Parser.DateTime.TryParse, HttpHeaderKind.Request | HttpHeaderKind.Response),
HeaderInfo.CreateSingle<DateTimeOffset> ("Date", Parser.DateTime.TryParse, HttpHeaderKind.Request | HttpHeaderKind.Response, Parser.DateTime.ToString),
HeaderInfo.CreateSingle<EntityTagHeaderValue> ("ETag", EntityTagHeaderValue.TryParse, HttpHeaderKind.Response),
HeaderInfo.CreateMulti<NameValueWithParametersHeaderValue> ("Expect", NameValueWithParametersHeaderValue.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<DateTimeOffset> ("Expires", Parser.DateTime.TryParse, HttpHeaderKind.Content),
HeaderInfo.CreateSingle<DateTimeOffset> ("Expires", Parser.DateTime.TryParse, HttpHeaderKind.Content, Parser.DateTime.ToString),
HeaderInfo.CreateSingle<string> ("From", Parser.EmailAddress.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<Uri> ("Host", Parser.Uri.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<string> ("Host", Parser.Host.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateMulti<EntityTagHeaderValue> ("If-Match", EntityTagHeaderValue.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<DateTimeOffset> ("If-Modified-Since", Parser.DateTime.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<DateTimeOffset> ("If-Modified-Since", Parser.DateTime.TryParse, HttpHeaderKind.Request, Parser.DateTime.ToString),
HeaderInfo.CreateMulti<EntityTagHeaderValue> ("If-None-Match", EntityTagHeaderValue.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<RangeConditionHeaderValue> ("If-Range", RangeConditionHeaderValue.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<DateTimeOffset> ("If-Unmodified-Since", Parser.DateTime.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateSingle<DateTimeOffset> ("Last-Modified", Parser.DateTime.TryParse, HttpHeaderKind.Content),
HeaderInfo.CreateSingle<DateTimeOffset> ("If-Unmodified-Since", Parser.DateTime.TryParse, HttpHeaderKind.Request, Parser.DateTime.ToString),
HeaderInfo.CreateSingle<DateTimeOffset> ("Last-Modified", Parser.DateTime.TryParse, HttpHeaderKind.Content, Parser.DateTime.ToString),
HeaderInfo.CreateSingle<Uri> ("Location", Parser.Uri.TryParse, HttpHeaderKind.Response),
HeaderInfo.CreateSingle<int> ("Max-Forwards", Parser.Int.TryParse, HttpHeaderKind.Request),
HeaderInfo.CreateMulti<NameValueHeaderValue> ("Pragma", NameValueHeaderValue.TryParsePragma, HttpHeaderKind.Request | HttpHeaderKind.Response),
@@ -198,18 +198,18 @@ namespace System.Net.Http.Headers
if (headerInfo.AllowsMany) {
if (bucket == null)
bucket = new HeaderBucket (headerInfo.CreateCollection (this));
bucket = new HeaderBucket (headerInfo.CreateCollection (this), headerInfo.CustomToString);
headerInfo.AddToCollection (bucket.Parsed, parsed_value);
} else {
if (bucket != null)
throw new FormatException ();
bucket = new HeaderBucket (parsed_value);
bucket = new HeaderBucket (parsed_value, headerInfo.CustomToString);
}
} else {
if (bucket == null)
bucket = new HeaderBucket (null);
bucket = new HeaderBucket (null, null);
bucket.Values.Add (value ?? string.Empty);
}
@@ -343,29 +343,40 @@ namespace System.Net.Http.Headers
return true;
}
internal static string GetSingleHeaderString (string key, IEnumerable<string> values)
{
string separator = ",";
HeaderInfo headerInfo;
if (known_headers.TryGetValue (key, out headerInfo) && headerInfo.AllowsMany)
separator = headerInfo.Separator;
var sb = new StringBuilder ();
bool first = true;
foreach (var v in values) {
if (!first) {
sb.Append (separator);
if (separator != " ")
sb.Append (" ");
}
sb.Append (v);
first = false;
}
// Return null for empty values list
if (first)
return null;
return sb.ToString ();
}
public override string ToString ()
{
var sb = new StringBuilder ();
foreach (var entry in this) {
sb.Append (entry.Key);
sb.Append (": ");
string separator = ",";
HeaderInfo headerInfo;
if (known_headers.TryGetValue (entry.Key, out headerInfo) && headerInfo.AllowsMany)
separator = headerInfo.Separator;
bool first = true;
foreach (var v in entry.Value) {
if (!first) {
sb.Append (separator);
sb.Append (" ");
}
sb.Append (v);
first = false;
}
sb.Append (GetSingleHeaderString (entry.Key, entry.Value));
sb.Append ("\r\n");
}
@@ -466,7 +477,7 @@ namespace System.Net.Http.Headers
if (!headers.TryGetValue (name, out value)) {
var hinfo = known_headers[name];
value = new HeaderBucket (new HttpHeaderValueCollection<T> (this, hinfo));
value = new HeaderBucket (new HttpHeaderValueCollection<T> (this, hinfo), hinfo.CustomToString);
headers.Add (name, value);
}

11
mcs/class/System.Net.Http/System.Net.Http.Headers/Parser.cs
View File

@@ -125,6 +125,17 @@ namespace System.Net.Http.Headers
}
}
public static class Host
{
public static bool TryParse (string input, out string result)
{
result = input;
System.Uri dummy;
return System.Uri.TryCreate ("http://u@" + input + "/", UriKind.Absolute, out dummy);
}
}
public static class Int
{
public static bool TryParse (string input, out int result)