Commit 042b6c1

committed

Fix some manually registered constants

1 parent 68c45e2 commit 042b6c1Copy full SHA for 042b6c1

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,12 @@ PHP_COM_DOTNET_API zend_result php_com_import_typelib(ITypeLib *TL, int mode, in`
`233`	`233`	`} else {`
`234`	`234`	`c.name = const_name;`
`235`	`235`	`}`
	`236`	`+ zend_string *filename = zend_get_executed_filename_ex();`
	`237`	`+ if (filename == NULL) {`
	`238`	`+ c.filename = NULL;`
	`239`	`+ } else {`
	`240`	`+ c.filename = zend_string_copy(filename);`
	`241`	`+ }`
`236`	`242`	`zend_register_constant(&c);`
`237`	`243`	`}`
`238`	`244`	`ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -546,14 +546,17 @@ static void cli_register_file_handles(void)`
`546`	`546`
`547`	`547`	`Z_CONSTANT_FLAGS(ic.value) = 0;`
`548`	`548`	`ic.name = zend_string_init_interned("STDIN", sizeof("STDIN")-1, 0);`
	`549`	`+ ic.filename = NULL;`
`549`	`550`	`zend_register_constant(&ic);`
`550`	`551`
`551`	`552`	`Z_CONSTANT_FLAGS(oc.value) = 0;`
`552`	`553`	`oc.name = zend_string_init_interned("STDOUT", sizeof("STDOUT")-1, 0);`
	`554`	`+ oc.filename = NULL;`
`553`	`555`	`zend_register_constant(&oc);`
`554`	`556`
`555`	`557`	`Z_CONSTANT_FLAGS(ec.value) = 0;`
`556`	`558`	`ec.name = zend_string_init_interned("STDERR", sizeof("STDERR")-1, 0);`
	`559`	`+ ec.filename = NULL;`
`557`	`560`	`zend_register_constant(&ec);`
`558`	`561`	`}`
`559`	`562`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -914,18 +914,21 @@ void phpdbg_register_file_handles(void) /* {{{ */`
`914`	`914`	`ic.value = zin;`
`915`	`915`	`Z_CONSTANT_FLAGS(ic.value) = 0;`
`916`	`916`	`ic.name = zend_string_init(ZEND_STRL("STDIN"), 0);`
	`917`	`+ ic.filename = NULL;`
`917`	`918`	`zend_hash_del(EG(zend_constants), ic.name);`
`918`	`919`	`zend_register_constant(&ic);`
`919`	`920`
`920`	`921`	`oc.value = zout;`
`921`	`922`	`Z_CONSTANT_FLAGS(oc.value) = 0;`
`922`	`923`	`oc.name = zend_string_init(ZEND_STRL("STDOUT"), 0);`
	`924`	`+ oc.filename = NULL;`
`923`	`925`	`zend_hash_del(EG(zend_constants), oc.name);`
`924`	`926`	`zend_register_constant(&oc);`
`925`	`927`
`926`	`928`	`ec.value = zerr;`
`927`	`929`	`Z_CONSTANT_FLAGS(ec.value) = 0;`
`928`	`930`	`ec.name = zend_string_init(ZEND_STRL("STDERR"), 0);`
	`931`	`+ ec.filename = NULL;`
`929`	`932`	`zend_hash_del(EG(zend_constants), ec.name);`
`930`	`933`	`zend_register_constant(&ec);`
`931`	`934`	`}`

Comments

(0)