From: Reeze Xia <reeze@php.net>
Date: Tue, 3 Mar 2015 08:29:41 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb2e62ecda3f3935a076063be66b394ac6831c09;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Improve fix for bug 67741

Conflicts:
	main/main.c
---

bb2e62ecda3f3935a076063be66b394ac6831c09
diff --cc main/main.c
index 4bcf6989e9,f7a768fdd2..3dcba48779
--- a/main/main.c
+++ b/main/main.c
@@@ -2534,10 -2589,12 +2534,12 @@@ PHPAPI int php_execute_script(zend_file
  			int orig_start_lineno = CG(start_lineno);
  
  			CG(start_lineno) = 0;
- 			retval = (zend_execute_scripts(ZEND_REQUIRE, NULL, 1, prepend_file_p) == SUCCESS);
- 			CG(start_lineno) = orig_start_lineno;
- 
- 			retval = retval && (zend_execute_scripts(ZEND_REQUIRE, NULL, 2, primary_file, append_file_p) == SUCCESS);
 -			if (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 1, prepend_file_p) == SUCCESS) {
++			if (zend_execute_scripts(ZEND_REQUIRE, NULL, 1, prepend_file_p) == SUCCESS) {
+ 				CG(start_lineno) = orig_start_lineno;
 -				retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 2, primary_file, append_file_p) == SUCCESS);
++				retval = (zend_execute_scripts(ZEND_REQUIRE, NULL, 2, primary_file, append_file_p) == SUCCESS);
+ 			}
+ 		} else {
 -			retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS);
++			retval = (zend_execute_scripts(ZEND_REQUIRE, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS);
  		}
  	} zend_end_try();