Imported Upstream version 4.0.3.13

Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29
This commit is contained in:
Xamarin Public Jenkins
2015-07-20 03:39:00 -04:00
parent 4cee7df5e0
commit 2c051c3d51
138 changed files with 3829 additions and 206 deletions

View File

@ -35,7 +35,7 @@ using System.Collections.Generic;
using System.Configuration;
using System.IO;
using System.Text;
#if NET_4_0 && !MOBILE
#if !NO_SYSTEM_WEB_DEPENDENCY && NET_4_0 && !MOBILE
using System.Web.Configuration;
#endif
@ -163,7 +163,7 @@ namespace System.Web.Util
static HttpEncoder GetCustomEncoderFromConfig ()
{
#if MOBILE
#if MOBILE || NO_SYSTEM_WEB_DEPENDENCY
return defaultEncoder.Value;
#else
var cfg = HttpRuntime.Section;