Changeset 38191

Timestamp:

08/04/2016 07:13:41 AM (8 years ago)

Author:

dd32

Message:

Requests: Merge handling for custom HTTP methods.

This merges the latest changes to Requests from upstream to add support for custom HTTP methods.
See ​https://github.com/rmccue/Requests/commit/1b5ffd8501503e0641b7fa0c555ccf99973135e2

Props Ipstenu, ocean90.
Fixes #37503 for trunk.

File:

• trunk/src/wp-includes/Requests/Transport/cURL.php (modified) (2 diffs)

trunk/src/wp-includes/Requests/Transport/cURL.php

@@ -334 +334 @@
                 curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
                 break;
-            case Requests::PATCH:
-            case Requests::PUT:
-            case Requests::DELETE:
-            case Requests::OPTIONS:
-                curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-                curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
-                break;
             case Requests::HEAD:
                 curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
@@ -348 +341 @@
                 curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
                 break;
+            case Requests::PATCH:
+            case Requests::PUT:
+            case Requests::DELETE:
+            case Requests::OPTIONS:
+            default:
+                curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
+                if (!empty($data)) {
+                    curl_setopt( $this->handle, CURLOPT_POSTFIELDS, $data );
+                }
         }