Merge pull request #5714 from alexischr/update_bockbuild

[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..2dfec5f02035f14e40680df0e734e240e1563c44 100644 (file)
--- a/data/net_1_1/machine.config
+++ b/data/net_1_1/machine.config
@@ -6,6 +6,7 @@
                <section name="appSettings" type="System.Configuration.NameValueFileSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <section name="system.runtime.remoting" type="System.Configuration.IgnoreSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
+               <section name="system.windows.forms" type="System.Configuration.IgnoreSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <sectionGroup name="system.web">
                        <section name="httpHandlers"
                                 type="System.Web.Configuration.HttpHandlersSectionHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -62,18 +63,17 @@
                        <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" />
                        <add prefix="https" type="System.Net.HttpRequestCreator, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                        <add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                </webRequestModules>
-               <settings>
-                       <ipv6 enabled="false"/>
-               </settings>
        </system.net>
        <system.web>
                <httpHandlers>
@@ -85,7 +85,9 @@
                        <add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
                        <add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
                        <add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+                       <add verb="*" path="*.Config" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
                        <add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+                       <add verb="*" path="*.dll" type="System.Web.HttpForbiddenHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
                <add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
                <add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
                        <add verb="GET,HEAD" path="*" type="System.Web.StaticFileHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -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" />
@@ -142,8 +144,13 @@
                                <add assembly="*" /> <!-- Add assemblies in bin directory -->
                        </assemblies>
                </compilation>
+               <!-- 
+                       RequestLengthDiskThreshold is a 2.0 feature that we
+                       enable for 1.x too.
+               -->
                <httpRuntime executionTimeout="90"
                             maxRequestLength="4096"
+                            requestLengthDiskThreshold="256" 
                             useFullyQualifiedRedirectUrl="false"
                             minFreeThreads="8"
                             minLocalRequestFreeThreads="4"
@@ -199,18 +206,23 @@
         <system.drawing>
         </system.drawing>
 
-       <mscorlib>\r
-               <cryptographySettings>\r
-                       <cryptoNameMapping>\r
-                               <cryptoClasses>\r
-                                       <cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />\r
-                               </cryptoClasses>\r
-                               <nameEntry name="MD2" class="monoMD2" />\r
-                       </cryptoNameMapping>\r
-                       <oidMap>\r
-                               <oidEntry OID="1.2.840.113549.2.2" name="MD2" />\r
-                       </oidMap>\r
-               </cryptographySettings>\r
+       <mscorlib>
+               <cryptographySettings>
+                       <cryptoNameMapping>
+                               <cryptoClasses>
+                                       <cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+                                       <cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+                               </cryptoClasses>
+                               <nameEntry name="MD2" class="monoMD2" />
+                               <nameEntry name="MD4" class="monoMD4" />
+                       </cryptoNameMapping>
+                       <oidMap>
+                               <oidEntry OID="1.2.840.113549.2.2" name="MD2" />
+                               <oidEntry OID="1.2.840.113549.2.2" name="Mono.Security.Cryptography.MD2Managed" />
+                               <oidEntry OID="1.2.840.113549.2.4" name="MD4" />
+                               <oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
+                       </oidMap>
+               </cryptographySettings>
        </mscorlib>
 
        <strongNames>
@@ -223,6 +235,10 @@
                        <map Token="31bf3856ad364e35" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
                        <!-- IBM (DB2 Data Provider) key -->
                        <map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+                       <!-- Silverlight 2.0 key -->
+                       <map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
+                       <!-- XNA Framework key -->                                                            
+                       <map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
                </pubTokenMapping>
        </strongNames>
 </configuration>