Ticket #24156: send_filedata_curl.diff

class-http.php

@@ -171 +171 @@
 
                 if ( ( ! is_null( $r['body'] ) && '' != $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'] == 'multipart/form-data' ) ) {
+                                     $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' );
                         }
@@ -180 +181 @@
                         if ( '' === $r['body'] )
                                 $r['body'] = null;
 
-                        if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] ) )
+                        if ( ! isset( $r['headers']['Content-Length'] ) && ! isset( $r['headers']['content-length'] )  && is_string( $r['body'] ) )
                                 $r['headers']['Content-Length'] = strlen( $r['body'] );
                 }