archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix missing syntax error message in cli-server router script

Browse source 
Fixes GH-13113
Closes GH-13275
This commit is contained in:
Ilija Tovilo 2024-01-30 17:34:30 +01:00
parent 18cdfd3f51
commit c149b4f56f
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
7 changed files with 97 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
main/main.c
View file

@ -2431,8 +2431,7 @@ void php_module_shutdown(void)
}
/* }}} */
/* {{{ php_execute_script */
PHPAPI bool php_execute_script(zend_file_handle *primary_file)
PHPAPI bool php_execute_script_ex(zend_file_handle *primary_file, zval *retval)
{
zend_file_handle *prepend_file_p = NULL, *append_file_p = NULL;
zend_file_handle prepend_file, append_file;
@ -2442,7 +2441,7 @@ PHPAPI bool php_execute_script(zend_file_handle *primary_file)
char *old_cwd;
ALLOCA_FLAG(use_heap)
#endif
bool retval = false;
bool result = true;
#ifndef HAVE_BROKEN_GETCWD
# define OLD_CWD_SIZE 4096
@ -2501,7 +2500,17 @@ PHPAPI bool php_execute_script(zend_file_handle *primary_file)
zend_set_timeout(INI_INT("max_execution_time"), 0);
}
retval = (zend_execute_scripts(ZEND_REQUIRE, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS);
if (prepend_file_p && result) {
result = zend_execute_script(ZEND_REQUIRE, NULL, prepend_file_p) == SUCCESS;
}
if (result) {
result = zend_execute_script(ZEND_REQUIRE, retval, primary_file) == SUCCESS;
}
if (append_file_p && result) {
result = zend_execute_script(ZEND_REQUIRE, NULL, append_file_p) == SUCCESS;
}
} zend_catch {
result = false;
} zend_end_try();
if (prepend_file_p) {
@ -2529,7 +2538,13 @@ PHPAPI bool php_execute_script(zend_file_handle *primary_file)
}
free_alloca(old_cwd, use_heap);
#endif
return retval;
return result;
}
/* {{{ php_execute_script */
PHPAPI bool php_execute_script(zend_file_handle *primary_file)
{
return php_execute_script_ex(primary_file, NULL);
}
/* }}} */