From 140f4914f29221863a915ccd17607be961824f31 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Thu, 4 Aug 2016 07:13:41 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@38191 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/Requests/Transport/cURL.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/Requests/Transport/cURL.php b/src/wp-includes/Requests/Transport/cURL.php index 36cba510c7..453f73b730 100644 --- a/src/wp-includes/Requests/Transport/cURL.php +++ b/src/wp-includes/Requests/Transport/cURL.php @@ -333,13 +333,6 @@ class Requests_Transport_cURL implements Requests_Transport { curl_setopt($this->handle, CURLOPT_POST, true); 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']); curl_setopt($this->handle, CURLOPT_NOBODY, true); @@ -347,6 +340,15 @@ class Requests_Transport_cURL implements Requests_Transport { case Requests::TRACE: 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 ); + } } // cURL requires a minimum timeout of 1 second when using the system