--- a/.hgsubstate Wed Feb 22 15:52:30 2012 +0100
+++ b/.hgsubstate Thu Feb 23 18:52:59 2012 +0100
@@ -1,1 +1,1 @@
-d76e5e0ded2469d3256c403efe75f157fc9bf640 vendor/bundles/IRI/Bundle/WikiTagBundle
+bb7808e180c36f859a9d986d6639d87504c9e71e vendor/bundles/IRI/Bundle/WikiTagBundle
--- a/app/config/config.yml Wed Feb 22 15:52:30 2012 +0100
+++ b/app/config/config.yml Thu Feb 23 18:52:59 2012 +0100
@@ -98,6 +98,16 @@
contributor: [ 'order', 'label', 'wikipedia_link', 'wikipedia_permalink', 'delete_wikipedia_link', 'remove_tag_from_list' ]
another: [ 'sort_tag', 'order', 'move_up_down', 'id', 'label', 'wikipedia_link', 'remove_tag_from_list' ]
test: [ 'order', 'id', 'move_up_down', 'label', 'wikipedia_link', 'wikipedia_permalink', 'dbpedia_link', 'remove_wikipedia_link', 'remove_tag_from_list', 'alternative_wikipedia_url' ]
+ # Options for curl_setopt, typically proxy settings. If you want to use constant values, just write for example 'CURLOPT_PROXYAUTH' or 'CURLAUTH_NTLM'.
+ # The program will check if the string gives an existing constant
+ # For boolean, just write 'TRUE' or 'FALSE'.
+ curl_options:
+ CURLOPT_HTTPPROXYTUNNEL: 'TRUE'
+ CURLOPT_PROXYAUTH: 'CURLAUTH_NTLM'
+ CURLOPT_USERAGENT: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.1) Gecko/20100101 Firefox/10.0.1'
+ CURLOPT_PROXY: 'derain.centrepompidou.lan:3128'
+ CURLOPT_PROXYUSERPWD: 'DOM-CNAC\cavaliet:thibaut';
+ CURLOPT_PROXYTYPE: 'CURLPROXY_HTTP'
services: