From: Ilia Alshanetsky Date: Wed, 13 Aug 2003 01:30:39 +0000 (+0000) Subject: MFH: Fixed bug #20896 (-s -w modes with php-cli cause php to hang). X-Git-Tag: php-4.3.3RC4~39 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=351a686a7c86fb13678da376e0de8ec61dd49257;p=php MFH: Fixed bug #20896 (-s -w modes with php-cli cause php to hang). --- diff --git a/NEWS b/NEWS index af79d61127..5f12cc3d0a 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,7 @@ PHP 4 NEWS - Fixed bug #22245 (References inside $_SESSION not being handled). (Ilia) - Fixed bug #21957 (serialize() mangles objects with __sleep). (Ilia) - Fixed bug #21918 (strange behaviour of mixed type in array-keys). (Marcus) +- Fixed bug #20896 (-s -w modes with php-cli cause php to hang). (Ilia) 07 Aug 2003, Version 4.3.3RC3 - Fixed bug #24958 (Incorrect handling of 404s). (Ilia, Justin) diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 42b935f834..83ed7f0d41 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -829,7 +829,6 @@ int main(int argc, char *argv[]) case PHP_MODE_STRIP: if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) { zend_strip(TSRMLS_C); - fclose(file_handle.handle.fp); } goto out; break; @@ -840,7 +839,6 @@ int main(int argc, char *argv[]) if (open_file_for_scanning(&file_handle TSRMLS_CC)==SUCCESS) { php_get_highlight_struct(&syntax_highlighter_ini); zend_highlight(&syntax_highlighter_ini TSRMLS_CC); - fclose(file_handle.handle.fp); } goto out; }