[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src(PHP_5_2) /main main.c
From:       "Andrei Zmievski" <andrei () php ! net>
Date:       2006-05-31 21:48:43
Message-ID: cvsandrei1149112123 () cvsserver
[Download RAW message or body]

andrei		Wed May 31 21:48:43 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/main	main.c 
  Log:
  Revert accidentally committed internal patch
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.23.2.7&r2=1.640.2.23.2.8&diff_format=u
                
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.7 php-src/main/main.c:1.640.2.23.2.8
--- php-src/main/main.c:1.640.2.23.2.7	Wed May 31 17:18:08 2006
+++ php-src/main/main.c	Wed May 31 21:48:43 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.7 2006/05/31 17:18:08 andrei Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.8 2006/05/31 21:48:43 andrei Exp $ */
 
 /* {{{ includes
  */
@@ -759,12 +759,7 @@
 				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 @@
 					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));  }
 			}
 		}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]