mirror of
https://github.com/php/php-src.git
synced 2025-08-18 23:18:56 +02:00
(php_error): finally get rid of those annoying html tags
when running as CGI binary
This commit is contained in:
parent
c671332b29
commit
3ee9dbea0c
1 changed files with 7 additions and 2 deletions
|
@ -81,6 +81,11 @@ struct sapi_request_info *sapi_rqst;
|
|||
#include "php_getopt.h"
|
||||
#endif
|
||||
|
||||
#if CGI_BINARY
|
||||
#define PHP_ERROR_FORMAT "PHP %s: %s in %s on line %d"
|
||||
#else
|
||||
#define PHP_ERROR_FORMAT "<br>\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br>"
|
||||
#endif
|
||||
|
||||
#ifndef ZTS
|
||||
php_core_globals core_globals;
|
||||
|
@ -443,7 +448,7 @@ PHPAPI void php_error(int type, const char *format,...)
|
|||
if (PG(log_errors)) {
|
||||
char log_buffer[1024];
|
||||
|
||||
snprintf(log_buffer, 1024, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno);
|
||||
snprintf(log_buffer, 1024, PHP_ERROR_FORMAT, error_type_str, buffer, error_filename, error_lineno);
|
||||
php3_log_err(log_buffer);
|
||||
}
|
||||
if (PG(display_errors)) {
|
||||
|
@ -453,7 +458,7 @@ PHPAPI void php_error(int type, const char *format,...)
|
|||
if (prepend_string) {
|
||||
PUTS(prepend_string);
|
||||
}
|
||||
php_printf("<br>\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br>\n", error_type_str, buffer, error_filename, error_lineno);
|
||||
php_printf(PHP_ERROR_FORMAT "\n", error_type_str, buffer, error_filename, error_lineno);
|
||||
if (append_string) {
|
||||
PUTS(append_string);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue