Changeset 12748

Timestamp:

01/17/2010 09:03:56 AM (17 years ago)

Author:

dd32

Message:

Allow WP_HTTP_Fopen to send extra headers and custom user-agents. See #11888

File:

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

trunk/wp-includes/http.php

@@ -838 +838 @@
                         $url = str_replace($arrURL['scheme'], 'http', $url);
 
+                if ( is_null( $r['headers'] ) )
+                        $r['headers'] = array();
+
+                if ( is_string($r['headers']) ) {
+                        $processedHeaders = WP_Http::processHeaders($r['headers']);
+                        $r['headers'] = $processedHeaders['headers'];
+                }
+
+                $initial_user_agent = ini_get('user_agent');
+
+                if ( !empty($r['headers']) && is_array($r['headers']) ) {
+                        $user_agent_extra_headers = '';
+                        foreach ( $r['headers'] as $header => $value )
+                                $user_agent_extra_headers .= "\r\n$header: $value";
+                        @ini_set('user_agent', $r['user-agent'] . $user_agent_extra_headers);
+                } else {
+                        @ini_set('user_agent', $r['user-agent']);
+                }
+
                 if ( !WP_DEBUG )
                         $handle = @fopen($url, 'r');
@@ -852 +871 @@
                 if ( ! $r['blocking'] ) {
                         fclose($handle);
+                        @ini_set('user_agent', $initial_user_agent); //Clean up any extra headers added
                         return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
                 }
@@ -871 +891 @@
 
                 fclose($handle);
+
+                @ini_set('user_agent', $initial_user_agent); //Clean up any extra headers added
 
                 $processedHeaders = WP_Http::processHeaders($theHeaders);