Changeset 22047

Timestamp:

09/27/2012 06:54:17 AM (12 years ago)

Author:

dd32

Message:

Allow wp_remote_post to send a body consisting of entirely '0', which may be used when PUT'ing or POST'ing data to a API which accepts a raw chunk of data rather than key=value pairs (Such as some REST API's). Fixes #14184

File:

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

trunk/wp-includes/class-http.php

@@ -170 +170 @@
             $r['headers']['Accept-Encoding'] = WP_Http_Encoding::accept_encoding();
 
-        if ( empty($r['body']) ) {
-            $r['body'] = null;
-            // 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;
-        } else {
+        if ( strlen( $r['body'] ) || 'POST' == $r['method'] || 'PUT' == $r['method'] ) {
             if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) {
                 $r['body'] = http_build_query( $r['body'], null, '&' );
+
                 if ( ! isset( $r['headers']['Content-Type'] ) )
                     $r['headers']['Content-Type'] = 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' );
-                $r['headers']['Content-Length'] = strlen( $r['body'] );
             }
+
+            if ( '' === $r['body'] )
+                $r['body'] = null;
 
             if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
@@ -915 +911 @@
         }
 
-        if ( ! empty($r['body'] ) )
+        if ( ! is_null( $r['body'] ) )
             $arrContext['http']['content'] = $r['body'];
 
@@ -1108 +1104 @@
             default:
                 curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-                if ( ! empty( $r['body'] ) )
+                if ( ! is_null( $r['body'] ) )
                     curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
                 break;