MFH: Fixed bug #20896 (-s -w modes with php-cli cause php to hang).

diff --git a/NEWS b/NEWS
index af79d61127f1036aef10b92c53f13bafc88e8b69..5f12cc3d0af2ead29f78968198aeeab329b6cc72 100644 (file)
--- 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 42b935f834fac54b690457c0cb621a47f89d4aa1..83ed7f0d4125e3cbc3ff8ae466be7a7b78121bea 100644 (file)
--- 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;
                        }