cvs: ZendEngine2(PHP_5_2) / zend.c

pollita         Fri Oct  6 00:02:57 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /ZendEngine2        zend.c 
  Log:
  Revert until 5.2's release since we're in RC stage
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.19&r2=1.308.2.12.2.20&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.19 ZendEngine2/zend.c:1.308.2.12.2.20
--- ZendEngine2/zend.c:1.308.2.12.2.19  Thu Oct  5 23:32:52 2006
+++ ZendEngine2/zend.c  Fri Oct  6 00:02:56 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.c,v 1.308.2.12.2.19 2006/10/05 23:32:52 pollita Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.20 2006/10/06 00:02:56 pollita Exp $ */
 
 #include "zend.h"
 #include "zend_extensions.h"
@@ -1077,7 +1077,6 @@
        int i;
        zend_file_handle *file_handle;
        zend_op_array *orig_op_array = EG(active_op_array);
-       zval **orig_retval_ptr_ptr = EG(return_value_ptr_ptr);
        zval *local_retval=NULL;
 
        va_start(files, file_count);
@@ -1140,13 +1139,11 @@
                } else if (type==ZEND_REQUIRE) {
                        va_end(files);
                        EG(active_op_array) = orig_op_array;
-                       EG(return_value_ptr_ptr) = orig_retval_ptr_ptr;
                        return FAILURE;
                }
        }
        va_end(files);
        EG(active_op_array) = orig_op_array;
-       EG(return_value_ptr_ptr) = orig_retval_ptr_ptr;
 
        return SUCCESS;
 }

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