php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert my patches to error functions.

Browse Source
This commit is contained in:
Andrei Zmievski
1999-10-19 19:11:02 +00:00
parent 65b152948e
commit 26c019eaa1
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/main.c
+2 -9
View File
@@ -81,11 +81,6 @@ 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>PHP %s</b>: %s in <b>%s</b> on line <b>%d</b><br>"
#endif
#ifndef ZTS
php_core_globals core_globals;
@@ -333,14 +328,12 @@ void php3_log_err(char *log_message)
}
#endif /*APACHE */
#if 0
#if CGI_BINARY
if (php3_header()) {
fprintf(stderr, log_message);
fprintf(stderr, "\n");
}
#endif
#endif
}
@@ -450,7 +443,7 @@ PHPAPI void php_error(int type, const char *format,...)
if (PG(log_errors)) {
char log_buffer[1024];
snprintf(log_buffer, 1024, PHP_ERROR_FORMAT, error_type_str, buffer, error_filename, error_lineno);
snprintf(log_buffer, 1024, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno);
php3_log_err(log_buffer);
}
if (PG(display_errors)) {
@@ -460,7 +453,7 @@ PHPAPI void php_error(int type, const char *format,...)
if (prepend_string) {
PUTS(prepend_string);
}
php_printf(PHP_ERROR_FORMAT "\n", error_type_str, buffer, error_filename, error_lineno);
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);
if (append_string) {
PUTS(append_string);
}