cvs: php4(PHP_4_3) /sapi/cli php_cli.c
| From: | Edin Kadribasic | Date: | Thu, 19 Dec 2002 00:11:32 +0000 |
| Subject: | cvs: php4(PHP_4_3) /sapi/cli php_cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17269@lists.php.net to get a copy of this message | ||
edink Wed Dec 18 19:11:32 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/cli php_cli.c
Log:
Reverted previous patch as suggested by Andi. (reopening #20539).
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.51.2.2 php4/sapi/cli/php_cli.c:1.51.2.3
--- php4/sapi/cli/php_cli.c:1.51.2.2 Wed Dec 11 05:29:07 2002
+++ php4/sapi/cli/php_cli.c Wed Dec 18 19:11:32 2002
@@ -377,19 +377,22 @@
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);