Merge pull request #896 from echampet/webresource

[mono.git] / mcs / class / System.Web / System.Web.Handlers / AssemblyResourceLoader.cs

diff --git a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
index be1814d62ae393a55f90bdf7374417653f8e96ec..7f59b52e22b47f90653406803db3f8ef8acc6c08 100644 (file)
--- a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
+++ b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
@@ -79,7 +79,9 @@ namespace System.Web.Handlers
                                        if (!hashAlg.CanReuseTransform) {
                                                canReuseHashAlg = false;
                                                hashAlg = null;
+                                               return null;
                                        }
+                                       hashAlg.Key = MachineKeySectionUtils.GetValidationKey (mks);
                                }
 
                                if (hashAlg != null)
@@ -272,9 +274,7 @@ namespace System.Web.Handlers
                                debug = resourceName.EndsWith (".debug.js", StringComparison.OrdinalIgnoreCase);
                                string dbgTail = debug ? "d" : String.Empty;
                                lookupKey = resourceNameHash + (notifyScriptLoaded ? "t" : "f") + dbgTail;
-#if NET_3_5
                                CheckIfResourceIsCompositeScript (resourceName, ref includeTimeStamp);
-#endif
 #else
                                lookupKey = resourceNameHash;
 #endif
@@ -314,16 +314,12 @@ namespace System.Web.Handlers
                        extra = QueryParamSeparator + "n=" + (notifyScriptLoaded ? "t" : "f");
 #endif
 
-#if TARGET_JVM
-                       atime = QueryParamSeparator + "t=" + assemblyName.GetHashCode ();
-#else
                        if (includeTimeStamp) {
                                if (!String.IsNullOrEmpty (assemblyPath) && File.Exists (assemblyPath))
                                        atime = QueryParamSeparator + "t=" + File.GetLastWriteTimeUtc (assemblyPath).Ticks;
                                else
                                        atime = QueryParamSeparator + "t=" + DateTime.UtcNow.Ticks;
                        }
-#endif
                        string d = HttpUtility.UrlEncode (assemblyNameHash + "_" + resourceNameHash +  (debug ? "_t" : "_f"));
                        string href = HandlerFileName + "?d=" + d + atime + extra;
                        HttpContext ctx = HttpContext.Current;