Ticket #16236: 16236.diff

Index: wp-includes/class-http.php
===================================================================
--- wp-includes/class-http.php  (revision 17444)
+++ wp-includes/class-http.php  (working copy)
@@ -227,7 +227,9 @@
                        'body' => null,
                        'compress' => false,
                        'decompress' => true,
-                       'sslverify' => true
+                       'sslverify' => true,
+                       'stream' => false,
+                       'filename' => false
                );
 
                $r = wp_parse_args( $args, $defaults );
@@ -255,6 +257,14 @@
                $r['local'] = $homeURL['host'] == $arrURL['host'] || 'localhost' == $arrURL['host'];
                unset( $homeURL );
 
+               if ( $r['stream']  && ! $r['filename'] )
+                       $r['filename'] = basename( $url );
+
+               if ( $r['stream'] ) {
+                       $r['blocking'] = true;
+                       $r['method'] = 'GET';
+               }
+
                if ( is_null( $r['headers'] ) )
                        $r['headers'] = array();
 
@@ -1291,6 +1301,8 @@
  */
 class WP_Http_Curl {
 
+       private $headers;
+
        /**
         * Send a HTTP request to a URI using cURL extension.
         *
@@ -1387,6 +1399,12 @@
                else
                        curl_setopt( $handle, CURLOPT_HEADER, false );
 
+               if ( $r['stream'] ) {
+                       $stream_handle = fopen( get_temp_dir() . $r['filename'], 'w+' );
+                       curl_setopt( $handle, CURLOPT_FILE, $stream_handle );
+                       curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( &$this, 'stream_headers' ) );
+               }
+
                // The option doesn't work with safe mode or when open_basedir is set.
                // Disable HEAD when making HEAD requests.
                if ( !ini_get('safe_mode') && !ini_get('open_basedir') && 'HEAD' != $r['method'] )
@@ -1421,14 +1439,19 @@
 
                if ( !empty($theResponse) ) {
                        $headerLength = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
-                       $theHeaders = trim( substr($theResponse, 0, $headerLength) );
-                       if ( strlen($theResponse) > $headerLength )
-                               $theBody = substr( $theResponse, $headerLength );
-                       else
+                       if ( ! empty( $this->headers ) ) {
+                               $theHeaders = $this->headers;
                                $theBody = '';
-                       if ( false !== strpos($theHeaders, "\r\n\r\n") ) {
-                               $headerParts = explode("\r\n\r\n", $theHeaders);
-                               $theHeaders = $headerParts[ count($headerParts) -1 ];
+                       } else {
+                               $theHeaders = trim( substr($theResponse, 0, $headerLength) );
+                               if ( strlen($theResponse) > $headerLength )
+                                       $theBody = substr( $theResponse, $headerLength );
+                               else
+                                       $theBody = '';
+                               if ( false !== strpos($theHeaders, "\r\n\r\n") ) {
+                                       $headerParts = explode("\r\n\r\n", $theHeaders);
+                                       $theHeaders = $headerParts[ count($headerParts) -1 ];
+                               }
                        }
                        $theHeaders = WP_Http::processHeaders($theHeaders);
                } else {
@@ -1462,6 +1485,11 @@
                return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response, 'cookies' => $theHeaders['cookies']);
        }
 
+       function stream_headers( $handle, $headers ) {
+               $this->headers .= $headers;
+               return strlen($headers);
+       }
+
        /**
         * Whether this class can be used for retrieving an URL.
         *
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php   (revision 17444)
+++ wp-includes/functions.php   (working copy)
@@ -2111,6 +2111,42 @@
 }
 
 /**
+ * Determines a writable directory for temporary files.
+ * Function's preference is to WP_CONTENT_DIR followed by the return value of <code>sys_get_temp_dir()</code>, before finally defaulting to /tmp/
+ *
+ * In the event that this function does not find a writable location, It may be overridden by the <code>WP_TEMP_DIR</code> constant in your <code>wp-config.php</code> file.
+ *
+ * @since 2.5.0
+ *
+ * @return string Writable temporary directory
+ */
+function get_temp_dir() {
+       static $temp;
+       if ( defined('WP_TEMP_DIR') )
+               return trailingslashit(WP_TEMP_DIR);
+
+       if ( $temp )
+               return trailingslashit($temp);
+
+       $temp = WP_CONTENT_DIR . '/';
+       if ( is_dir($temp) && @is_writable($temp) )
+               return $temp;
+
+       if  ( function_exists('sys_get_temp_dir') ) {
+               $temp = sys_get_temp_dir();
+               if ( @is_writable($temp) )
+                       return trailingslashit($temp);
+       }
+
+       $temp = ini_get('upload_tmp_dir');
+       if ( is_dir($temp) && @is_writable($temp) )
+               return trailingslashit($temp);
+
+       $temp = '/tmp/';
+       return $temp;
+}
+
+/**
  * Get an array containing the current upload directory's path and url.
  *
  * Checks the 'upload_path' option, which should be from the web root folder,
Index: wp-admin/includes/file.php
===================================================================
--- wp-admin/includes/file.php  (revision 17444)
+++ wp-admin/includes/file.php  (working copy)
@@ -153,42 +153,6 @@
 }
 
 /**
- * Determines a writable directory for temporary files.
- * Function's preference is to WP_CONTENT_DIR followed by the return value of <code>sys_get_temp_dir()</code>, before finally defaulting to /tmp/
- *
- * In the event that this function does not find a writable location, It may be overridden by the <code>WP_TEMP_DIR</code> constant in your <code>wp-config.php</code> file.
- *
- * @since 2.5.0
- *
- * @return string Writable temporary directory
- */
-function get_temp_dir() {
-       static $temp;
-       if ( defined('WP_TEMP_DIR') )
-               return trailingslashit(WP_TEMP_DIR);
-
-       if ( $temp )
-               return trailingslashit($temp);
-
-       $temp = WP_CONTENT_DIR . '/';
-       if ( is_dir($temp) && @is_writable($temp) )
-               return $temp;
-
-       if  ( function_exists('sys_get_temp_dir') ) {
-               $temp = sys_get_temp_dir();
-               if ( @is_writable($temp) )
-                       return trailingslashit($temp);
-       }
-
-       $temp = ini_get('upload_tmp_dir');
-       if ( is_dir($temp) && @is_writable($temp) )
-               return trailingslashit($temp);
-
-       $temp = '/tmp/';
-       return $temp;
-}
-
-/**
  * Returns a filename of a Temporary unique file.
  * Please note that the calling function must unlink() this itself.
  *