- Reverted fix for bug #48930 (due binary compatibility breakage)

This commit is contained in:
Felipe Pena 2010-06-29 11:37:13 +00:00
parent 865f85718f
commit 96bb25e8e7
7 changed files with 336 additions and 345 deletions

View file

@ -627,7 +627,6 @@ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file,
fseek(file_handle->handle.fp, pos - 1, SEEK_SET);
}
}
CG(shebang_len) = ftell(file_handle->handle.fp);
*lineno = 2;
} else {
rewind(file_handle->handle.fp);
@ -1059,7 +1058,6 @@ 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,7 +1266,6 @@ 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;