WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / class-wp-http-proxy.php

diff --git a/wp-includes/class-wp-http-proxy.php b/wp-includes/class-wp-http-proxy.php
index fba0e0ec68e0abd89c4e3ca99e104df7ddfffbb5..af9d338be5e536024669e0395ee7ddbb1538dc14 100644 (file)
--- a/wp-includes/class-wp-http-proxy.php
+++ b/wp-includes/class-wp-http-proxy.php
@@ -24,7 +24,7 @@
  * <li>WP_PROXY_USERNAME - Proxy username, if it requires authentication.</li>
  * <li>WP_PROXY_PASSWORD - Proxy password, if it requires authentication.</li>
  * <li>WP_PROXY_BYPASS_HOSTS - Will prevent the hosts in this list from going through the proxy.
  * <li>WP_PROXY_USERNAME - Proxy username, if it requires authentication.</li>
  * <li>WP_PROXY_PASSWORD - Proxy password, if it requires authentication.</li>
  * <li>WP_PROXY_BYPASS_HOSTS - Will prevent the hosts in this list from going through the proxy.

- * You do not need to have localhost and the blog host in this list, because they will not be passed
+ * You do not need to have localhost and the site host in this list, because they will not be passed

  * through the proxy. The list should be presented in a comma separated list, wildcards using * are supported, eg. *.wordpress.org</li>
  * </ol>
  *
  * through the proxy. The list should be presented in a comma separated list, wildcards using * are supported, eg. *.wordpress.org</li>
  * </ol>
  *


@@ -150,7 +150,7 @@ class WP_HTTP_Proxy {
        /**
         * Whether URL should be sent through the proxy server.
         *
        /**
         * Whether URL should be sent through the proxy server.
         *

-        * We want to keep localhost and the blog URL from being sent through the proxy server, because
+        * We want to keep localhost and the site URL from being sent through the proxy server, because

         * some proxies can not handle this. We also have the constant available for defining other
         * hosts that won't be sent through the proxy.
         *
         * some proxies can not handle this. We also have the constant available for defining other
         * hosts that won't be sent through the proxy.
         *


@@ -165,7 +165,7 @@ class WP_HTTP_Proxy {
        public function send_through_proxy( $uri ) {
                /*
                 * parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
        public function send_through_proxy( $uri ) {
                /*
                 * parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.

-                * This will be displayed on blogs, which is not reasonable.
+                * This will be displayed on sites, which is not reasonable.

                 */
                $check = @parse_url($uri);
 
                 */
                $check = @parse_url($uri);