ソースを参照

Add working .svc handler in 4.0 web.config, fix standard endpoint handling and get xsp4 working.

Atsushi Eno 15 年 前
コミット
fe3362a8f2

+ 1 - 0
data/net_4_0/web.config

@@ -76,6 +76,7 @@
 		  <!--
 		  <add path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
 		  -->
+                  <add verb="*" path="*.svc" type="System.ServiceModel.Channels.SvcHttpHandlerFactory, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		  <add path="*.rules" verb="*" type="System.Web.HttpForbiddenHandler" validate="True"/>
 		  <!--
 		  <add path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>

+ 1 - 1
mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs

@@ -367,7 +367,7 @@ namespace System.ServiceModel
 #if NET_4_0
 				var binding = String.IsNullOrEmpty (endpoint.Binding) ? null : ConfigUtil.CreateBinding (endpoint.Binding, endpoint.BindingConfiguration);
 
-				if (endpoint.Kind != null) {
+				if (!String.IsNullOrEmpty (endpoint.Kind)) {
 					var contract = String.IsNullOrEmpty (endpoint.Contract) ? null : GetContract (endpoint.Contract, false);
 					se = ConfigUtil.ConfigureStandardEndpoint (contract, endpoint);
 					if (se.Binding == null)