Merged revisions 295361 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295361 | pabelanger | 2010-11-17 09:09:38 -0500 (Wed, 17 Nov 2010) | 2 lines

  Uncomment settings under [global], to surpress warning when loading Asterisk.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295364 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/res_curl.conf.sample b/configs/res_curl.conf.sample
index 2cc92dcbd23c80b4ffc948ae452452ca7fb6e668..cc472989f236c2fac372a17d552e0d5047875c86 100644 (file)
--- a/configs/res_curl.conf.sample
+++ b/configs/res_curl.conf.sample
@@ -3,6 +3,6 @@
 ;
 [globals]
 ;proxy=myproxy.example.com
-;proxytype=http
-;proxyport=8001
+proxytype=http
+proxyport=8001
 ;proxyuserpwd=asterisk:asteriskrocks