Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -38,9 +38,7 @@ namespace System.ServiceModel.Channels
{
internal class HttpChannelFactory<TChannel> : TransportChannelFactoryBase<TChannel>
{
#if NET_2_1 || NET_4_0
IHttpCookieContainerManager cookie_manager;
#endif
public HttpChannelFactory (HttpTransportBindingElement source, BindingContext ctx)
: base (source, ctx)
@ -52,11 +50,9 @@ namespace System.ServiceModel.Channels
MessageEncoder = CreateEncoder<TChannel> (mbe);
continue;
}
#if NET_2_1 || NET_4_0
var tbe = be as HttpTransportBindingElement;
if (tbe != null)
cookie_manager = tbe.GetProperty<IHttpCookieContainerManager> (ctx);
#endif
}
if (MessageEncoder == null)
MessageEncoder = new TextMessageEncoder (MessageVersion.Default, Encoding.UTF8);
@ -109,10 +105,8 @@ namespace System.ServiceModel.Channels
public override T GetProperty<T> ()
{
#if NET_2_1 || NET_4_0
if (cookie_manager is T)
return (T) (object) cookie_manager;
#endif
return base.GetProperty<T> ();
}
}