patch by Michael Hutchinson to use the environment variable http_proxy

svn path=/trunk/mono/; revision=53237

diff --git a/ChangeLog b/ChangeLog
index 20e361198f75d4f58484f20dc594c7df48958446..649a66300ad07d3332f7c82328fd366750d1ce81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Michael Hutchinson <m.j.hutchinson@gmail.com>
+
+       * data/net_1_1/machine.config, data/net_2_0/machine.config: Set 
+       default values for http proxy
+
 2005-11-07  Zoltan Varga  <vargaz@gmail.com>
 
        * docs/jit-regalloc: Merge forgotten documentation updates from

diff --git a/data/net_1_1/machine.config b/data/net_1_1/machine.config
index dd44bce11b03192f48dc73c3385633fdc6aacc64..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" />

diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index 538ad1cca9750b8d3b43da7a918e52deb8d749bd..5c7c16be9f9b8fdd63c9722d2710d5a78f9d4c45 100644 (file)
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -63,9 +63,11 @@
                        <add type="System.Net.NtlmClient, System, Version=2.0.0.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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />