dmitry Tue Sep 2 09:45:36 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/tests/lang bug43958.phpt
Modified files:
/php-src NEWS
/php-src/main main.c
Log:
Fixed Bug #43958 (class name added into the error message)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1210&r2=1.2027.2.547.2.1211&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1210 php-src/NEWS:1.2027.2.547.2.1211
--- php-src/NEWS:1.2027.2.547.2.1210 Tue Sep 2 08:58:00 2008
+++ php-src/NEWS Tue Sep 2 09:45:36 2008
@@ -87,6 +87,7 @@
(Jani)
- Fixed bug #43993 (mb_substr_count() behaves differently to substr_count()
with
overlapping needles). (Moriyoshi)
+- Fixed Bug #43958 (class name added into the error message). (Dmitry)
- Fixed bug #43941 (json_encode silently cuts non-UTF8 strings). (Stas)
- Fixed bug #43782 (feof() does not detect timeout on socket). (David Soria
Parra)
- Fixed bug #43668 (Added odbc.default_cursortype to control the ODBC
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.65&r2=1.640.2.23.2.66&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.65 php-src/main/main.c:1.640.2.23.2.66
--- php-src/main/main.c:1.640.2.23.2.65 Tue Aug 26 23:26:27 2008
+++ php-src/main/main.c Tue Sep 2 09:45:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.65 2008/08/26 23:26:27 jani Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.66 2008/09/02 09:45:36 dmitry Exp $ */
/* {{{ includes
*/
@@ -568,8 +568,8 @@
char *docref_target = "", *docref_root = "";
char *p;
int buffer_len = 0;
- char *space;
- char *class_name = get_active_class_name(&space TSRMLS_CC);
+ char *space = "";
+ char *class_name = "";
char *function;
int origin_len;
char *origin;
@@ -625,6 +625,7 @@
function = "Unknown";
} else {
is_function = 1;
+ class_name = get_active_class_name(&space TSRMLS_CC);
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug43958.phpt?view=markup&rev=1.1
Index: php-src/tests/lang/bug43958.phpt
+++ php-src/tests/lang/bug43958.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
