Changeset 11937

Timestamp:

09/15/2009 03:57:49 PM (15 years ago)

Author:

ryan

Message:

Fix content length setup. Props jacobsantos. fixes #10783

File:

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

trunk/wp-includes/http.php

@@ -209 +209 @@
      * @access public
      * @since 2.7.0
+     * @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.
      *
      * @param string $url URI resource.
@@ -278 +283 @@
             $r['headers']['Accept-Encoding'] = WP_Http_Encoding::accept_encoding();
 
-        if ( is_null($r['body']) ) {
-            // Some servers fail when sending content without the content-length
-            // header being set.
-            $r['headers']['Content-Length'] = null;
+        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.
             $transports = WP_Http::_getTransport($r);
         } else {
@@ -296 +307 @@
                 $r['headers']['Content-Length'] = strlen($r['body']);
 
+            // 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.
             $transports = WP_Http::_postTransport($r);
         }