Attempting to fix CURLRequest debug issue. #1994

codeigniter4 · May 10, 2019 · aa362d0 · aa362d0
1 parent e218238
commit aa362d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -675,7 +675,7 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 		if (isset($config['debug']))
 		{
 			$curl_options[CURLOPT_VERBOSE] = $config['debug'] === true ? 1 : 0;
-			$curl_options[CURLOPT_STDERR]  = is_bool($config['debug']) ? fopen('php://output', 'w+') : $config['debug'];
+			$curl_options[CURLOPT_STDERR]  = $config['debug'] === true ? fopen('php://output', 'w+') : $config['debug'];
 		}
 
 		// Decode Content

diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
@@ -460,6 +460,15 @@ public function testDebugOption()
 		$this->assertEquals(1, $options[CURLOPT_VERBOSE]);
 
 		$this->assertArrayHasKey(CURLOPT_STDERR, $options);
+		$this->assertTrue(is_resource($options[CURLOPT_STDERR]));
+
+		$this->request->request('get', 'http://example.com', [
+			'debug' => false,
+		]);
+
+		$options = $this->request->curl_options;
+
+		$this->assertFalse($options[CURLOPT_STDERR]);
 	}
 
 	//--------------------------------------------------------------------