mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs
View File

@ -56,7 +56,7 @@ namespace System.ServiceModel.Channels
get { return source.MessageEncoder; }
}
#if NET_2_1
#if MOBILE
public override T GetProperty<T> ()
{
if (typeof (T) == typeof (IHttpCookieContainerManager))
@ -126,6 +126,7 @@ namespace System.ServiceModel.Channels
}
web_request.Timeout = (int) timeout.TotalMilliseconds;
web_request.KeepAlive = httpbe.KeepAliveEnabled;
// There is no SOAP Action/To header when AddressingVersion is None.
if (message.Version.Envelope.Equals (EnvelopeVersion.Soap11) ||
@ -189,7 +190,7 @@ namespace System.ServiceModel.Channels
suppressEntityBody = true;
}
#if !NET_2_1
#if !MOBILE
if (source.ClientCredentials != null) {
var cred = source.ClientCredentials;
if ((cred.ClientCertificate != null) && (cred.ClientCertificate.Certificate != null))
@ -476,7 +477,7 @@ namespace System.ServiceModel.Channels
// FIXME: Do we need to use the timeout? If so, what happens when the timeout is reached.
// Is the current request cancelled and an exception thrown? If so we need to pass the
// exception to the Complete () method and allow the result to complete 'normally'.
#if NET_2_1
#if MOBILE
// neither Moonlight nor MonoTouch supports contexts (WaitOne default to false)
bool result = AsyncWaitHandle.WaitOne (Timeout);
#else