clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Improved initialization

Browse Source
This commit is contained in:
Felipe Pena 2010-06-27 22:13:41 +00:00
parent 3396a6d185
commit 22e2302e78
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sapi/cgi/cgi_main.c
View File

@ -2079,6 +2079,7 @@ consult the installation file that came with this distribution, or visit \n\
}
}
CG(shebang_len) = 0;
if (CGIG(check_shebang_line) && file_handle.handle.fp && (file_handle.handle.fp != stdin)) {
/* #!php support */
c = fgetc(file_handle.handle.fp);
@ -2096,7 +2097,6 @@ consult the installation file that came with this distribution, or visit \n\
CG(shebang_len) = ftell(file_handle.handle.fp);
CG(start_lineno) = 2;
} else {
CG(shebang_len) = 0;
rewind(file_handle.handle.fp);
}
}

3
sapi/cli/php_cli.c
View File

@ -655,7 +655,6 @@ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file,
CG(shebang_len) = ftell(file_handle->handle.fp);
*lineno = 2;
} else {
CG(shebang_len) = 0;
rewind(file_handle->handle.fp);
}
@ -1089,6 +1088,7 @@ int main(int argc, char *argv[])
script_file=argv[php_optind];
php_optind++;
}
CG(shebang_len) = 0;
if (script_file) {
if (cli_seek_file_begin(&file_handle, script_file, &lineno TSRMLS_CC) != SUCCESS) {
goto err;
@ -1328,6 +1328,7 @@ int main(int argc, char *argv[])
exit_status=254;
}
} else {
CG(shebang_len) = 0;
if (script_file) {
if (cli_seek_file_begin(&file_handle, script_file, &lineno TSRMLS_CC) != SUCCESS) {
exit_status = 1;