MFH

diff --git a/NEWS b/NEWS
index ac6c9737d403276a4ee1deee805de4056f1c4eb2..7d8b6cfb780afecbdcf0ca06a57cb6511603e117 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 @@ PHP                                                                        NEWS
 - 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)
 

diff --git a/main/main.c b/main/main.c
index 0dbc80f4518ac034e535ee395ee65a4d6c86ef68..125295bf245c6c00b9557945b9437936067635da 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1734,6 +1734,7 @@ PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC)
 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 @@ PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
                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;
 }
 /* }}} */