- proxy support for wfGetHTTP()

[lhc/web/wiklou.git] / includes / HttpFunctions.php

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index f292a41..ed93aaa 100644 (file)
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -6,7 +6,7 @@
  * if $timeout is 'default', $wgHTTPTimeout is used
  */
 function wfGetHTTP( $url, $timeout = 'default' ) {
-       global $wgServer, $wgHTTPTimeout;
+       global $wgServer, $wgHTTPTimeout, $wgHTTPProxy;
        
 
        # Use curl if available
@@ -14,7 +14,9 @@ function wfGetHTTP( $url, $timeout = 'default' ) {
                $c = curl_init( $url );
                if ( wfIsLocalURL( $url ) ) {
                        curl_setopt( $c, CURLOPT_PROXY, 'localhost:80' );
-               }
+               } else if ($wgHTTPProxy)
+                       curl_setopt($c, CURLOPT_PROXY, $wgHTTPProxy);
+
                if ( $timeout == 'default' ) {
                        $timeout = $wgHTTPTimeout;
                }