Merge branch 'PHP-5.6'

* PHP-5.6:
  Improve fix for bug 67741

Conflicts:
	main/main.c

diff --cc main/main.c
index 4bcf6989e90e621132b5450becbe64e004a9baf6,f7a768fdd282c00c3e58df2331faa8a4b61e4917..3dcba48779c4172aa1f649f5bb4cb3712cf0b53b
--- 1/main/main.c
--- 2/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();