Merge pull request #2098 from evincarofautumn/fix-gchandle-assert

[mono.git] / mcs / class / System.Web / System.Web / StaticFileHandler.cs

diff --git a/mcs/class/System.Web/System.Web/StaticFileHandler.cs b/mcs/class/System.Web/System.Web/StaticFileHandler.cs
index 3b0e0936c0879d980c40890521735d6717339b79..810f24c564439a5a3644839e418d5be541de8632 100644 (file)
--- a/mcs/class/System.Web/System.Web/StaticFileHandler.cs
+++ b/mcs/class/System.Web/System.Web/StaticFileHandler.cs
@@ -41,7 +41,7 @@ namespace System.Web
        {
                static bool ValidFileName (string fileName)
                {
-                       if (!HttpRuntime.RunningOnWindows)
+                       if (!RuntimeHelpers.RunningOnWindows)
                                return true;
 
                        if (fileName == null || fileName.Length == 0)
@@ -86,25 +86,9 @@ namespace System.Web
                                if (strHeader != null) {
                                        DateTime dtIfModifiedSince = DateTime.ParseExact (strHeader, "r", null);
                                        DateTime ftime;
-#if TARGET_JVM
-                                       try 
-                                       {
-                                               ftime = fi.LastWriteTime.ToUniversalTime ();
-                                       } 
-                                       catch (NotSupportedException) 
-                                       {
-                                               // The file is in a WAR, it might be modified with last redeploy.
-                                               try {
-                                                       ftime = (DateTime) AppDomain.CurrentDomain.GetData (".appStartTime");
-                                               }
-                                               catch {
-                                                       ftime = DateTime.MaxValue;
-                                               }
-                                       }
-#else
                                        ftime = fi.LastWriteTime.ToUniversalTime ();
-#endif
                                        if (ftime <= dtIfModifiedSince) {
+                                               response.ContentType = MimeTypes.GetMimeType (fileName);
                                                response.StatusCode = 304;
                                                return;
                                        }