golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@12748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-01-17 09:03:56 +00:00
parent b34906e9ec
commit 5c739a4b9c
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/http.php
View File

@ -837,6 +837,25 @@ class WP_Http_Fopen {
if ( 'http' != $arrURL['scheme'] && 'https' != $arrURL['scheme'] )
$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');
else
@ -851,6 +870,7 @@ class WP_Http_Fopen {
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,6 +891,8 @@ class WP_Http_Fopen {
fclose($handle);
@ini_set('user_agent', $initial_user_agent); //Clean up any extra headers added
$processedHeaders = WP_Http::processHeaders($theHeaders);
if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )