summaryrefslogtreecommitdiffstats
path: root/sites
diff options
context:
space:
mode:
authorAlex Pott2016-01-18 17:28:31 (GMT)
committerAlex Pott2016-01-18 17:28:31 (GMT)
commitbbc772aec1c33c2ec7a04b686f346b33808383bf (patch)
tree397732e4cab5cc404c5c8271d72f383280f6038a /sites
parentb88c90a6c01f2aed22df97186afd4b71fb2f7eb1 (diff)
Issue #2637058 by claudiu.cristea, priya.chat, jhodgdon, dawehner: Fix HTTP proxy docs in default.settings.php
Diffstat (limited to 'sites')
-rw-r--r--sites/default/default.settings.php33
1 files changed, 19 insertions, 14 deletions
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 1a6d148..87c4d93 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -313,20 +313,25 @@ $settings['update_free_access'] = FALSE;
/**
* External access proxy settings:
*
- * If your site must access the Internet via a web proxy then you can enter
- * the proxy settings here. Currently only basic authentication is supported
- * by using the username and password variables. The proxy_user_agent variable
- * can be set to NULL for proxies that require no User-Agent header or to a
- * non-empty string for proxies that limit requests to a specific agent. The
- * proxy_exceptions variable is an array of host names to be accessed directly,
- * not via proxy.
- */
-# $settings['proxy_server'] = '';
-# $settings['proxy_port'] = 8080;
-# $settings['proxy_username'] = '';
-# $settings['proxy_password'] = '';
-# $settings['proxy_user_agent'] = '';
-# $settings['proxy_exceptions'] = array('127.0.0.1', 'localhost');
+ * If your site must access the Internet via a web proxy then you can enter the
+ * proxy settings here. Set the full URL of the proxy, including the port, in
+ * variables:
+ * - $settings['http_client_config']['proxy']['http']: The proxy URL for HTTP
+ * requests.
+ * - $settings['http_client_config']['proxy']['https']: The proxy URL for HTTPS
+ * requests.
+ * You can pass in the user name and password for basic authentication in the
+ * URLs in these settings.
+ *
+ * You can also define an array of host names that can be accessed directly,
+ * bypassing the proxy, in $settings['http_client_config']['proxy']['no'].
+ *
+ * If these settings are not configured, the system environment variables
+ * HTTP_PROXY, HTTPS_PROXY, and NO_PROXY on the web server will be used instead.
+ */
+# $settings['http_client_config']['proxy']['http'] = 'http://proxy_user:proxy_pass@example.com:8080';
+# $settings['http_client_config']['proxy']['https'] = 'http://proxy_user:proxy_pass@example.com:8080';
+# $settings['http_client_config']['proxy']['no'] = ['127.0.0.1', 'localhost'];
/**
* Reverse Proxy Configuration: