Include 'PHP Request Shutdown' in error messages

Author: ericnorris

ext/imap/tests/bug46918.phpt

@@ -72,4 +72,4 @@ array (
      'host' => '.SYNTAX-ERROR.',
   ),
 )
-Notice: Unknown: Unexpected characters at end of address: @two (errflg=3) in Unknown on line 0
+Notice: PHP Request Shutdown: Unexpected characters at end of address: @two (errflg=3) in Unknown on line 0

ext/imap/tests/imap_open_error.phpt

@@ -44,4 +44,4 @@ Warning: imap_open(): Couldn't open stream  in %s on line %d
 
 Warning: imap_open(): Retries must be greater or equal to 0 in %s on line %d
 
-Notice: Unknown: Can't open mailbox : no such mailbox (errflg=2) in Unknown on line 0
+Notice: PHP Request Shutdown: Can't open mailbox : no such mailbox (errflg=2) in Unknown on line 0

ext/session/tests/bug60634.phpt

@@ -53,7 +53,7 @@ echo "um, hi\n";
 --EXPECT--
 write: goodbye cruel world
 
-Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0
+Warning: PHP Request Shutdown: Cannot call session save handler in a recursive manner in Unknown on line 0
 
-Warning: Unknown: Failed to write session data using user defined save handler. (session.save_path: ) in Unknown on line 0
+Warning: PHP Request Shutdown: Failed to write session data using user defined save handler. (session.save_path: ) in Unknown on line 0
 close: goodbye cruel world

ext/session/tests/bug60634_error_3.phpt

@@ -50,4 +50,4 @@ Stack trace:
 #1 {main}
   thrown in %s on line %d
 
-Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0
+Warning: PHP Request Shutdown: Cannot call session save handler in a recursive manner in Unknown on line 0

ext/session/tests/bug60634_error_4.phpt

@@ -50,4 +50,4 @@ Stack trace:
 #1 {main}
   thrown in %s on line %d
 
-Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0
+Warning: PHP Request Shutdown: Cannot call session save handler in a recursive manner in Unknown on line 0

main/main.c

@@ -986,7 +986,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
 		function = "PHP Shutdown";
 	} else if (PG(during_request_startup)) {
 		function = "PHP Request Startup";
-	} else if (EG(current_execute_data) &&
+    } else if (EG(current_execute_data) &&
 				EG(current_execute_data)->func &&
 				ZEND_USER_CODE(EG(current_execute_data)->func->common.type) &&
 				EG(current_execute_data)->opline &&
@@ -1013,16 +1013,20 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
 				function = "require_once";
 				is_function = 1;
 				break;
-			default:
-				function = "Unknown";
 		}
 	} else {
 		function = get_active_function_name();
-		if (!function || !strlen(function)) {
-			function = "Unknown";
+		class_name = get_active_class_name(&space);
+		is_function = 1;
+	}
+
+	if (!function || !strlen(function)) {
+		is_function = 0;
+
+		if (EG(flags) & EG_FLAGS_IN_SHUTDOWN) {
+			function = "PHP Request Shutdown";
 		} else {
-			is_function = 1;
-			class_name = get_active_class_name(&space);
+			function = "Unknown";
 		}
 	}