2007-07-16 Igor Zelmanovich <igorz@mainsoft.com>

	* AssemblyResourceLoader.cs:
	fixed RegEx used for PerformSubstitution feature.

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

diff --git a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
index 9262a706c15683ee2916ad925afe5a230a08e78b..35fdb58f14689ac3c3e56977e41ecf1d48a7130a 100644 (file)
--- a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
+++ b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
@@ -201,7 +201,7 @@ namespace System.Web.Handlers {
                sealed class PerformSubstitutionHelper
                {
                        readonly Assembly _assembly;
-                       static readonly Regex _regex = new Regex (@"\<%=[ ]+WebResource[ ]*\([ ]*""([\.\w]+)""[ ]*\)[ ]*%\>");
+                       static readonly Regex _regex = new Regex (@"\<%=[ ]*WebResource[ ]*\([ ]*""([^""]+)""[ ]*\)[ ]*%\>");
 
                        public PerformSubstitutionHelper (Assembly assembly) {
                                _assembly = assembly;

diff --git a/mcs/class/System.Web/System.Web.Handlers/ChangeLog b/mcs/class/System.Web/System.Web.Handlers/ChangeLog
index f8d1f0bdd48e906ea50ac1499c10f7cb4c4d434a..2916d88a4c7affe203e463518893885133de6fe9 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-07-16 Igor Zelmanovich <igorz@mainsoft.com>
+
+       * AssemblyResourceLoader.cs:
+       fixed RegEx used for PerformSubstitution feature.
+
 2007-07-11 Igor Zelmanovich <igorz@mainsoft.com>
 
        * AssemblyResourceLoader.cs: