Use standard boolean type as zend_bool typedef

Author: Girgias

Zend/zend_globals.h

@@ -81,7 +81,14 @@ struct _zend_compiler_globals {
 
 	HashTable *auto_globals;
 
-	zend_bool parse_error;
+	/* From zend_language_parser.y:
+	 * CG(parse_error) states:
+		* 0 => yyres = NULL, yystr is the unexpected token
+		* 1 => yyres = NULL, yystr is one of the expected tokens
+		* 2 => yyres != NULL, yystr is the unexpected token
+		* 3 => yyres != NULL, yystr is one of the expected tokens
+	 */
+	unsigned int parse_error;
 	zend_bool in_compilation;
 	zend_bool short_tags;
 

Zend/zend_types.h

@@ -24,6 +24,7 @@
 
 #include "zend_portability.h"
 #include "zend_long.h"
+#include <stdbool.h>
 
 #ifdef __SSE2__
 # include <mmintrin.h>
@@ -46,7 +47,7 @@
 # define ZEND_ENDIAN_LOHI_C_4(a, b, c, d)  a, b, c, d
 #endif
 
-typedef unsigned char zend_bool;
+typedef bool zend_bool;
 typedef unsigned char zend_uchar;
 
 typedef enum {

main/main.c

@@ -447,9 +447,9 @@ static PHP_INI_MH(OnUpdateTimeout)
 
 /* {{{ php_get_display_errors_mode() helper function
  */
-static int php_get_display_errors_mode(char *value, size_t value_length)
+static unsigned int php_get_display_errors_mode(char *value, size_t value_length)
 {
-	int mode;
+	unsigned int mode;
 
 	if (!value) {
 		return PHP_DISPLAY_ERRORS_STDOUT;
@@ -480,7 +480,12 @@ static int php_get_display_errors_mode(char *value, size_t value_length)
  */
 static PHP_INI_MH(OnUpdateDisplayErrors)
 {
-	PG(display_errors) = (zend_bool) php_get_display_errors_mode(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
+	PG(errors_output_stream) = php_get_display_errors_mode(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
+	if (PG(errors_output_stream) > 0) {
+		PG(display_errors) = true;
+	} else {
+		PG(display_errors) = false;
+	}
 
 	return SUCCESS;
 }
@@ -490,7 +495,8 @@ static PHP_INI_MH(OnUpdateDisplayErrors)
  */
 static PHP_INI_DISP(display_errors_mode)
 {
-	int mode, cgi_or_cli;
+	unsigned int mode;
+	bool cgi_or_cli;
 	size_t tmp_value_length;
 	char *tmp_value;
 
@@ -1344,7 +1350,7 @@ static ZEND_COLD void php_error_cb(int orig_type, const char *error_filename, co
 				} else {
 					/* Write CLI/CGI errors to stderr if display_errors = "stderr" */
 					if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi") || !strcmp(sapi_module.name, "phpdbg")) &&
-						PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR
+						PG(errors_output_stream) == PHP_DISPLAY_ERRORS_STDERR
 					) {
 						fprintf(stderr, "%s: %s in %s on line %" PRIu32 "\n", error_type_str, buffer, error_filename, error_lineno);
 #ifdef PHP_WIN32

main/php_globals.h

@@ -65,6 +65,7 @@ struct _php_core_globals {
 	zend_long memory_limit;
 	zend_long max_input_time;
 
+	unsigned int errors_output_stream;
 	zend_bool display_errors;
 	zend_bool display_startup_errors;
 	zend_bool log_errors;