Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850

mcs/class/System.Web/Makefile

@@ -225,8 +225,8 @@ TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs \
 	Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx
 
-RESX_DIST =  resources/TranslationResources.resx
-RESX_RES = $(RESX_DIST:.resx=.resources)
+RESOURCE_DEFS = \
+	TranslationResources,resources/TranslationResources.resx
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 NUNIT_APP_CODE_FILES = $(TEST_APP_CODE_FILES)
@@ -254,7 +254,7 @@ ifneq (plainweb/,$(intermediate))
 LIB_REFS += System.Web.Services plaindesign/System.Design
 LIB_MCS_FLAGS += -define:WEBSERVICES_DEP
 
-all-local: System.Web/UplevelHelper.cs resources/TranslationResources.resources 
+all-local: System.Web/UplevelHelper.cs 
 
 endif
 
@@ -272,7 +272,6 @@ EXTRA_DISTFILES = \
 	$(TEST_APP_CODE_FILES) \
 	$(TEST_APP_GLOBALRESOURCES_FILES) \
 	UplevelHelperDefinitions.xml \
-	$(RESX_DIST) \
 	SQLiteProviders_DatabaseSchema.sql \
 	$(shell find Test/standalone-runner-support/ -name "*.cs" -type f -printf "'%p' ") \
 	$(shell find Test/standalone-tests/ -name "*.cs" -type f -printf "'%p' " -o -name "*.cs.in" -type f -printf "'%p' ") \

mcs/class/System.Web/System.Web.Security/FormsAuthentication.cs

@@ -212,21 +212,18 @@ namespace System.Web.Security
 				strCookiePath = cookiePath;
 
 			DateTime now = DateTime.Now;
-			DateTime then;
-	            	if (createPersistentCookie)
-	                	then = now.AddMinutes(timeout);
-	            	else
-	                	then = DateTime.MinValue;
+			DateTime ticketExpiry = now.AddMinutes(timeout);
+	            	DateTime cookieExpiry = createPersistentCookie ? ticketExpiry : DateTime.MinValue;
 
 			FormsAuthenticationTicket ticket = new FormsAuthenticationTicket (1,
 											  userName,
 											  now,
-                                              createPersistentCookie?then:now.AddYears (50),
+											  ticketExpiry,
 											  createPersistentCookie,
 											  String.Empty,
 											  cookiePath);
 
-			HttpCookie cookie = new HttpCookie (cookieName, Encrypt (ticket), strCookiePath, then);
+			HttpCookie cookie = new HttpCookie (cookieName, Encrypt (ticket), strCookiePath, cookieExpiry);
 			if (requireSSL)
 				cookie.Secure = true;
 			if (!String.IsNullOrEmpty (cookie_domain))

mcs/class/System.Web/System.Web.dll.sources

@@ -1400,6 +1400,7 @@ ReferenceSources/SR.cs
 ../referencesource/System.Web/Hosting/IProcessHostSupportFunctions.cs
 ../referencesource/System.Web/Hosting/HTTP_COOKED_URL.cs
 ../referencesource/System.Web/Hosting/HostingEnvironmentException.cs
+../referencesource/System.Web/Util/Debug.cs
 ../referencesource/System.Web/Util/SynchronizationContextMode.cs
 ../referencesource/System.Web/Util/ISyncContextLock.cs
 ../referencesource/System.Web/Util/DoNotResetAttribute.cs

mcs/class/System.Web/System.Web/HttpCookie.cs

@@ -3,6 +3,7 @@
 //
 // Author:
 //	Chris Toshok (toshok@novell.com)
+//	Katharina Bogad (bogad@cs.tum.edu)
 //
 
 //
@@ -31,6 +32,7 @@
 using System.Text;
 using System.Collections.Specialized;
 using System.Security.Permissions;
+using System.Web.Configuration;
 
 namespace System.Web
 {
@@ -66,6 +68,17 @@ namespace System.Web
 			this.name = name;
 			values = new CookieNVC();
 			Value = "";
+
+			HttpCookiesSection cookieConfig = (HttpCookiesSection) WebConfigurationManager.GetSection ("system.web/httpCookies");
+
+			if(!string.IsNullOrWhiteSpace(cookieConfig.Domain))
+				domain = cookieConfig.Domain;
+
+			if(cookieConfig.HttpOnlyCookies)
+				flags |= CookieFlags.HttpOnly;
+
+			if(cookieConfig.RequireSSL)
+				flags |= CookieFlags.Secure;
 		}
 
 		public HttpCookie (string name, string value)

mcs/class/System.Web/Test/System.Web.Security/MachineKeyTest.cs

@@ -169,7 +169,6 @@ namespace MonoTests.System.Web.Security
 			}
 		}
 
-#if NET_4_5
 		[Test]
 		public void Protect ()
 		{
@@ -200,6 +199,5 @@ namespace MonoTests.System.Web.Security
 				MachineKey.Unprotect (encryptedBytes, oneUsage), 
 				"Single purpose working when multiple supplied");
 		}
-#endif
 	}
 }

mcs/class/System.Web/Test/System.Web.Security/MembershipPasswordAttributeTest.cs

@@ -1,4 +1,3 @@
-#if NET_4_5
 
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -137,4 +136,3 @@ namespace MonoTests.System.Web.Security {
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/System.Web/EventHandlerTaskAsyncHelperTest.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_5
 
 using System;
 using System.Threading.Tasks;
@@ -115,4 +114,3 @@ namespace MonoTests.System.Web
 	}
 }
 
-#endif

mcs/class/System.Web/Test/System.Web/HttpTaskAsyncHandlerTest.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_5
 
 using System;
 using System.IO;
@@ -129,4 +128,3 @@ namespace MonoTests.System.Web
 	}
 }
 
-#endif

mcs/class/System.Web/Test/System.Web/TaskAsyncResultTest.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_5
 
 using System;
 using System.Threading;
@@ -331,4 +330,3 @@ namespace MonoTests.System.Web
 	}
 }
 
-#endif