Changeset 8519

Timestamp:

08/01/2008 04:36:50 PM (16 years ago)

Author:

ryan

Message:

Formatting changes and non-blocking mode. Props DD32. see #4779

Location:

trunk/wp-includes

Files:

• cron.php (modified) (1 diff)
• http.php (modified) (13 diffs)

trunk/wp-includes/cron.php

@@ -91 +91 @@
     $cron_url = get_option( 'siteurl' ) . '/wp-cron.php?check=' . wp_hash('187425');
 
-    wp_remote_post($cron_url, array('timeout' => 0.01));
+    wp_remote_post($cron_url, array('timeout' => 0.01, 'blocking' => false));
 }
 

trunk/wp-includes/http.php

@@ -116 +116 @@
             'method' => 'GET', 'timeout' => 3,
             'redirection' => 5, 'redirected' => false,
-            'httpversion' => '1.0'
+            'httpversion' => '1.0', 'blocking' => true
         );
 
@@ -262 +262 @@
 
         $newheaders = array();
-        foreach($headers as $tempheader) {
+        foreach ( $headers as $tempheader ) {
             if ( empty($tempheader) )
                 continue;
@@ -307 +307 @@
         $defaults = array(
             'method' => 'GET', 'timeout' => 3,
-            'redirection' => 5, 'httpversion' => '1.0'
+            'redirection' => 5, 'httpversion' => '1.0',
+            'blocking' => true
         );
 
@@ -324 +325 @@
                 $arrURL['port'] = apply_filters('http_request_default_port', 443);
                 $secure_transport = true;
+            } else {
+                $arrURL['port'] = apply_filters('http_request_default_port', 80);
             }
-            else
-                $arrURL['port'] = apply_filters('http_request_default_port', 80);
+        } else {
+            $arrURL['port'] = apply_filters('http_request_port', $arrURL['port']);
         }
-        else
-            $arrURL['port'] = apply_filters('http_request_port', $arrURL['port']);
 
         if ( true === $secure_transport )
@@ -336 +337 @@
         $handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, apply_filters('http_request_timeout', absint($r['timeout']) ) );
 
-        if ( false === $handle ) {
+        if ( false === $handle )
             return new WP_Error('http_request_failed', $iError . ': ' . $strError);
-        }
 
         $requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
-        $requestPath = (empty($requestPath)) ? '/' : $requestPath;
+        $requestPath = empty($requestPath) ? '/' : $requestPath;
 
         $strHeaders = '';
@@ -348 +348 @@
 
         if ( is_array($header) ) {
-            foreach( (array) $this->getHeaders() as $header => $headerValue)
+            foreach ( (array) $this->getHeaders() as $header => $headerValue )
                 $strHeaders .= $header . ': ' . $headerValue . "\r\n";
-        } else
+        } else {
             $strHeaders .= $header;
+        }
 
         $strHeaders .= "\r\n";
@@ -359 +360 @@
 
         fwrite($handle, $strHeaders);
+
+        if ( ! $r['blocking'] )
+            return array( 'headers' => array(), 'body' => '', 'response' => array() );
 
         $strResponse = '';
@@ -431 +435 @@
         $defaults = array(
             'method' => 'GET', 'timeout' => 3,
-            'redirection' => 5, 'httpversion' => '1.0'
+            'redirection' => 5, 'httpversion' => '1.0',
+            'blocking' => true
         );
 
@@ -448 +453 @@
         if ( function_exists('stream_set_timeout') )
             stream_set_timeout($handle, apply_filters('http_request_timeout', $r['timeout']) );
+
+        if ( ! $r['blocking'] )
+            return array( 'headers' => array(), 'body' => '', 'response' => array() );
 
         $strResponse = '';
@@ -508 +516 @@
         $defaults = array(
             'method' => 'GET', 'timeout' => 3,
-            'redirection' => 5, 'httpversion' => '1.0'
+            'redirection' => 5, 'httpversion' => '1.0',
+            'blocking' => true
         );
 
@@ -537 +546 @@
         stream_set_timeout($handle, apply_filters('http_request_stream_timeout', $this->timeout) );
 
-        if (! $handle)
+        if ( ! $handle)
             return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
+
+        if ( ! $r['blocking'] )
+            return array( 'headers' => array(), 'body' => '', 'response' => array() );
 
         $strResponse = stream_get_contents($handle);
@@ -575 +587 @@
  *
  * Last ditch effort to retrieve the URL before complete failure.
+ * Does not support non-blocking requests.
  *
  * @package WordPress
@@ -599 +612 @@
             'method' => 'GET', 'timeout' => 3,
             'redirection' => 5, 'httpversion' => '1.0',
-            'user_agent' => apply_filters('http_headers_useragent', 'WordPress/' . $wp_version)
+            'blocking' => true, 'user_agent' => apply_filters('http_headers_useragent', 'WordPress/' . $wp_version)
         );