MFB: Reverted previous patches as suggested by Andi.

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index b6c7d22e87a18b42ad97e4c74733bcbd584962ad..a8107f3d5354266543b8f91af4e1314ba48c2c1a 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -375,19 +375,22 @@ static void cli_register_file_handles(TSRMLS_D)
        php_stream_to_zval(s_err, zerr);
        
        ic.value = *zin;
-       ic.flags = CONST_CS;
+       zval_copy_ctor(&ic.value);
+       ic.flags = CONST_CS | CONST_PERSISTENT;
        ic.name = zend_strndup("STDIN", 6);
        ic.name_len = 6;
        zend_register_constant(&ic TSRMLS_CC);
 
        oc.value = *zout;
-       oc.flags = CONST_CS;
+       zval_copy_ctor(&oc.value);
+       oc.flags = CONST_CS | CONST_PERSISTENT;
        oc.name = zend_strndup("STDOUT", 7);
        oc.name_len = 7;
        zend_register_constant(&oc TSRMLS_CC);
 
        ec.value = *zerr;
-       ec.flags = CONST_CS;
+       zval_copy_ctor(&ec.value);
+       ec.flags = CONST_CS | CONST_PERSISTENT;
        ec.name = zend_strndup("STDERR", 7);
        ec.name_len = 7;
        zend_register_constant(&ec TSRMLS_CC);