You've already forked linux-packaging-mono
Imported Upstream version 4.2.0.179
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
committed by
Jo Shields
parent
183bba2c9a
commit
6992685b86
@@ -71,6 +71,13 @@ namespace System.Web.Services.Configuration
|
||||
|
||||
// Update paths
|
||||
// If we're not running in the context of a web application then skip this setting.
|
||||
#if MONO_BROKEN_CONFIGURATION_DLL
|
||||
try {
|
||||
var hack = this.EvaluationContext;
|
||||
} catch (ConfigurationErrorsException) {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
ContextInformation context = this.EvaluationContext;
|
||||
WebContext webContext = context.HostingContext as WebContext;
|
||||
if (webContext == null)
|
||||
@@ -115,6 +122,14 @@ namespace System.Web.Services.Configuration
|
||||
PartialTrustHelpers.FailIfInPartialTrustOutsideAspNet();
|
||||
|
||||
WsdlHelpGeneratorElement parent = (WsdlHelpGeneratorElement)parentElement;
|
||||
#if MONO_BROKEN_CONFIGURATION_DLL
|
||||
try {
|
||||
var hack = this.EvaluationContext;
|
||||
} catch (ConfigurationErrorsException) {
|
||||
base.Reset(parentElement);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
ContextInformation context = this.EvaluationContext;
|
||||
WebContext webContext = context.HostingContext as WebContext;
|
||||
if (webContext != null)
|
||||
|
@@ -63,7 +63,9 @@ namespace System.Web.Services.Protocols {
|
||||
private int timeout;
|
||||
private string connectionGroupName;
|
||||
private Encoding requestEncoding;
|
||||
#if !MONO
|
||||
private RemoteDebugger debugger;
|
||||
#endif
|
||||
private WebRequest pendingSyncRequest;
|
||||
object nullToken = new object();
|
||||
Hashtable asyncInvokes = Hashtable.Synchronized(new Hashtable());
|
||||
@@ -399,6 +401,7 @@ namespace System.Web.Services.Protocols {
|
||||
}
|
||||
|
||||
internal void NotifyClientCallOut(WebRequest request) {
|
||||
#if !MONO
|
||||
if (RemoteDebugger.IsClientCallOutEnabled()) {
|
||||
debugger = new RemoteDebugger();
|
||||
debugger.NotifyClientCallOut(request);
|
||||
@@ -406,6 +409,7 @@ namespace System.Web.Services.Protocols {
|
||||
else {
|
||||
debugger = null;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <include file='doc\ClientProtocol.uex' path='docs/doc[@for="WebClientProtocol.GetWebRequest"]/*' />
|
||||
@@ -455,8 +459,10 @@ namespace System.Web.Services.Protocols {
|
||||
}
|
||||
}
|
||||
finally {
|
||||
#if !MONO
|
||||
if (debugger != null)
|
||||
debugger.NotifyClientCallReturn(response);
|
||||
#endif
|
||||
}
|
||||
return response;
|
||||
}
|
||||
@@ -472,8 +478,10 @@ namespace System.Web.Services.Protocols {
|
||||
/// </devdoc>
|
||||
protected virtual WebResponse GetWebResponse(WebRequest request, IAsyncResult result) {
|
||||
WebResponse response = request.EndGetResponse(result);
|
||||
#if !MONO
|
||||
if (response != null && debugger != null)
|
||||
debugger.NotifyClientCallReturn(response);
|
||||
#endif
|
||||
return response;
|
||||
}
|
||||
|
||||
|
@@ -95,12 +95,13 @@ namespace System.Web.Services.Protocols {
|
||||
protocol.CreateServerInstance();
|
||||
|
||||
string stringBuffer;
|
||||
#if !MONO
|
||||
RemoteDebugger debugger = null;
|
||||
if (!protocol.IsOneWay && RemoteDebugger.IsServerCallInEnabled(protocol, out stringBuffer)) {
|
||||
debugger = new RemoteDebugger();
|
||||
debugger.NotifyServerCallEnter(protocol, stringBuffer);
|
||||
}
|
||||
|
||||
#endif
|
||||
try {
|
||||
TraceMethod caller = Tracing.On ? new TraceMethod(this, "Invoke") : null;
|
||||
TraceMethod userMethod = Tracing.On ? new TraceMethod(protocol.Target, protocol.MethodInfo.Name, this.parameters) : null;
|
||||
@@ -121,9 +122,10 @@ namespace System.Web.Services.Protocols {
|
||||
}
|
||||
finally {
|
||||
protocol.DisposeServerInstance();
|
||||
|
||||
#if !MONO
|
||||
if (debugger != null)
|
||||
debugger.NotifyServerCallExit(protocol.Response);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user