ext/curl: always returns NULL when Content-Type is empty and there is no error

Author: MarcusXavierr

ext/curl/interface.c

@@ -2501,7 +2501,7 @@ PHP_FUNCTION(curl_getinfo)
 				CAAS("content_type", s_code);
 			} else {
 				zval retnull;
-				ZVAL_FALSE(&retnull);
+				ZVAL_NULL(&retnull);
 				CAAZ("content_type", &retnull);
 			}
 		}
@@ -2660,6 +2660,17 @@ PHP_FUNCTION(curl_getinfo)
 					RETURN_FALSE;
 				}
 				break;
+			case CURLINFO_CONTENT_TYPE: {
+				char *s_code = NULL;
+
+				if (curl_easy_getinfo(ch->cp, option, &s_code) == CURLE_OK && s_code) {
+					RETURN_STRING(s_code);
+				} else {
+					RETURN_NULL();
+				}
+				break;
+			}
+
 			default: {
 				int type = CURLINFO_TYPEMASK & option;
 				switch (type) {

ext/curl/tests/bug16929.phpt

@@ -10,6 +10,7 @@ $host = curl_cli_server_start();
 $ch = curl_init();
 $url = "{$host}/get.inc?test=emptycontenttype";
 
+# Validate getinfo with empty Content-Type
 curl_setopt($ch, CURLOPT_URL, $url);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, $url);
 curl_exec($ch);
@@ -21,12 +22,23 @@ var_dump($ct);
 $info = curl_getinfo($ch)['content_type'];
 
 var_dump($info);
-
 curl_close($ch);
 
+# Validate getinfo with non-empty Content-Type
+$ch = curl_init();
+$url = "{$host}/get.inc";
+
+curl_setopt($ch, CURLOPT_URL, $url);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, $url);
+curl_exec($ch);
+
+var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE));
+var_dump(curl_getinfo($ch)['content_type']);
 
 curl_close($ch);
 ?>
 --EXPECTF--
-bool(false)
-bool(false)
+NULL
+NULL
+string(%d) "text/html; charset=UTF-8"
+string(%d) "text/html; charset=UTF-8"