diff options
author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-17 14:22:42 +0000 |
---|---|---|
committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-17 14:22:42 +0000 |
commit | e0a4714ef5ed0cc8478d63fd0eadbcce5b6b46b1 (patch) | |
tree | f7b6947affe3835b33222d68933bb5ba43338ff4 /configs | |
parent | 86b0ce0eae6e10d6f264f390ffc379aa70255135 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@295364 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/res_curl.conf.sample | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/res_curl.conf.sample b/configs/res_curl.conf.sample index 2cc92dcbd..cc472989f 100644 --- 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 |