using System;
using System.Collections;
+using System.Collections.Generic;
using System.Collections.Specialized;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
namespace System.Net
{
+#if MOONLIGHT
+ internal class WebHeaderCollection : NameValueCollection, ISerializable {
+#else
[Serializable]
[ComVisible(true)]
- public class WebHeaderCollection : NameValueCollection, ISerializable
- {
+ public class WebHeaderCollection : NameValueCollection, ISerializable {
+#endif
private static readonly Hashtable restricted;
private static readonly Hashtable multiValue;
+ static readonly Dictionary<string, bool> restricted_response;
private bool internallyCreated = false;
// Static Initializer
{
// the list of restricted header names as defined
// by the ms.net spec
- restricted = new Hashtable (CaseInsensitiveHashCodeProvider.Default,
- CaseInsensitiveComparer.Default);
+ restricted = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+ CaseInsensitiveComparer.DefaultInvariant);
restricted.Add ("accept", true);
restricted.Add ("connection", true);
restricted.Add ("referer", true);
restricted.Add ("transfer-encoding", true);
restricted.Add ("user-agent", true);
-
+ restricted.Add ("proxy-connection", true);
+
+ //
+ restricted_response = new Dictionary<string, bool> (StringComparer.InvariantCultureIgnoreCase);
+ restricted_response.Add ("Content-Length", true);
+ restricted_response.Add ("Transfer-Encoding", true);
+ restricted_response.Add ("WWW-Authenticate", true);
+
// see par 14 of RFC 2068 to see which header names
// accept multiple values each separated by a comma
- multiValue = new Hashtable (CaseInsensitiveHashCodeProvider.Default,
- CaseInsensitiveComparer.Default);
+ multiValue = new Hashtable (CaseInsensitiveHashCodeProvider.DefaultInvariant,
+ CaseInsensitiveComparer.DefaultInvariant);
multiValue.Add ("accept", true);
multiValue.Add ("accept-charset", true);
multiValue.Add ("vary", true);
multiValue.Add ("via", true);
multiValue.Add ("warning", true);
+ multiValue.Add ("www-authenticate", true);
// Extra
multiValue.Add ("set-cookie", true);
protected WebHeaderCollection (SerializationInfo serializationInfo,
StreamingContext streamingContext)
{
- int count = serializationInfo.GetInt32("Count");
- for (int i = 0; i < count; i++)
- this.Add (serializationInfo.GetString (i.ToString ()),
- serializationInfo.GetString ((count + i).ToString ()));
+ int count;
+
+ try {
+ count = serializationInfo.GetInt32("Count");
+ for (int i = 0; i < count; i++)
+ this.Add (serializationInfo.GetString (i.ToString ()),
+ serializationInfo.GetString ((count + i).ToString ()));
+ } catch (SerializationException){
+ count = serializationInfo.GetInt32("count");
+ for (int i = 0; i < count; i++)
+ this.Add (serializationInfo.GetString ("k" + i),
+ serializationInfo.GetString ("v" + i));
+ }
+
}
internal WebHeaderCollection (bool internallyCreated)
return values;
}
+ public override string[] GetValues (int index)
+ {
+ string[] values = base.GetValues (index);
+ if (values == null || values.Length == 0) {
+ return(null);
+ }
+
+ return(values);
+ }
+
/* Now i wonder why this is here...
static string [] GetMultipleValues (string [] values)
{
if (headerName == "") // MS throw nullexception here!
throw new ArgumentException ("empty string", "headerName");
+ if (!IsHeaderName (headerName))
+ throw new ArgumentException ("Invalid character in header");
+
+ return restricted.ContainsKey (headerName);
+ }
+
+ public static bool IsRestricted (string headerName, bool response)
+ {
+ if (String.IsNullOrEmpty (headerName))
+ throw new ArgumentNullException ("headerName");
+
+ if (!IsHeaderName (headerName))
+ throw new ArgumentException ("Invalid character in header");
+
+
+ if (response)
+ return restricted_response.ContainsKey (headerName);
return restricted.ContainsKey (headerName);
}
return sb.Append("\r\n").ToString();
}
-
+#if !TARGET_JVM
void ISerializable.GetObjectData (SerializationInfo serializationInfo,
StreamingContext streamingContext)
+ {
+ GetObjectData (serializationInfo, streamingContext);
+ }
+#endif
+ public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
{
int count = base.Count;
serializationInfo.AddValue ("Count", count);
}
}
-#if NET_2_0
+ public override string[] AllKeys
+ {
+ get {
+ return(base.AllKeys);
+ }
+ }
+
+ public override int Count
+ {
+ get {
+ return(base.Count);
+ }
+ }
+
+ public override KeysCollection Keys
+ {
+ get {
+ return(base.Keys);
+ }
+ }
+
+ public override string Get (int index)
+ {
+ return(base.Get (index));
+ }
+
+ public override string Get (string name)
+ {
+ return(base.Get (name));
+ }
+
+ public override string GetKey (int index)
+ {
+ return(base.GetKey (index));
+ }
+
+ public void Add (HttpRequestHeader header, string value)
+ {
+ Add (RequestHeaderToString (header), value);
+ }
+
+ public void Remove (HttpRequestHeader header)
+ {
+ Remove (RequestHeaderToString (header));
+ }
+
+ public void Set (HttpRequestHeader header, string value)
+ {
+ Set (RequestHeaderToString (header), value);
+ }
+
+ public void Add (HttpResponseHeader header, string value)
+ {
+ Add (ResponseHeaderToString (header), value);
+ }
+
+ public void Remove (HttpResponseHeader header)
+ {
+ Remove (ResponseHeaderToString (header));
+ }
+
+ public void Set (HttpResponseHeader header, string value)
+ {
+ Set (ResponseHeaderToString (header), value);
+ }
+
string RequestHeaderToString (HttpRequestHeader value)
{
switch (value){
case HttpRequestHeader.CacheControl:
- return "cache-control";
+ return "Cache-Control";
case HttpRequestHeader.Connection:
- return "connection";
+ return "Connection";
case HttpRequestHeader.Date:
- return "date";
+ return "Date";
case HttpRequestHeader.KeepAlive:
- return "keep-alive";
+ return "Keep-Alive";
case HttpRequestHeader.Pragma:
- return "pragma";
+ return "Pragma";
case HttpRequestHeader.Trailer:
- return "trailer";
+ return "Trailer";
case HttpRequestHeader.TransferEncoding:
- return "transfer-encoding";
+ return "Transfer-Encoding";
case HttpRequestHeader.Upgrade:
- return "upgrade";
+ return "Upgrade";
case HttpRequestHeader.Via:
- return "via";
+ return "Via";
case HttpRequestHeader.Warning:
- return "warning";
+ return "Warning";
case HttpRequestHeader.Allow:
- return "allow";
+ return "Allow";
case HttpRequestHeader.ContentLength:
- return "content-length";
+ return "Content-Length";
case HttpRequestHeader.ContentType:
- return "content-type";
+ return "Content-Type";
case HttpRequestHeader.ContentEncoding:
- return "content-encoding";
+ return "Content-Encoding";
case HttpRequestHeader.ContentLanguage:
- return "content-language";
+ return "Content-Language";
case HttpRequestHeader.ContentLocation:
- return "content-location";
+ return "Content-Location";
case HttpRequestHeader.ContentMd5:
- return "content-md5";
+ return "Content-MD5";
case HttpRequestHeader.ContentRange:
- return "content-range";
+ return "Content-Range";
case HttpRequestHeader.Expires:
- return "expires";
+ return "Expires";
case HttpRequestHeader.LastModified:
- return "last-modified";
+ return "Last-Modified";
case HttpRequestHeader.Accept:
- return "accept";
+ return "Accept";
case HttpRequestHeader.AcceptCharset:
- return "accept-charset";
+ return "Accept-Charset";
case HttpRequestHeader.AcceptEncoding:
- return "accept-encoding";
+ return "Accept-Encoding";
case HttpRequestHeader.AcceptLanguage:
return "accept-language";
case HttpRequestHeader.Authorization:
- return "authorization";
+ return "Authorization";
case HttpRequestHeader.Cookie:
- return "cookie";
+ return "Cookie";
case HttpRequestHeader.Expect:
- return "expect";
+ return "Expect";
case HttpRequestHeader.From:
- return "from";
+ return "From";
case HttpRequestHeader.Host:
- return "host";
+ return "Host";
case HttpRequestHeader.IfMatch:
- return "if-match";
+ return "If-Match";
case HttpRequestHeader.IfModifiedSince:
- return "if-modified-since";
+ return "If-Modified-Since";
case HttpRequestHeader.IfNoneMatch:
- return "if-none-match";
+ return "If-None-Match";
case HttpRequestHeader.IfRange:
- return "if-range";
+ return "If-Range";
case HttpRequestHeader.IfUnmodifiedSince:
- return "if-unmodified-since";
+ return "If-Unmodified-Since";
case HttpRequestHeader.MaxForwards:
- return "max-forwards";
+ return "Max-Forwards";
case HttpRequestHeader.ProxyAuthorization:
- return "proxy-authorization";
+ return "Proxy-Authorization";
case HttpRequestHeader.Referer:
- return "referer";
+ return "Referer";
case HttpRequestHeader.Range:
- return "range";
+ return "Range";
case HttpRequestHeader.Te:
- return "te";
+ return "TE";
case HttpRequestHeader.Translate:
- return "translate";
+ return "Translate";
case HttpRequestHeader.UserAgent:
- return "user-agent";
+ return "User-Agent";
default:
throw new InvalidOperationException ();
}
}
+
public string this[HttpRequestHeader hrh]
{
get {
{
switch (value){
case HttpResponseHeader.CacheControl:
- return "cache-control";
+ return "Cache-Control";
case HttpResponseHeader.Connection:
- return "connection";
+ return "Connection";
case HttpResponseHeader.Date:
- return "date";
+ return "Date";
case HttpResponseHeader.KeepAlive:
- return "keep-alive";
+ return "Keep-Alive";
case HttpResponseHeader.Pragma:
- return "pragma";
+ return "Pragma";
case HttpResponseHeader.Trailer:
- return "trailer";
+ return "Trailer";
case HttpResponseHeader.TransferEncoding:
- return "transfer-encoding";
+ return "Transfer-Encoding";
case HttpResponseHeader.Upgrade:
- return "upgrade";
+ return "Upgrade";
case HttpResponseHeader.Via:
- return "via";
+ return "Via";
case HttpResponseHeader.Warning:
- return "warning";
+ return "Warning";
case HttpResponseHeader.Allow:
- return "allow";
+ return "Allow";
case HttpResponseHeader.ContentLength:
- return "content-length";
+ return "Content-Length";
case HttpResponseHeader.ContentType:
- return "content-type";
+ return "Content-Type";
case HttpResponseHeader.ContentEncoding:
- return "content-encoding";
+ return "Content-Encoding";
case HttpResponseHeader.ContentLanguage:
- return "content-language";
+ return "Content-Language";
case HttpResponseHeader.ContentLocation:
- return "content-location";
+ return "Content-Location";
case HttpResponseHeader.ContentMd5:
- return "content-md5";
+ return "Content-MD5";
case HttpResponseHeader.ContentRange:
- return "content-range";
+ return "Content-Range";
case HttpResponseHeader.Expires:
- return "expires";
+ return "Expires";
case HttpResponseHeader.LastModified:
- return "last-modified";
+ return "Last-Modified";
case HttpResponseHeader.AcceptRanges:
- return "accept-ranges";
+ return "Accept-Ranges";
case HttpResponseHeader.Age:
- return "age";
+ return "Age";
case HttpResponseHeader.ETag:
- return "etag";
+ return "ETag";
case HttpResponseHeader.Location:
- return "location";
+ return "Location";
case HttpResponseHeader.ProxyAuthenticate:
- return "proxy-authenticate";
+ return "Proxy-Authenticate";
case HttpResponseHeader.RetryAfter:
- return "RetryAfter";
+ return "Retry-After";
case HttpResponseHeader.Server:
- return "server";
+ return "Server";
case HttpResponseHeader.SetCookie:
- return "set-cookie";
+ return "Set-Cookie";
case HttpResponseHeader.Vary:
- return "vary";
+ return "Vary";
case HttpResponseHeader.WwwAuthenticate:
- return "www-authenticate";
+ return "WWW-Authenticate";
default:
throw new InvalidOperationException ();
}
Add (ResponseHeaderToString (hrh), value);
}
}
-#endif
+
+ public override void Clear ()
+ {
+ base.Clear ();
+ }
+
+
+ public override IEnumerator GetEnumerator ()
+ {
+ return(base.GetEnumerator ());
+ }
// Internal Methods
internal static bool IsHeaderName (string name)
{
- // token = 1*<any CHAR except CTLs or tspecials>
- // tspecials = "(" | ")" | "<" | ">" | "@"
- // | "," | ";" | ":" | "\" | <">
- // | "/" | "[" | "]" | "?" | "="
- // | "{" | "}" | SP | HT
-
if (name == null || name.Length == 0)
return false;
int len = name.Length;
for (int i = 0; i < len; i++) {
char c = name [i];
- if (c < 0x20 || c >= 0x7f)
+ if (c > 126 || !allowed_chars [(int) c])
return false;
}
- return name.IndexOfAny (tspecials) == -1;
+ return true;
}
- private static char [] tspecials =
- new char [] {'(', ')', '<', '>', '@',
- ',', ';', ':', '\\', '"',
- '/', '[', ']', '?', '=',
- '{', '}', ' ', '\t'};
-
+ static bool [] allowed_chars = new bool [126] {
+ false, false, false, false, false, false, false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false, false, false, false, false, false, false, false, false,
+ false, false, false, false, false, true, false, true, true, true, true, false, false, false, true,
+ true, false, true, true, false, true, true, true, true, true, true, true, true, true, true, false,
+ false, false, false, false, false, false, true, true, true, true, true, true, true, true, true,
+ true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+ false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true,
+ true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+ false, true, false
+ };
}
}
+