diff options
| author | Andrei Zmievski <andrei@php.net> | 2006-05-31 21:48:43 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2006-05-31 21:48:43 +0000 |
| commit | b8ebfce9af2500e2ba0103c380d1650684d59cbd (patch) | |
| tree | da70a24e8dc2ad69be643bba1e879a19d6494685 | |
| parent | d5be48711a59f1c14812f1c6fcbb861be9e3397f (diff) | |
| download | php-git-b8ebfce9af2500e2ba0103c380d1650684d59cbd.tar.gz | |
Revert accidentally committed internal patch
| -rw-r--r-- | main/main.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/main/main.c b/main/main.c index b1d10c7a40..174705ccde 100644 --- a/main/main.c +++ b/main/main.c @@ -759,12 +759,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ MessageBox(NULL, buffer, error_type_str, MB_OK|ZEND_SERVICE_MB_STYLE); } #endif - if (SG(request_info).request_uri) { - char *query_string = SG(request_info).query_string; - spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d [%s%s%s]", error_type_str, buffer, error_filename, error_lineno, SG(request_info).request_uri, query_string?"?":"", STR_PRINT(query_string)); - } else { - spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); - } + spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); php_log_err(log_buffer TSRMLS_CC); efree(log_buffer); } @@ -786,23 +781,13 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ if (type == E_ERROR) { int len; char *buf = php_escape_html_entities(buffer, buffer_len, &len, 0, ENT_COMPAT, NULL TSRMLS_CC); - php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b>", STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno); + php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno, STR_PRINT(append_string)); efree(buf); } else { - php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b>", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno); + php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); } - if (SG(request_info).request_uri) { - char *query_string = SG(request_info).query_string; - php_printf(" [<b>%s%s%s</b>]", SG(request_info).request_uri, query_string?"?":"", STR_PRINT(query_string)); - } - php_printf("<br />\n%s", STR_PRINT(append_string)); } else { - php_printf("%s\n%s: %s in %s on line %d", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno); - if (SG(request_info).request_uri) { - char *query_string = SG(request_info).query_string; - php_printf(" [%s%s%s]", SG(request_info).request_uri, query_string?"?":"", STR_PRINT(query_string)); - } - php_printf("\n%s", STR_PRINT(append_string)); + php_printf("%s\n%s: %s in %s on line %d\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); } } } |