diff options
Diffstat (limited to 'mcs/class/referencesource/System.Web.Extensions')
11 files changed, 31 insertions, 26 deletions
diff --git a/mcs/class/referencesource/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs b/mcs/class/referencesource/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs index 45b862eda3a..0cedd02d552 100644 --- a/mcs/class/referencesource/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs +++ b/mcs/class/referencesource/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs @@ -441,9 +441,9 @@ namespace Microsoft.VSDesigner.WCFModel } catch (Exception ex) { - // fatal error... (workaround for bug #135242) - // We want to convert fatal error exception to a normal code generator error message, - // so the user could find information from pervious errors to find KB topic. + // fatal error... (workaround for + + proxyGenerationErrors.Add(new ProxyGenerationError( ProxyGenerationError.GeneratorState.GenerateCode, String.Empty, @@ -1252,7 +1252,7 @@ namespace Microsoft.VSDesigner.WCFModel if (serializerType == ClientOptions.ProxySerializerType.Auto && ContainsHttpBindings(metadataSections)) { // NOTE: HTTP Get/Post binding indicates an old web service. We use XmlSerializer to prevent generating dup classes. - // Please check devdiv bug 94078 + // Please check devdiv serializerType = ClientOptions.ProxySerializerType.XmlSerializer; } diff --git a/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptModule.cs b/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptModule.cs index c6e323ff26d..150fb37f359 100644 --- a/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptModule.cs +++ b/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptModule.cs @@ -143,6 +143,10 @@ namespace System.Web.Handlers { response.Cache.SetCacheability(HttpCacheability.NoCache); response.ContentType = "text/plain"; + // DevDiv#961281 + // Allow apps to access to the redirect location + context.Items[PageRequestManager.AsyncPostBackRedirectLocationKey] = redirectLocation; + // Preserve redirected state: TFS#882879 response.IsRequestBeingRedirected = true; diff --git a/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptResourceHandler.cs b/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptResourceHandler.cs index 93deb03db38..c70ccff6906 100644 --- a/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptResourceHandler.cs +++ b/mcs/class/referencesource/System.Web.Extensions/Handlers/ScriptResourceHandler.cs @@ -526,8 +526,8 @@ namespace System.Web.Handlers { } } else { - // Bug DevDiv #175061, we don't want to force any encoding here and let the default - // encoding apply no matter what the incoming scripts might have been encoded with. + // + response.Write(script.ToString()); } } diff --git a/mcs/class/referencesource/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs b/mcs/class/referencesource/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs index 97d49938441..28d28964e19 100644 --- a/mcs/class/referencesource/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs +++ b/mcs/class/referencesource/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs @@ -13,13 +13,13 @@ namespace System.Web.Script.Services { internal PageClientProxyGenerator(IPage page, bool debug) : this(VirtualPathUtility.MakeRelative(page.Request.Path, page.Request.FilePath), debug) { - // Dev10 Bug 597146: Use VirtualPathUtility to build a relative path from the path to the file. - // Previously just Page.Request.FilePath was used, which was for example, /app/foo/page.aspx, - // but this breaks with cookieless sessions since the url is /app/foo/(sessionid)/page.aspx. - // We need to make a relative path from page.Request.Path (e.g. /app/foo) to page.Request.FilePath - // (e.g. /app/foo/page.aspx) rather than just strip off 'page.aspx' with Path.GetFileName, because - // the url may include PathInfo, such as "/app/foo/page.aspx/pathinfo1/pathinfo2", and in that case - // we need the path to be ../../page.aspx + // Dev10 + + + + + + } internal PageClientProxyGenerator(string path, bool debug) { diff --git a/mcs/class/referencesource/System.Web.Extensions/Script/Services/RestHandler.cs b/mcs/class/referencesource/System.Web.Extensions/Script/Services/RestHandler.cs index eee0e1f07a2..29d3f6088b2 100644 --- a/mcs/class/referencesource/System.Web.Extensions/Script/Services/RestHandler.cs +++ b/mcs/class/referencesource/System.Web.Extensions/Script/Services/RestHandler.cs @@ -224,9 +224,9 @@ namespace System.Web.Script.Services { context.Response.AddHeader("jsonerror", "true"); // Maintain the Charset from before. (DevDiv Bugs 158401) context.Response.Charset = charset; - //Devdiv Bug: 118619:When accessed remotely, an Ajax web service that throws an error doesn't return the error string in the proper format on IIS7 - //For IIS 7.0 integrated mode we need to set TrySkipIisCustomErrors to override IIS custom error handling. This has no functional/perf impact on - //IIS 7.0 classic mode or earlier versions. + //Devdiv + + context.Response.TrySkipIisCustomErrors = true; using (StreamWriter writer = new StreamWriter(context.Response.OutputStream, new UTF8Encoding(false))) { if (ex is TargetInvocationException) { diff --git a/mcs/class/referencesource/System.Web.Extensions/ui/AssemblyCache.cs b/mcs/class/referencesource/System.Web.Extensions/ui/AssemblyCache.cs index 5c4032bac79..15ef4492480 100644 --- a/mcs/class/referencesource/System.Web.Extensions/ui/AssemblyCache.cs +++ b/mcs/class/referencesource/System.Web.Extensions/ui/AssemblyCache.cs @@ -95,7 +95,7 @@ using System.Web.Script; } } catch { - // Bug 34311: If we are unable to load the attribute, don't throw. + // } return null; } diff --git a/mcs/class/referencesource/System.Web.Extensions/ui/EmbeddedResourceFinder.cs b/mcs/class/referencesource/System.Web.Extensions/ui/EmbeddedResourceFinder.cs index 4695543de1a..56f254eac21 100644 --- a/mcs/class/referencesource/System.Web.Extensions/ui/EmbeddedResourceFinder.cs +++ b/mcs/class/referencesource/System.Web.Extensions/ui/EmbeddedResourceFinder.cs @@ -9,4 +9,4 @@ // work properly is the assembly name is different from // the namespace. The work around is to use a type which is // outside the root namespace. -internal class EmbeddedResourceFinder { } +internal class EmbeddedResourceFinder { }
\ No newline at end of file diff --git a/mcs/class/referencesource/System.Web.Extensions/ui/PageRequestManager.cs b/mcs/class/referencesource/System.Web.Extensions/ui/PageRequestManager.cs index 191bab69f4d..b6432553900 100644 --- a/mcs/class/referencesource/System.Web.Extensions/ui/PageRequestManager.cs +++ b/mcs/class/referencesource/System.Web.Extensions/ui/PageRequestManager.cs @@ -49,6 +49,7 @@ namespace System.Web.UI { internal const string AsyncPostBackErrorKey = "System.Web.UI.PageRequestManager:AsyncPostBackError"; internal const string AsyncPostBackErrorMessageKey = "System.Web.UI.PageRequestManager:AsyncPostBackErrorMessage"; internal const string AsyncPostBackErrorHttpCodeKey = "System.Web.UI.PageRequestManager:AsyncPostBackErrorHttpCode"; + internal const string AsyncPostBackRedirectLocationKey = "System.Web.UI.PageRequestManager:AsyncPostBackRedirectLocation"; private const string PageTitleToken = "pageTitle"; private const string FocusToken = "focus"; private const string AsyncPostFormField = "__ASYNCPOST"; diff --git a/mcs/class/referencesource/System.Web.Extensions/ui/ProfileServiceManager.cs b/mcs/class/referencesource/System.Web.Extensions/ui/ProfileServiceManager.cs index bd0283344c3..4dc972c4020 100644 --- a/mcs/class/referencesource/System.Web.Extensions/ui/ProfileServiceManager.cs +++ b/mcs/class/referencesource/System.Web.Extensions/ui/ProfileServiceManager.cs @@ -97,9 +97,9 @@ namespace System.Web.UI { } if (!String.IsNullOrEmpty(serviceUrl)) { - // DevDiv Bug 72257:When custom path is set and loadProperties=True, we shouldn't use the default path - // loadProperties script always retrieves the properties from default profile provider, which is not correct if ProfileService - // points to non default path. Hence throw when non default path and loadProperties both are specified. + // DevDiv + + if (defaultServicePath == null){ defaultServicePath = scriptManager.ResolveClientUrl("~/" + System.Web.Script.Services.WebServiceData._profileServiceFileName); } diff --git a/mcs/class/referencesource/System.Web.Extensions/ui/RoleServiceManager.cs b/mcs/class/referencesource/System.Web.Extensions/ui/RoleServiceManager.cs index d86c29fd178..5533fd3dcf6 100644 --- a/mcs/class/referencesource/System.Web.Extensions/ui/RoleServiceManager.cs +++ b/mcs/class/referencesource/System.Web.Extensions/ui/RoleServiceManager.cs @@ -84,9 +84,9 @@ namespace System.Web.UI { bool pathSpecified = !String.IsNullOrEmpty(serviceUrl); if (pathSpecified) { - // DevDiv Bug 71954:When loadRoles="true" and the path is set, we should not load the roles from the default path - // loadRoles script always retrieves the roles from default role provider, which is not correct if RolesService - // points to non default path. Hence throw when non default path and loadRoles both are specified. + // DevDiv + + if (defaultServicePath == null){ defaultServicePath = scriptManager.ResolveClientUrl("~/" + System.Web.Script.Services.WebServiceData._roleServiceFileName); } diff --git a/mcs/class/referencesource/System.Web.Extensions/ui/ScriptManager.cs b/mcs/class/referencesource/System.Web.Extensions/ui/ScriptManager.cs index 049a5452cbf..8ab1f58f399 100644 --- a/mcs/class/referencesource/System.Web.Extensions/ui/ScriptManager.cs +++ b/mcs/class/referencesource/System.Web.Extensions/ui/ScriptManager.cs @@ -1060,8 +1060,8 @@ namespace System.Web.UI { // PERF: Use field directly to avoid creating List if not already created if (_scripts != null) { foreach (ScriptReference scriptReference in _scripts) { - // Fix for Dev11 Bug # 406984 : When user explicitly adds the MicrosoftAjax.[debug].js OR MicrosoftAjaxCore.[debug].js, we want to mark them as defining Sys so that - // we can register the FrameworkLoadedCheck scripts after them. + // Fix for Dev11 + if (scriptReference.IsAjaxFrameworkScript(this) && (scriptReference.Name.StartsWith("MicrosoftAjax.", StringComparison.OrdinalIgnoreCase) || scriptReference.Name.StartsWith("MicrosoftAjaxCore.", StringComparison.OrdinalIgnoreCase))) { scriptReference.IsDefiningSys = true; _scriptPathsDefiningSys.Add(scriptReference.EffectivePath); |