Fix cURL postData, add comments

swoole · May 28, 2020 · ed192f6 · ed192f6
1 parent 1ef7933
commit ed192f6
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/src/core/Curl/Handler.php b/src/core/Curl/Handler.php
@@ -641,9 +641,11 @@ private function execute()
                 $client->setMethod($this->method);
             }
             /*
-             * Infile
+             * Data
              */
             if ($this->infile) {
+                // Infile
+                // Notice: we make its priority higher than postData but raw cURL will send both of them
                 $data = '';
                 while (true) {
                     $nLength = $this->infileSize - strlen($data);
@@ -656,34 +658,33 @@ private function execute()
                     $data .= fread($this->infile, $nLength);
                 }
                 $client->setData($data);
+                // Notice: although we reset it, raw cURL never do this
                 $this->infile = null;
                 $this->infileSize = PHP_INT_MAX;
-            }
-            /*
-             * Upload File
-             */
-            if ($this->postData and is_array($this->postData)) {
-                foreach ($this->postData as $k => $v) {
-                    if ($v instanceof CURLFile) {
-                        $client->addFile($v->getFilename(), $k, $v->getMimeType() ?: 'application/octet-stream', $v->getPostFilename());
-                        unset($this->postData[$k]);
+            } else {
+                // POST data
+                if ($this->postData) {
+                    if (is_string($this->postData)) {
+                        if (empty($this->headers['Content-Type'])) {
+                            $this->headers['Content-Type'] = 'application/x-www-form-urlencoded';
+                        }
+                    } elseif (is_array($this->postData)) {
+                        foreach ($this->postData as $k => $v) {
+                            if ($v instanceof CURLFile) {
+                                $client->addFile($v->getFilename(), $k, $v->getMimeType() ?: 'application/octet-stream', $v->getPostFilename());
+                                unset($this->postData[$k]);
+                            }
+                        }
                     }
                 }
+                $client->setData($this->postData);
             }
             /*
-             * Post Data
-             */
-            if ($this->postData) {
-                if (is_string($this->postData) and empty($this->headers['Content-Type'])) {
-                    $this->headers['Content-Type'] = 'application/x-www-form-urlencoded';
-                }
-            }
-            $client->setData($this->postData);
-            $this->postData = [];
-
-            /*
-             * Http Headers
+             * Headers
              */
+            // Notice: setHeaders must be placed last, because headers may be changed by other parts
+            // As much as possible to ensure that Host is the first header.
+            // See: http://tools.ietf.org/html/rfc7230#section-5.4
             $this->headers['Host'] = $this->urlInfo['host'];
             // remove empty headers (keep same with raw cURL)
             foreach ($this->headers as $headerName => $headerValue) {