diff options
| author | Felipe Pena <felipe@php.net> | 2010-06-27 22:13:41 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-06-27 22:13:41 +0000 |
| commit | ced29dd7065818fbf27d01f50fc3d2792e267d50 (patch) | |
| tree | 1697058593b33466cb6df9438a03110812526d69 | |
| parent | 9b07568c437b081231dcf2b9857c85fa13edfe67 (diff) | |
| download | php-git-ced29dd7065818fbf27d01f50fc3d2792e267d50.tar.gz | |
- Improved initialization
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 09c5b1fd1d..e7b9874591 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -2084,6 +2084,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); @@ -2101,7 +2102,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); } } diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index cf2d2d5582..d303f80756 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -630,7 +630,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); } @@ -1060,6 +1059,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; @@ -1268,6 +1268,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; |