merge -r 53370:58178

[mono.git] / data / net_1_1 / machine.config

diff --git a/data/net_1_1/machine.config b/data/net_1_1/machine.config
index 606e744ec35f5e2980c73c3425811cee0d15fff6..3540f71215a4d39cec67041e4813d262ff2584fa 100644 (file)
--- a/data/net_1_1/machine.config
+++ b/data/net_1_1/machine.config
@@ -62,9 +62,11 @@
                        <add type="System.Net.NtlmClient, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                </authenticationModules>
                <defaultProxy>
-                       <proxy />
-                       <!-- bypassonlocal and proxyaddress are ok -->
-                       <!-- usessystemdefault is not supported -->
+                       <proxy
+                               usesystemdefault = "true"
+                               bypassonlocal = "true"
+                       />
+                       <!--  proxyaddress can also be set -->
                </defaultProxy>
                <webRequestModules>
                        <add prefix="http" type="System.Net.HttpRequestCreator, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -123,7 +125,7 @@
                        <wsdlHelpGenerator href="DefaultWsdlHelpGenerator.aspx" />
                </webServices>
                <webControls clientScriptsLocation="/web_scripts" />
-               <compilation debug="false" defaultLanguage="c#">
+               <compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
                        <compilers>
                        <compiler language="cs;c#;csharp" extension=".cs" warningLevel="1" compilerOptions=""
                                  type="Microsoft.CSharp.CSharpCodeProvider, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />