Changeset 8654

Timestamp:

08/16/2008 05:38:57 AM (18 years ago)

Author:

azaozz

Message:

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

File:

• trunk/wp-includes/http.php (modified) (4 diffs)

trunk/wp-includes/http.php

@@ -126 +126 @@
                         if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) )
                                 $working_transport[] = new WP_Http_ExtHttp();
+                        else if ( true === WP_Http_Streams::test() && apply_filters('use_streams_transport', true) )
+                                $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();
-                        else if ( true === WP_Http_Streams::test() && apply_filters('use_streams_transport', true) )
-                                $working_transport[] = new WP_Http_Streams();
                 }
 
@@ -202 +202 @@
 
                 if ( isset($r['headers']['User-Agent']) ) {
-                        $r['user-agent'] = $headers['User-Agent'];
+                        $r['user-agent'] = $r['headers']['User-Agent'];
                         unset($r['headers']['User-Agent']);
                 }
@@ -464 +464 @@
                         $error_reporting = error_reporting(0);
 
+                $startDelay = time();
+
                 if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
                         $handle = @fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
                 else
                         $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 )
@@ -545 +555 @@
          */
         function test() {
+                if ( false !== ($option = get_option( 'disable_fsockopen' )) && time()-$option < 43200 ) // 12 hours
+                        return false;
+
                 if ( function_exists( 'fsockopen' ) )
                         return true;