Addressing PR feedback

Edison Calle · Edison Calle · commit 20298b333d4b · 2019-09-10T09:58:43.000-04:00
diff --git a/src/org/apache/hadoop/tools/Curl.php b/src/org/apache/hadoop/tools/Curl.php
@@ -213,11 +213,17 @@ private function _exec($options, $returnInfo = false)
             }
         }
         if (!$has_content_length_header && !isset($options[CURLOPT_INFILE]) && !isset($options[CURLOPT_INFILESIZE])) {
-            $length = 0;
             if (isset($options[CURLOPT_POSTFIELDS])) {
-                $length = strlen($options[CURLOPT_POSTFIELDS]);
+                // only for string content
+                if (is_string($options[CURLOPT_POSTFIELDS]) && strpos($options[CURLOPT_POSTFIELDS], '@') !== 0) {
+                    $options[CURLOPT_HTTPHEADER] = array_merge(
+                        $options[CURLOPT_HTTPHEADER],
+                        ['Content-Length: '.strlen($options[CURLOPT_POSTFIELDS])]
+                    );
+                }
+            } else {
+                $options[CURLOPT_HTTPHEADER] = array_merge($options[CURLOPT_HTTPHEADER], ['Content-Length: 0']);
             }
-            $options[CURLOPT_HTTPHEADER] = array_merge($options[CURLOPT_HTTPHEADER], ['Content-Length: ' . $length]);
         }
 
         curl_setopt_array($ch, $options);

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,17 @@ private function _exec($options, $returnInfo = false)`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`	`if (!$has_content_length_header && !isset($options[CURLOPT_INFILE]) && !isset($options[CURLOPT_INFILESIZE])) {`
`216`		`- $length = 0;`
`217`	`216`	`if (isset($options[CURLOPT_POSTFIELDS])) {`
`218`		`- $length = strlen($options[CURLOPT_POSTFIELDS]);`
	`217`	`+ // only for string content`
	`218`	`+ if (is_string($options[CURLOPT_POSTFIELDS]) && strpos($options[CURLOPT_POSTFIELDS], '@') !== 0) {`
	`219`	`+ $options[CURLOPT_HTTPHEADER] = array_merge(`
	`220`	`+ $options[CURLOPT_HTTPHEADER],`
	`221`	`+ ['Content-Length: '.strlen($options[CURLOPT_POSTFIELDS])]`
	`222`	`+ );`
	`223`	`+ }`
	`224`	`+ } else {`
	`225`	`+ $options[CURLOPT_HTTPHEADER] = array_merge($options[CURLOPT_HTTPHEADER], ['Content-Length: 0']);`
`219`	`226`	`}`
`220`		`- $options[CURLOPT_HTTPHEADER] = array_merge($options[CURLOPT_HTTPHEADER], ['Content-Length: ' . $length]);`
`221`	`227`	`}`
`222`	`228`
`223`	`229`	`curl_setopt_array($ch, $options);`