WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable fsockopen for 12 hours if it fails. Props jacobsantos, fixes #7514 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-08-16 05:38:57 +00:00
parent 2955c83e99
commit 0b6768f3ea
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/http.php
View File

@ -125,10 +125,10 @@ class WP_Http {
if ( is_null($working_transport) ) { if ( is_null($working_transport) ) {
if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) ) if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) )
$working_transport[] = new WP_Http_ExtHttp(); $working_transport[] = new WP_Http_ExtHttp();
else if ( true === WP_Http_Fsockopen::test() && apply_filters('use_fsockopen_transport', true) )
$working_transport[] = new WP_Http_Fsockopen();
else if ( true === WP_Http_Streams::test() && apply_filters('use_streams_transport', true) ) else if ( true === WP_Http_Streams::test() && apply_filters('use_streams_transport', true) )
$working_transport[] = new WP_Http_Streams(); $working_transport[] = new WP_Http_Streams();
else if ( true === WP_Http_Fsockopen::test() && apply_filters('use_fsockopen_transport', true) )
$working_transport[] = new WP_Http_Fsockopen();
} }
return $working_transport; return $working_transport;
@ -201,7 +201,7 @@ class WP_Http {
} }
if ( isset($r['headers']['User-Agent']) ) { if ( isset($r['headers']['User-Agent']) ) {
$r['user-agent'] = $headers['User-Agent']; $r['user-agent'] = $r['headers']['User-Agent'];
unset($r['headers']['User-Agent']); unset($r['headers']['User-Agent']);
} }
@ -463,11 +463,21 @@ class WP_Http_Fsockopen {
if ( true === $secure_transport ) if ( true === $secure_transport )
$error_reporting = error_reporting(0); $error_reporting = error_reporting(0);
$startDelay = time();
if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) ) if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
$handle = @fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] ); $handle = @fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
else else
$handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] ); $handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
$endDelay = time();
// If the delay is greater than the timeout then fsockopen should't be
// used, because it will cause a long delay.
$elapseDelay = ($endDelay-$startDelay) > $r['timeout'];
if ( true === $elapseDelay )
add_option( 'disable_fsockopen', $endDelay, null, true );
if ( false === $handle ) if ( false === $handle )
return new WP_Error('http_request_failed', $iError . ': ' . $strError); return new WP_Error('http_request_failed', $iError . ': ' . $strError);
@ -544,6 +554,9 @@ class WP_Http_Fsockopen {
* @return boolean False means this class can not be used, true means it can. * @return boolean False means this class can not be used, true means it can.
*/ */
function test() { function test() {
if ( false !== ($option = get_option( 'disable_fsockopen' )) && time()-$option < 43200 ) // 12 hours
return false;
if ( function_exists( 'fsockopen' ) ) if ( function_exists( 'fsockopen' ) )
return true; return true;