andi Fri Dec 10 18:06:08 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/main main.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.153&r2=1.1760.2.154&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.153 php-src/NEWS:1.1760.2.154
--- php-src/NEWS:1.1760.2.153 Thu Dec 9 20:06:16 2004
+++ php-src/NEWS Fri Dec 10 18:06:04 2004
@@ -1,14 +1,13 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5.0.3
-- Fixed bug #31034 (Problem with non-existing iconv header file). (Derick)
-- Fixed bug #28598 (Lost support for MS Symbol fonts). (Pierre)
- Added the %F modifier to *printf to render a non-locale-aware representation
of a float with the . as decimal seperator. (Derick)
- Fixed error handling in mysqli_multi_query. (Georg)
- Extended the functionality of is_subclass_of() to accept either a class name
or an object as first parameter. (Andrey)
- Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #31034 (Problem with non-existing iconv header file). (Derick)
- Fixed bug #30995 (snmp extension does not build with net-snmp 5.2). (Ilia)
- Fixed bug #30990 (allow popen() on *NIX to accept 'b' flag). (Ilia)
- Fixed bug #30967 (properties in extended mysqli classes don't work). (Georg)
@@ -84,11 +83,14 @@
- Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
- Fixed bug #28817 (Var problem when extending domDocument). (Georg)
- Fixed bug #28599 (strtotime fails with zero base time). (Derick)
+- Fixed bug #28598 (Lost support for MS Symbol fonts). (Pierre)
- Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul
characters). (Moriyoshi)
- Fixed bug #28209 (strtotime("now")). (Derick)
- Fixed bug #27798 (private / protected variables not exposed by
get_object_vars() inside class). (Marcus)
+- Fixed bug #27728 (Can't return within a zend_try {} block or the previous
+ bailout state isn't restored. (Andi)
- Fixed bug #27183 (Userland stream wrapper segfaults on stream_write).
(Christian)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.5&r2=1.604.2.6&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.5 php-src/main/main.c:1.604.2.6
--- php-src/main/main.c:1.604.2.5 Mon Oct 18 06:36:35 2004
+++ php-src/main/main.c Fri Dec 10 18:06:06 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.604.2.5 2004/10/18 10:36:35 hyanantha Exp $ */
+/* $Id: main.c,v 1.604.2.6 2004/12/10 23:06:06 andi Exp $ */
/* {{{ includes
*/
@@ -1734,6 +1734,7 @@
PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
{
zend_op_array *op_array;
+ zend_bool retval = FAILURE;
zend_try {
op_array = zend_compile_file(file, ZEND_INCLUDE TSRMLS_CC);
@@ -1742,13 +1743,11 @@
if (op_array) {
destroy_op_array(op_array TSRMLS_CC);
efree(op_array);
- return SUCCESS;
- } else {
- return FAILURE;
+ retval = SUCCESS;
}
} zend_end_try();
- return FAILURE;
+ return retval;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
