Changeset 24918 for branches/3.6

Timestamp:

07/31/2013 06:53:06 AM (11 years ago)

Author:

nacin

Message:

Use wp_safe_remote_request() and friends instead of reject_unsafe_urls = true.

Merges [24917] to the 3.6 branch.
fixes #24646.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-admin/includes/class-wp-importer.php (modified) (2 diffs)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-includes/class-feed.php (modified) (2 diffs)
• wp-includes/class-oembed.php (modified) (2 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (1 diff)
• wp-includes/comment.php (modified) (4 diffs)
• wp-includes/functions.php (modified) (4 diffs)
• wp-includes/rss.php (modified) (1 diff)

branches/3.6/wp-admin/includes/class-wp-importer.php

@@ -184 +184 @@
         $headers = array();
         $args = array();
-        $args['reject_unsafe_urls'] = true;
         if ( true === $head )
             $args['method'] = 'HEAD';
@@ -192 +191 @@
         $args['headers'] = $headers;
 
-        return wp_remote_request( $url, $args );
+        return wp_safe_remote_request( $url, $args );
     }
 

branches/3.6/wp-admin/includes/file.php

@@ -498 +498 @@
         return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 
-    $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname, 'reject_unsafe_urls' => true ) );
+    $response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
 
     if ( is_wp_error( $response ) ) {

branches/3.6/wp-includes/class-feed.php

@@ -70 +70 @@
                 'timeout' => $this->timeout,
                 'redirection' => $this->redirects,
-                'reject_unsafe_urls' => true,
             );
 
@@ -79 +78 @@
                 $args['user-agent'] = $this->useragent;
 
-            $res = wp_remote_request($url, $args);
+            $res = wp_safe_remote_request($url, $args);
 
             if ( is_wp_error($res) ) {

branches/3.6/wp-includes/class-oembed.php

@@ -114 +114 @@
 
         // Fetch URL content
-        if ( $html = wp_remote_retrieve_body( wp_remote_get( $url, array( 'reject_unsafe_urls' => true ) ) ) ) {
+        if ( $html = wp_remote_retrieve_body( wp_safe_remote_get( $url ) ) ) {
 
             // <link> types that contain oEmbed provider URLs
@@ -196 +196 @@
     function _fetch_with_format( $provider_url_with_args, $format ) {
         $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
-        $response = wp_remote_get( $provider_url_with_args, array( 'reject_unsafe_urls' => true ) );
+        $response = wp_safe_remote_get( $provider_url_with_args );
         if ( 501 == wp_remote_retrieve_response_code( $response ) )
             return new WP_Error( 'not-implemented' );

branches/3.6/wp-includes/class-wp-xmlrpc-server.php

@@ -5393 +5393 @@
             'timeout' => 10,
             'redirection' => 0,
-            'reject_unsafe_urls' => true,
             'limit_response_size' => 153600, // 150 KB
         );
-        $linea = wp_remote_retrieve_body( wp_remote_get( $pagelinkedfrom, $http_api_args ) );
+        $linea = wp_remote_retrieve_body( wp_safe_remote_get( $pagelinkedfrom, $http_api_args ) );
 
         if ( !$linea )

branches/3.6/wp-includes/comment.php

@@ -1659 +1659 @@
         return false;
 
-    $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) );
+    $response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
     if ( is_wp_error( $response ) )
@@ -1672 +1672 @@
 
     // Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
-    $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) );
+    $response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
     if ( is_wp_error( $response ) )
@@ -1907 +1907 @@
     $options = array();
     $options['timeout'] = 4;
-    $options['reject_unsafe_urls'] = true;
     $options['body'] = array(
         'title' => $title,
@@ -1915 +1914 @@
     );
 
-    $response = wp_remote_post($trackback_url, $options);
+    $response = wp_safe_remote_post( $trackback_url, $options );
 
     if ( is_wp_error( $response ) )

branches/3.6/wp-includes/functions.php

@@ -497 +497 @@
     $options = array();
     $options['redirection'] = 5;
-    $options['reject_unsafe_urls'] = true;
 
     if ( false == $file_path )
@@ -504 +503 @@
         $options['method'] = 'GET';
 
-    $response = wp_remote_request($url, $options);
+    $response = wp_safe_remote_request( $url, $options );
 
     if ( is_wp_error( $response ) )
@@ -545 +544 @@
         _deprecated_argument( __FUNCTION__, '2.7' );
 
-    $response = wp_remote_head( $url, array( 'reject_unsafe_urls' => true ) );
+    $response = wp_safe_remote_head( $url );
 
     if ( is_wp_error( $response ) )
@@ -760 +759 @@
     $options = array();
     $options['timeout'] = 10;
-    $options['reject_unsafe_urls'] = true;
-
-    $response = wp_remote_get( $uri, $options );
+
+    $response = wp_safe_remote_get( $uri, $options );
 
     if ( is_wp_error( $response ) )

branches/3.6/wp-includes/rss.php

@@ -537 +537 @@
  */
 function _fetch_remote_file($url, $headers = "" ) {
-    $resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT, 'reject_unsafe_urls' => true ));
+    $resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
     if ( is_wp_error($resp) ) {
         $error = array_shift($resp->errors);