Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b9ba8c9

Browse files
Include 'PHP Request Shutdown' in error messages
1 parent c6b5352 commit b9ba8c9

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

‎ext/imap/tests/bug46918.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ array (
7272
'host' => '.SYNTAX-ERROR.',
7373
),
7474
)
75-
Notice: Unknown: Unexpected characters at end of address: @two (errflg=3) in Unknown on line 0
75+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ Warning: imap_open(): Couldn't open stream in %s on line %d
4444

4545
Warning: imap_open(): Retries must be greater or equal to 0 in %s on line %d
4646

47-
Notice: Unknown: Can't open mailbox : no such mailbox (errflg=2) in Unknown on line 0
47+
Notice: PHP Request Shutdown: Can't open mailbox : no such mailbox (errflg=2) in Unknown on line 0

‎ext/session/tests/bug60634.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ echo "um, hi\n";
5353
--EXPECT--
5454
write: goodbye cruel world
5555

56-
Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0
56+
Warning: PHP Request Shutdown: Cannot call session save handler in a recursive manner in Unknown on line 0
5757

58-
Warning: Unknown: Failed to write session data using user defined save handler. (session.save_path: ) in Unknown on line 0
58+
Warning: PHP Request Shutdown: Failed to write session data using user defined save handler. (session.save_path: ) in Unknown on line 0
5959
close: goodbye cruel world

‎ext/session/tests/bug60634_error_3.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ Stack trace:
5050
#1 {main}
5151
thrown in %s on line %d
5252

53-
Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0
53+
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ Stack trace:
5050
#1 {main}
5151
thrown in %s on line %d
5252

53-
Warning: Unknown: Cannot call session save handler in a recursive manner in Unknown on line 0
53+
Warning: PHP Request Shutdown: Cannot call session save handler in a recursive manner in Unknown on line 0

‎main/main.c‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
986986
function = "PHP Shutdown";
987987
} else if (PG(during_request_startup)) {
988988
function = "PHP Request Startup";
989-
} else if (EG(current_execute_data) &&
989+
} else if (EG(current_execute_data) &&
990990
EG(current_execute_data)->func &&
991991
ZEND_USER_CODE(EG(current_execute_data)->func->common.type) &&
992992
EG(current_execute_data)->opline &&
@@ -1013,16 +1013,20 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
10131013
function = "require_once";
10141014
is_function = 1;
10151015
break;
1016-
default:
1017-
function = "Unknown";
10181016
}
10191017
} else {
10201018
function = get_active_function_name();
1021-
if (!function || !strlen(function)) {
1022-
function = "Unknown";
1019+
class_name = get_active_class_name(&space);
1020+
is_function = 1;
1021+
}
1022+
1023+
if (!function || !strlen(function)) {
1024+
is_function = 0;
1025+
1026+
if (EG(flags) & EG_FLAGS_IN_SHUTDOWN) {
1027+
function = "PHP Request Shutdown";
10231028
} else {
1024-
is_function = 1;
1025-
class_name = get_active_class_name(&space);
1029+
function = "Unknown";
10261030
}
10271031
}
10281032

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /