git-svn-id: http://svn.automattic.com/wordpress/trunk@8534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
2d6e153cb4
commit
2eb0dffaaa
|
@ -862,9 +862,11 @@ class WP_Http_Curl {
|
||||||
curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
|
curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
|
||||||
curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, 1 );
|
curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, 1 );
|
||||||
curl_setopt( $handle, CURLOPT_TIMEOUT, $r['timeout'] );
|
curl_setopt( $handle, CURLOPT_TIMEOUT, $r['timeout'] );
|
||||||
curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true );
|
|
||||||
curl_setopt( $handle, CURLOPT_MAXREDIRS, $r['redirection'] );
|
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) )
|
if( ! is_null($headers) )
|
||||||
curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
|
curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue