Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.Web/System.Web/HttpCachePolicy.cs

@@ -229,15 +229,15 @@ namespace System.Web
 			last_modified_from_file_dependencies = true;
 		}
 
-		public void SetMaxAge (TimeSpan date)
+		public void SetMaxAge (TimeSpan delta)
 		{
-			if (date < TimeSpan.Zero)
-				throw new ArgumentOutOfRangeException ("date");
+			if (delta < TimeSpan.Zero)
+				throw new ArgumentOutOfRangeException ("delta");
 
-			if (HaveMaxAge && MaxAge < date)
+			if (HaveMaxAge && MaxAge < delta)
 				return;
 
-			MaxAge = date;
+			MaxAge = delta;
 			HaveMaxAge = true;
 		}
 

mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs

@@ -84,23 +84,23 @@ namespace System.Web
 			}
 		}
 
-		public bool this [ string param ] {
+		public bool this [ string header ] {
 			get {
-				if (param == null)
+				if (header == null)
 					throw new ArgumentNullException ();
 
-				return parms.Contains (param);
+				return parms.Contains (header);
 			}
 			set {
-				if (param == null)
+				if (header == null)
 					throw new ArgumentNullException ();
 
 				ignore_parms = false;
 				if (value)
-					if (!parms.Contains (param))
-						parms.Add (param, true);
+					if (!parms.Contains (header))
+						parms.Add (header, true);
 				else
-					parms.Remove (param);
+					parms.Remove (header);
 			}
 		}
 	}

mcs/class/System.Web/System.Web/HttpContext.cs

@@ -519,9 +519,9 @@ namespace System.Web
 			return GetLocalObjectFromFactory (virtualPath, resourceKey, culture);
 		}
 
-		public object GetSection (string name)
+		public object GetSection (string sectionName)
 		{
-			return WebConfigurationManager.GetSection (name);
+			return WebConfigurationManager.GetSection (sectionName);
 		}
 
 		object IServiceProvider.GetService (Type service)

mcs/class/System.Web/System.Web/HttpContextWrapper.cs

@@ -166,14 +166,14 @@ namespace System.Web
 			return HttpContext.GetGlobalResourceObject (classKey, resourceKey, culture);
 		}
 
-		public override object GetLocalResourceObject (string overridePath, string resourceKey)
+		public override object GetLocalResourceObject (string virtualPath, string resourceKey)
 		{
-			return HttpContext.GetLocalResourceObject (overridePath, resourceKey);
+			return HttpContext.GetLocalResourceObject (virtualPath, resourceKey);
 		}
 
-		public override object GetLocalResourceObject (string overridePath, string resourceKey, CultureInfo culture)
+		public override object GetLocalResourceObject (string virtualPath, string resourceKey, CultureInfo culture)
 		{
-			return HttpContext.GetLocalResourceObject (overridePath, resourceKey, culture);
+			return HttpContext.GetLocalResourceObject (virtualPath, resourceKey, culture);
 		}
 
 		public override object GetSection (string sectionName)

mcs/class/System.Web/System.Web/HttpCookieCollection.cs

@@ -88,13 +88,13 @@ namespace System.Web
 			BaseClear ();
 		}
 
-		public void CopyTo (Array array, int index)
+		public void CopyTo (Array dest, int index)
 		{
 			/* XXX this is kind of gross and inefficient
 			 * since it makes a copy of the superclass's
 			 * list */
 			object[] values = BaseGetAllValues();
-			values.CopyTo (array, index);
+			values.CopyTo (dest, index);
 		}
 
 		public string GetKey (int index)

mcs/class/System.Web/System.Web/HttpFileCollection.cs

@@ -65,14 +65,14 @@ namespace System.Web {
 			return (HttpPostedFile)BaseGet (index);
 		}
 
-		public HttpPostedFile Get (string key)
+		public HttpPostedFile Get (string name)
 		{
-			return (HttpPostedFile)BaseGet (key);
+			return (HttpPostedFile)BaseGet (name);
 		}
 
-		public HttpPostedFile this [string key] {
+		public HttpPostedFile this [string name] {
 			get {
-				return Get (key);
+				return Get (name);
 			}
 		}
 

mcs/class/System.Web/System.Web/HttpModuleCollection.cs

@@ -65,14 +65,14 @@ namespace System.Web {
 			return (IHttpModule)BaseGet (index);
 		}
 
-		public IHttpModule Get (string key)
+		public IHttpModule Get (string name)
 		{
-			return (IHttpModule)BaseGet (key);
+			return (IHttpModule)BaseGet (name);
 		}
 
-		public IHttpModule this [string key] {
+		public IHttpModule this [string name] {
 			get {
-				return Get (key);
+				return Get (name);
 			}
 		}
 

mcs/class/System.Web/System.Web/HttpParseException.cs

@@ -81,9 +81,9 @@ namespace System.Web
 		}
 
 		[SecurityPermission (SecurityAction.Demand, SerializationFormatter = true)]
-		public override void GetObjectData (SerializationInfo info, StreamingContext ctx)
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
 		{
-			base.GetObjectData (info, ctx);
+			base.GetObjectData (info, context);
 			info.AddValue ("_virtualPath", virtualPath);
 			info.AddValue ("_parserErrors", errors);
 			info.AddValue ("_line", line);

mcs/class/System.Web/System.Web/HttpResponseWrapper.cs

@@ -235,9 +235,9 @@ namespace System.Web
 			w.AppendToLog (param);
 		}
 
-		public override string ApplyAppPathModifier (string overridePath)
+		public override string ApplyAppPathModifier (string virtualPath)
 		{
-			return w.ApplyAppPathModifier (overridePath);
+			return w.ApplyAppPathModifier (virtualPath);
 		}
 
 		public override void BinaryWrite (byte [] buffer)

mcs/class/System.Web/System.Web/HttpUtility.cs

@@ -112,34 +112,34 @@ namespace System.Web {
 				buf.Add ((byte)ch);
 		}
 		
-		public static string UrlDecode (string s, Encoding e)
+		public static string UrlDecode (string str, Encoding e)
 		{
-			if (null == s) 
+			if (null == str) 
 				return null;
 
-			if (s.IndexOf ('%') == -1 && s.IndexOf ('+') == -1)
-				return s;
+			if (str.IndexOf ('%') == -1 && str.IndexOf ('+') == -1)
+				return str;
 			
 			if (e == null)
 				e = Encoding.UTF8;
 
-			long len = s.Length;
+			long len = str.Length;
 			var bytes = new List <byte> ();
 			int xchar;
 			char ch;
 			
 			for (int i = 0; i < len; i++) {
-				ch = s [i];
-				if (ch == '%' && i + 2 < len && s [i + 1] != '%') {
-					if (s [i + 1] == 'u' && i + 5 < len) {
+				ch = str [i];
+				if (ch == '%' && i + 2 < len && str [i + 1] != '%') {
+					if (str [i + 1] == 'u' && i + 5 < len) {
 						// unicode hex sequence
-						xchar = GetChar (s, i + 2, 4);
+						xchar = GetChar (str, i + 2, 4);
 						if (xchar != -1) {
 							WriteCharBytes (bytes, (char)xchar, e);
 							i += 5;
 						} else
 							WriteCharBytes (bytes, '%', e);
-					} else if ((xchar = GetChar (s, i + 1, 2)) != -1) {
+					} else if ((xchar = GetChar (str, i + 1, 2)) != -1) {
 						WriteCharBytes (bytes, (char)xchar, e);
 						i += 2;
 					} else {
@@ -338,18 +338,18 @@ namespace System.Web {
 			return UrlEncode(str, Encoding.UTF8);
 		}
 	
-		public static string UrlEncode (string s, Encoding Enc) 
+		public static string UrlEncode (string str, Encoding e) 
 		{
-			if (s == null)
+			if (str == null)
 				return null;
 
-			if (s == String.Empty)
+			if (str == String.Empty)
 				return String.Empty;
 
 			bool needEncode = false;
-			int len = s.Length;
+			int len = str.Length;
 			for (int i = 0; i < len; i++) {
-				char c = s [i];
+				char c = str [i];
 				if ((c < '0') || (c < 'A' && c > '9') || (c > 'Z' && c < 'a') || (c > 'z')) {
 					if (HttpEncoder.NotEncoded (c))
 						continue;
@@ -360,11 +360,11 @@ namespace System.Web {
 			}
 
 			if (!needEncode)
-				return s;
+				return str;
 
 			// avoided GetByteCount call
-			byte [] bytes = new byte[Enc.GetMaxByteCount(s.Length)];
-			int realLen = Enc.GetBytes (s, 0, s.Length, bytes, 0);
+			byte [] bytes = new byte[e.GetMaxByteCount(str.Length)];
+			int realLen = e.GetBytes (str, 0, str.Length, bytes, 0);
 			return Encoding.ASCII.GetString (UrlEncodeToBytes (bytes, 0, realLen));
 		}
 	  
@@ -593,9 +593,9 @@ namespace System.Web {
 
 			return sb.ToString ();
 		}
-		public static string UrlPathEncode (string s)
+		public static string UrlPathEncode (string str)
 		{
-			return HttpEncoder.Current.UrlPathEncode (s);
+			return HttpEncoder.Current.UrlPathEncode (str);
 		}
 
 		public static NameValueCollection ParseQueryString (string query)

mcs/class/System.Web/System.Web/ParserErrorCollection.cs

@@ -40,9 +40,9 @@ namespace System.Web
 		{
 		}
 
-		public ParserErrorCollection (ParserError[] errors)
+		public ParserErrorCollection (ParserError[] value)
 		{
-			InnerList.AddRange (errors);
+			InnerList.AddRange (value);
 		}
 		
 		public ParserError this [int index]
@@ -51,44 +51,44 @@ namespace System.Web
 			set { InnerList[index] = value; }
 		}
 		
-		public int Add (ParserError error)
+		public int Add (ParserError value)
 		{
-			return List.Add (error);
+			return List.Add (value);
 		}
 		
-		public void AddRange (ParserErrorCollection collection)
+		public void AddRange (ParserErrorCollection value)
 		{
-			InnerList.AddRange (collection);
+			InnerList.AddRange (value);
 		}
 		
-		public void AddRange (ParserError[] errors)
+		public void AddRange (ParserError[] value)
 		{
-			InnerList.AddRange (errors);
+			InnerList.AddRange (value);
 		}
 		
-		public bool Contains (ParserError error)
+		public bool Contains (ParserError value)
 		{
-			return InnerList.Contains (error);
+			return InnerList.Contains (value);
 		}
 		
-		public void CopyTo (ParserError[] errors, int index)
+		public void CopyTo (ParserError[] array, int index)
 		{
-			List.CopyTo (errors, index);
+			List.CopyTo (array, index);
 		}
 		
-		public int IndexOf (ParserError error)
+		public int IndexOf (ParserError value)
 		{
-			return InnerList.IndexOf (error);
+			return InnerList.IndexOf (value);
 		}
 		
-		public void Insert (int index, ParserError error)
+		public void Insert (int index, ParserError value)
 		{
-			InnerList.Insert (index, error);
+			InnerList.Insert (index, value);
 		}
 		
-		public void Remove (ParserError error)
+		public void Remove (ParserError value)
 		{
-			InnerList.Remove (error);
+			InnerList.Remove (value);
 		}
 	}
 }

mcs/class/System.Web/System.Web/SiteMapNode.cs

@@ -81,9 +81,9 @@ namespace System.Web {
 			return new SiteMapHierarchicalDataSourceView (this);
 		}
 		
-		public virtual bool IsAccessibleToUser (System.Web.HttpContext ctx)
+		public virtual bool IsAccessibleToUser (System.Web.HttpContext context)
 		{
-			return provider.IsAccessibleToUser (ctx, this);
+			return provider.IsAccessibleToUser (context, this);
 		}
 		
 		public override string ToString()
@@ -297,9 +297,9 @@ namespace System.Web {
 			return node;
 		}
 				
-		public override bool Equals (object ob)
+		public override bool Equals (object obj)
 		{
-			SiteMapNode node = ob as SiteMapNode;
+			SiteMapNode node = obj as SiteMapNode;
 			if (node == null) return false;
 			
 			if (node.key != key ||

mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs

@@ -63,14 +63,14 @@ namespace System.Web
 			Add (value);
 		}
 		
-		public SiteMapNodeCollection (SiteMapNode[] values)
+		public SiteMapNodeCollection (SiteMapNode[] value)
 		{
-			AddRangeInternal (values);
+			AddRangeInternal (value);
 		}
 		
-		public SiteMapNodeCollection (SiteMapNodeCollection values)
+		public SiteMapNodeCollection (SiteMapNodeCollection value)
 		{
-			AddRangeInternal (values);
+			AddRangeInternal (value);
 		}
 		
 		internal static SiteMapNodeCollection EmptyCollection {

mcs/class/System.Web/System.Web/TraceContext.cs

@@ -58,9 +58,9 @@ namespace System.Web
 			remove { events.AddHandler (traceFinishedEvent, value); }
 		}
 
-		public TraceContext (HttpContext Context)
+		public TraceContext (HttpContext context)
 		{
-			_Context = Context;
+			_Context = context;
 		}
 
 		internal bool HaveTrace {
@@ -104,34 +104,34 @@ namespace System.Web
 			}
 		}
 
-		public void Warn(string msg)
+		public void Warn(string message)
 		{
-			Write (String.Empty, msg, null, true);
+			Write (String.Empty, message, null, true);
 		}
 
-		public void Warn(string category, string msg)
+		public void Warn(string category, string message)
 		{
-			Write (category, msg, null, true);
+			Write (category, message, null, true);
 		}
 
-		public void Warn (string category, string msg, Exception error)
+		public void Warn (string category, string message, Exception errorInfo)
 		{
-			Write (category, msg, error, true);
+			Write (category, message, errorInfo, true);
 		}
 
-		public void Write (string msg)
+		public void Write (string message)
 		{
-			Write (String.Empty, msg, null, false);
+			Write (String.Empty, message, null, false);
 		}
 
-		public void Write (string category, string msg)
+		public void Write (string category, string message)
 		{
-			Write (category, msg, null, false);
+			Write (category, message, null, false);
 		}
 
-		public void Write (string category, string msg, Exception error)
+		public void Write (string category, string message, Exception errorInfo)
 		{
-			Write (category, msg, error, false);
+			Write (category, message, errorInfo, false);
 		}
 
 		void Write (string category, string msg, Exception error, bool Warning)