Changeset 9185

Timestamp:

10/15/08 16:35:35 (2 months ago)

Author:

ryan

Message:

Report curl errors

Files:

• trunk/wp-admin/includes/file.php (modified) (1 diff)
• trunk/wp-includes/http.php (modified) (2 diffs)

trunk/wp-admin/includes/file.php

@@ -424 +424 @@
-function download_url( $url ) {
-    //WARNING: The file is not automatically deleted, The script must unlink() the file.
-
+ 
-        return new WP_Error('http_no_url', __('Invalid URL Provided'));
-
-    $tmpfname = wp_tempnam($url);
-
+ 
-        return new WP_Error('http_no_file', __('Could not create Temporary file'));
-
-    $handle = @fopen($tmpfname, 'w');
-
+ 
-        return new WP_Error('http_no_file', __('Could not create Temporary file'));
-
-    $response = wp_remote_get($url);
-
-
+
+
+
+
+
+
+
-        fclose($handle);
-        unlink($tmpfname);

trunk/wp-includes/http.php

@@ -978 +978 @@
-        $theResponse = curl_exec( $handle );
-
-$theResponse
+!empty($theResponse)
-            $headerLength = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
-            $theHeaders = trim( substr($theResponse, 0, $headerLength) );
@@ -988 +988 @@
-            $theHeaders = WP_Http::processHeaders($theHeaders);
-        } else {
+            if ( $curl_error = curl_error($handle) )
+                return new WP_Error('http_request_failed', $curl_error);
-            if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array(301, 302) ) )
-                return new WP_Error('http_request_failed', __('Too many redirects.'));
+            
-            $theHeaders = array( 'headers' => array() );
-            $theBody = '';