<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11937] trunk/wp-includes/http.php: Fix content length setup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11937">11937</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-09-15 15:57:49 +0000 (Tue, 15 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix content length setup. Props jacobsantos. fixes <a href="http://trac.wordpress.org/ticket/10783">#10783</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 (11936 => 11937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/http.php 2009-09-15 15:40:17 UTC (rev 11936)
+++ trunk/wp-includes/http.php 2009-09-15 15:57:49 UTC (rev 11937)
</span><span class="lines">@@ -208,6 +208,11 @@
</span><span class="cx"> *
</span><span class="cx"> * @access public
</span><span class="cx"> * @since 2.7.0
</span><ins>+ * @todo Refactor this code. The code in this method extends the scope of its original purpose
+ * and should be refactored to allow for cleaner abstraction and reduce duplication of the
+ * code. One suggestion is to create a class specifically for the arguments, however
+ * preliminary refactoring to this affect has affect more than just the scope of the
+ * arguments. Something to ponder at least.
</ins><span class="cx"> *
</span><span class="cx"> * @param string $url URI resource.
</span><span class="cx"> * @param str|array $args Optional. Override the defaults.
</span><span class="lines">@@ -277,10 +282,16 @@
</span><span class="cx"> if ( WP_Http_Encoding::is_available() )
</span><span class="cx"> $r['headers']['Accept-Encoding'] = WP_Http_Encoding::accept_encoding();
</span><span class="cx">
</span><del>- if ( is_null($r['body']) ) {
- // Some servers fail when sending content without the content-length
- // header being set.
- $r['headers']['Content-Length'] = null;
</del><ins>+ if ( empty($r['body']) ) {
+ // Some servers fail when sending content without the content-length header being set.
+ // Also, to fix another bug, we only send when doing POST and PUT and the content-length
+ // header isn't already set.
+ if( ($r['method'] == 'POST' || $r['method'] == 'PUT') && ! isset($r['headers']['Content-Length']) )
+ $r['headers']['Content-Length'] = 0;
+
+ // The method is ambiguous, because we aren't talking about HTTP methods, the "get" in
+ // this case is simply that we aren't sending any bodies and to get the transports that
+ // don't support sending bodies along with those which do.
</ins><span class="cx"> $transports = WP_Http::_getTransport($r);
</span><span class="cx"> } else {
</span><span class="cx"> if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
</span><span class="lines">@@ -295,6 +306,10 @@
</span><span class="cx"> if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
</span><span class="cx"> $r['headers']['Content-Length'] = strlen($r['body']);
</span><span class="cx">
</span><ins>+ // The method is ambiguous, because we aren't talking about HTTP methods, the "post" in
+ // this case is simply that we are sending HTTP body and to get the transports that do
+ // support sending the body. Not all do, depending on the limitations of the PHP core
+ // limitations.
</ins><span class="cx"> $transports = WP_Http::_postTransport($r);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>