huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove ChannelBinding stub, it's now available.

This commit is contained in:
Chris Ross 2014-06-02 09:25:57 -07:00
parent 9191bddf00
commit 271a8714d8
3 changed files with 9 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.Net.Server/Microsoft.Net.Server.kproj
View File

@ -29,7 +29,6 @@
<Compile Include="fx\System\ExternDll.cs" /> <Compile Include="fx\System\ExternDll.cs" />
<Compile Include="fx\System\Runtime\InteropServices\ExternalException.cs" /> <Compile Include="fx\System\Runtime\InteropServices\ExternalException.cs" />
<Compile Include="fx\System\SafeNativeMethods.cs" /> <Compile Include="fx\System\SafeNativeMethods.cs" />
<Compile Include="fx\System\Security\Authentication\ExtendedProtection\ChannelBinding.cs" />
<Compile Include="GlobalSuppressions.cs" /> <Compile Include="GlobalSuppressions.cs" />
<Compile Include="Helpers.cs" /> <Compile Include="Helpers.cs" />
<Compile Include="LogHelper.cs" /> <Compile Include="LogHelper.cs" />
@ -86,4 +85,3 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>

8
src/Microsoft.Net.Server/NativeInterop/SafeLocalFreeChannelBinding.cs
View File

@ -55,5 +55,13 @@ namespace Microsoft.Net.Server
{ {
return UnsafeNclNativeMethods.SafeNetHandles.LocalFree(handle) == IntPtr.Zero; return UnsafeNclNativeMethods.SafeNetHandles.LocalFree(handle) == IntPtr.Zero;
} }
public override bool IsInvalid
{
get
{
return handle == IntPtr.Zero || handle.ToInt32() == -1;
}
}
} }
} }

50
src/Microsoft.Net.Server/fx/System/Security/Authentication/ExtendedProtection/ChannelBinding.cs
View File

@ -1,50 +0,0 @@
// Copyright (c) Microsoft Open Technologies, Inc.
// All Rights Reserved
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
// WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF
// TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR
// NON-INFRINGEMENT.
// See the Apache 2 License for the specific language governing
// permissions and limitations under the License.
//------------------------------------------------------------------------------
//
// Copyright (c) Microsoft Corporation. All rights reserved.
//
//------------------------------------------------------------------------------
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;
#if !NET45
namespace System.Security.Authentication.ExtendedProtection
{
internal abstract class ChannelBinding : SafeHandleZeroOrMinusOneIsInvalid
{
protected ChannelBinding()
: base(true)
{
}
protected ChannelBinding(bool ownsHandle)
: base(ownsHandle)
{
}
public abstract int Size
{
get;
}
}
}
#endif