From: Andrei Zmievski <andrei@php.net>
Date: Fri, 15 Oct 1999 19:55:18 +0000 (+0000)
Subject: (php_error): finally get rid of those annoying html tags
X-Git-Tag: php-4.0b3_RC2~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ee9dbea0c20d071aa62aaab11f4454345c06711;p=php

(php_error): finally get rid of those annoying html tags
             when running as CGI binary
---

diff --git a/main/main.c b/main/main.c
index 9e1205ee02..c2c5a49647 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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);
 				}