archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

(php_error): finally get rid of those annoying html tags

Browse source 
when running as CGI binary
This commit is contained in:
Andrei Zmievski 1999-10-15 19:55:18 +00:00
parent c671332b29
commit 3ee9dbea0c
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main/main.c
View file

@ -81,6 +81,11 @@ struct sapi_request_info *sapi_rqst;
#include "php_getopt.h" #include "php_getopt.h"
#endif #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 #ifndef ZTS
php_core_globals core_globals; php_core_globals core_globals;
@ -443,7 +448,7 @@ PHPAPI void php_error(int type, const char *format,...)
if (PG(log_errors)) { if (PG(log_errors)) {
char log_buffer[1024]; 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); php3_log_err(log_buffer);
} }
if (PG(display_errors)) { if (PG(display_errors)) {
@ -453,7 +458,7 @@ PHPAPI void php_error(int type, const char *format,...)
if (prepend_string) { if (prepend_string) {
PUTS(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) { if (append_string) {
PUTS(append_string); PUTS(append_string);
} }