From 2eb0dffaaa6aed89b01bd5f6c95dff1021b0953a Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 4 Aug 2008 17:03:05 +0000 Subject: [PATCH] Don't call curl_setopt() if safe_mode is enabled. Props ionfish and Po0ky. fixes #7458 see #4779 git-svn-id: http://svn.automattic.com/wordpress/trunk@8534 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/http.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/http.php b/wp-includes/http.php index 7274ff322..82d9cd5c3 100644 --- a/wp-includes/http.php +++ b/wp-includes/http.php @@ -862,9 +862,11 @@ class WP_Http_Curl { curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] ); curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, 1 ); curl_setopt( $handle, CURLOPT_TIMEOUT, $r['timeout'] ); - curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true ); curl_setopt( $handle, CURLOPT_MAXREDIRS, $r['redirection'] ); + if ( !ini_get('safe_mode') && !ini_get('open_basedir') ) + curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true ); + if( ! is_null($headers) ) curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );