2007-10-30 Juraj Skripsky <js@hotfete.ch>

	* AssemblyResourceLoader.cs: Always use '&' as query parameter
	separator, as HttpUtility does not support ';' anymore.

svn path=/trunk/mcs/; revision=88454

diff --git a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
index 7b2df0f752c7fd38b5f3f79c898b070c4f75a319..2ba0ffcb6d4dcbeb4203ee926aa52da2517f9686 100644 (file)
--- a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
+++ b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
@@ -49,11 +49,8 @@ namespace System.Web.Handlers {
        class AssemblyResourceLoader : IHttpHandler {           
                const string HandlerFileName = "WebResource.axd";
 #endif
-#if NET_2_0
-               const char QueryParamSeparator = ';';
-#else
                const char QueryParamSeparator = '&';
-#endif
+
                static readonly Hashtable _embeddedResources;
 #if SYSTEM_WEB_EXTENSIONS
        static ScriptResourceHandler()

diff --git a/mcs/class/System.Web/System.Web.Handlers/ChangeLog b/mcs/class/System.Web/System.Web.Handlers/ChangeLog
index 79c0bbbf5a69e35c612d08a1096e11a79edade52..197c3c3c04e95907ea0b12253baf8d37ea09a0e5 100644 (file)
--- a/mcs/class/System.Web/System.Web.Handlers/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Handlers/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-30 Juraj Skripsky  <js@hotfete.ch>
+
+       * AssemblyResourceLoader.cs: Always use '&' as query parameter
+       separator, as HttpUtility does not support ';' anymore.
+
 2007-08-23 Igor Zelmanovich <igorz@mainsoft.com>
 
        * AssemblyResourceLoader.cs: for SYSTEM_WEB_EXTENSIONS only: