iliaa           Tue Aug 12 21:30:40 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/sapi/cli   php_cli.c 
  Log:
  MFH: Fixed bug #20896 (-s -w modes with php-cli cause php to hang).
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.343 php-src/NEWS:1.1247.2.344
--- php-src/NEWS:1.1247.2.343   Mon Aug 11 16:24:58 2003
+++ php-src/NEWS        Tue Aug 12 21:30:38 2003
@@ -22,6 +22,7 @@
 - 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)
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.51.2.27 php-src/sapi/cli/php_cli.c:1.51.2.28
--- php-src/sapi/cli/php_cli.c:1.51.2.27        Fri Aug  1 12:53:03 2003
+++ php-src/sapi/cli/php_cli.c  Tue Aug 12 21:30:39 2003
@@ -829,7 +829,6 @@
                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 @@
                                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;
                        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to