<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12748] trunk/wp-includes/http.php:
Allow WP_HTTP_Fopen to send extra headers and custom user-agents.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12748">12748</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-01-17 09:03:56 +0000 (Sun, 17 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow WP_HTTP_Fopen to send extra headers and custom user-agents. See <a href="http://trac.wordpress.org/ticket/11888">#11888</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeshttpphp">trunk/wp-includes/http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/http.php (12747 => 12748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/http.php 2010-01-17 08:15:52 UTC (rev 12747)
+++ trunk/wp-includes/http.php 2010-01-17 09:03:56 UTC (rev 12748)
</span><span class="lines">@@ -837,6 +837,25 @@
</span><span class="cx"> if ( 'http' != $arrURL['scheme'] && 'https' != $arrURL['scheme'] )
</span><span class="cx"> $url = str_replace($arrURL['scheme'], 'http', $url);
</span><span class="cx">
</span><ins>+ 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']);
+ }
+
</ins><span class="cx"> if ( !WP_DEBUG )
</span><span class="cx"> $handle = @fopen($url, 'r');
</span><span class="cx"> else
</span><span class="lines">@@ -851,6 +870,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! $r['blocking'] ) {
</span><span class="cx"> fclose($handle);
</span><ins>+ @ini_set('user_agent', $initial_user_agent); //Clean up any extra headers added
</ins><span class="cx"> return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -871,6 +891,8 @@
</span><span class="cx">
</span><span class="cx"> fclose($handle);
</span><span class="cx">
</span><ins>+ @ini_set('user_agent', $initial_user_agent); //Clean up any extra headers added
+
</ins><span class="cx"> $processedHeaders = WP_Http::processHeaders($theHeaders);
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
</span></span></pre>
</div>
</div>
</body>
</html>