mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
Remove unnecessary usage of CONST_CS
Closes GH-9685.
This commit is contained in:
parent
289822d3ad
commit
77ee92a50c
17 changed files with 58 additions and 60 deletions
|
@ -510,7 +510,7 @@ ZEND_FUNCTION(define)
|
|||
|
||||
register_constant:
|
||||
/* non persistent */
|
||||
ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, PHP_USER_CONSTANT);
|
||||
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
|
||||
c.name = zend_string_copy(name);
|
||||
if (zend_register_constant(&c) == SUCCESS) {
|
||||
RETURN_TRUE;
|
||||
|
|
|
@ -8403,7 +8403,7 @@ static void zend_compile_halt_compiler(zend_ast *ast) /* {{{ */
|
|||
name = zend_mangle_property_name(const_name, sizeof(const_name) - 1,
|
||||
ZSTR_VAL(filename), ZSTR_LEN(filename), 0);
|
||||
|
||||
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), offset, CONST_CS, 0);
|
||||
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), offset, 0, 0);
|
||||
zend_string_release_ex(name, 0);
|
||||
}
|
||||
/* }}} */
|
||||
|
|
|
@ -8044,7 +8044,7 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
|
|||
}
|
||||
}
|
||||
/* non persistent, case sensitive */
|
||||
ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, PHP_USER_CONSTANT);
|
||||
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
|
||||
c.name = zend_string_copy(Z_STR_P(name));
|
||||
|
||||
if (zend_register_constant(&c) == FAILURE) {
|
||||
|
|
2
Zend/zend_vm_execute.h
generated
2
Zend/zend_vm_execute.h
generated
|
@ -7537,7 +7537,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DECLARE_CONST_SPEC_CONST_CONST
|
|||
}
|
||||
}
|
||||
/* non persistent, case sensitive */
|
||||
ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, PHP_USER_CONSTANT);
|
||||
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
|
||||
c.name = zend_string_copy(Z_STR_P(name));
|
||||
|
||||
if (zend_register_constant(&c) == FAILURE) {
|
||||
|
|
|
@ -54,9 +54,9 @@ PHP_MINIT_FUNCTION(my_input_filter)
|
|||
{
|
||||
ZEND_INIT_MODULE_GLOBALS(my_input_filter, php_my_input_filter_init_globals, NULL);
|
||||
|
||||
REGISTER_LONG_CONSTANT("POST", PARSE_POST, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GET", PARSE_GET, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("COOKIE", PARSE_COOKIE, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("POST", PARSE_POST, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GET", PARSE_GET, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("COOKIE", PARSE_COOKIE, CONST_PERSISTENT);
|
||||
|
||||
sapi_register_input_filter(my_sapi_input_filter);
|
||||
return SUCCESS;
|
||||
|
|
|
@ -39,7 +39,6 @@ PHP_METHOD(com, __construct)
|
|||
CLSID clsid;
|
||||
CLSCTX ctx = CLSCTX_SERVER;
|
||||
HRESULT res = E_FAIL;
|
||||
int mode = COMG(autoreg_case_sensitive) ? CONST_CS : 0;
|
||||
ITypeLib *TL = NULL;
|
||||
COSERVERINFO info;
|
||||
COAUTHIDENTITY authid = {0};
|
||||
|
@ -235,7 +234,7 @@ PHP_METHOD(com, __construct)
|
|||
|
||||
if (TL) {
|
||||
if (COMG(autoreg_on)) {
|
||||
php_com_import_typelib(TL, mode, obj->code_page);
|
||||
php_com_import_typelib(TL, 0, obj->code_page);
|
||||
}
|
||||
|
||||
/* cross your fingers... there is no guarantee that this ITypeInfo
|
||||
|
@ -254,7 +253,7 @@ PHP_METHOD(com, __construct)
|
|||
zend_string *typelib_str = php_com_olestring_to_string(name, obj->code_page);
|
||||
|
||||
if (NULL != php_com_cache_typelib(TL, ZSTR_VAL(typelib_str), ZSTR_LEN(typelib_str))) {
|
||||
php_com_import_typelib(TL, mode, obj->code_page);
|
||||
php_com_import_typelib(TL, 0, obj->code_page);
|
||||
|
||||
/* add a reference for the hash */
|
||||
ITypeLib_AddRef(TL);
|
||||
|
@ -262,7 +261,7 @@ PHP_METHOD(com, __construct)
|
|||
zend_string_release_ex(typelib_str, /* persistent */ false);
|
||||
} else {
|
||||
/* try it anyway */
|
||||
php_com_import_typelib(TL, mode, obj->code_page);
|
||||
php_com_import_typelib(TL, 0, obj->code_page);
|
||||
}
|
||||
|
||||
ITypeLib_Release(TL);
|
||||
|
@ -817,7 +816,7 @@ PHP_FUNCTION(com_load_typelib)
|
|||
php_com_initialize();
|
||||
pTL = php_com_load_typelib_via_cache(name, codepage);
|
||||
if (pTL) {
|
||||
if (php_com_import_typelib(pTL, cs ? CONST_CS : 0, codepage) == SUCCESS) {
|
||||
if (php_com_import_typelib(pTL, 0, codepage) == SUCCESS) {
|
||||
RETVAL_TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -101,7 +101,6 @@ static PHP_INI_MH(OnTypeLibFileUpdate)
|
|||
ITypeLib *pTL;
|
||||
char *typelib_name;
|
||||
char *modifier, *ptr;
|
||||
int mode = CONST_CS | CONST_PERSISTENT; /* CONST_PERSISTENT is ok here */
|
||||
|
||||
if (typelib_name_buffer[0]==';') {
|
||||
continue;
|
||||
|
@ -129,7 +128,7 @@ static PHP_INI_MH(OnTypeLibFileUpdate)
|
|||
}
|
||||
|
||||
if ((pTL = php_com_load_typelib_via_cache(typelib_name, COMG(code_page))) != NULL) {
|
||||
php_com_import_typelib(pTL, mode, COMG(code_page));
|
||||
php_com_import_typelib(pTL, CONST_PERSISTENT, COMG(code_page));
|
||||
ITypeLib_Release(pTL);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1186,7 +1186,7 @@ static void mhash_init(INIT_FUNC_ARGS)
|
|||
}
|
||||
|
||||
len = slprintf(buf, 127, "MHASH_%s", algorithm.mhash_name);
|
||||
zend_register_long_constant(buf, len, algorithm.value, CONST_CS | CONST_PERSISTENT, module_number);
|
||||
zend_register_long_constant(buf, len, algorithm.value, CONST_PERSISTENT, module_number);
|
||||
}
|
||||
|
||||
/* TODO: this cause #69823 zend_register_internal_module(&mhash_module_entry); */
|
||||
|
|
|
@ -387,7 +387,7 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script,
|
|||
|
||||
name = zend_mangle_property_name(haltoff, sizeof(haltoff) - 1, ZSTR_VAL(persistent_script->script.filename), ZSTR_LEN(persistent_script->script.filename), 0);
|
||||
if (!zend_hash_exists(EG(zend_constants), name)) {
|
||||
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), persistent_script->compiler_halt_offset, CONST_CS, 0);
|
||||
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), persistent_script->compiler_halt_offset, 0, 0);
|
||||
}
|
||||
zend_string_release_ex(name, 0);
|
||||
}
|
||||
|
|
|
@ -183,18 +183,18 @@ PHP_MINIT_FUNCTION(sodium_password_hash) /* {{{ */ {
|
|||
if (FAILURE == php_password_algo_register("argon2i", &sodium_algo_argon2i)) {
|
||||
return FAILURE;
|
||||
}
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_PERSISTENT);
|
||||
|
||||
if (FAILURE == php_password_algo_register("argon2id", &sodium_algo_argon2id)) {
|
||||
return FAILURE;
|
||||
}
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_PERSISTENT);
|
||||
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_SODIUM_PWHASH_MEMLIMIT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_SODIUM_PWHASH_OPSLIMIT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_SODIUM_PWHASH_THREADS, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_SODIUM_PWHASH_MEMLIMIT, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_SODIUM_PWHASH_OPSLIMIT, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_SODIUM_PWHASH_THREADS, CONST_PERSISTENT);
|
||||
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "sodium", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "sodium", CONST_PERSISTENT);
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
|
|
|
@ -125,50 +125,50 @@ PHP_MINIT_FUNCTION(dir)
|
|||
|
||||
dirsep_str[0] = DEFAULT_SLASH;
|
||||
dirsep_str[1] = '\0';
|
||||
REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", dirsep_str, CONST_CS|CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", dirsep_str, CONST_PERSISTENT);
|
||||
|
||||
pathsep_str[0] = ZEND_PATHS_SEPARATOR;
|
||||
pathsep_str[1] = '\0';
|
||||
REGISTER_STRING_CONSTANT("PATH_SEPARATOR", pathsep_str, CONST_CS|CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PATH_SEPARATOR", pathsep_str, CONST_PERSISTENT);
|
||||
|
||||
REGISTER_LONG_CONSTANT("SCANDIR_SORT_ASCENDING", PHP_SCANDIR_SORT_ASCENDING, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("SCANDIR_SORT_DESCENDING", PHP_SCANDIR_SORT_DESCENDING, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("SCANDIR_SORT_NONE", PHP_SCANDIR_SORT_NONE, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("SCANDIR_SORT_ASCENDING", PHP_SCANDIR_SORT_ASCENDING, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("SCANDIR_SORT_DESCENDING", PHP_SCANDIR_SORT_DESCENDING, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("SCANDIR_SORT_NONE", PHP_SCANDIR_SORT_NONE, CONST_PERSISTENT);
|
||||
|
||||
#ifdef HAVE_GLOB
|
||||
|
||||
#ifdef GLOB_BRACE
|
||||
REGISTER_LONG_CONSTANT("GLOB_BRACE", GLOB_BRACE, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_BRACE", GLOB_BRACE, CONST_PERSISTENT);
|
||||
#else
|
||||
# define GLOB_BRACE 0
|
||||
#endif
|
||||
|
||||
#ifdef GLOB_MARK
|
||||
REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_PERSISTENT);
|
||||
#else
|
||||
# define GLOB_MARK 0
|
||||
#endif
|
||||
|
||||
#ifdef GLOB_NOSORT
|
||||
REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_PERSISTENT);
|
||||
#else
|
||||
# define GLOB_NOSORT 0
|
||||
#endif
|
||||
|
||||
#ifdef GLOB_NOCHECK
|
||||
REGISTER_LONG_CONSTANT("GLOB_NOCHECK", GLOB_NOCHECK, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_NOCHECK", GLOB_NOCHECK, CONST_PERSISTENT);
|
||||
#else
|
||||
# define GLOB_NOCHECK 0
|
||||
#endif
|
||||
|
||||
#ifdef GLOB_NOESCAPE
|
||||
REGISTER_LONG_CONSTANT("GLOB_NOESCAPE", GLOB_NOESCAPE, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_NOESCAPE", GLOB_NOESCAPE, CONST_PERSISTENT);
|
||||
#else
|
||||
# define GLOB_NOESCAPE 0
|
||||
#endif
|
||||
|
||||
#ifdef GLOB_ERR
|
||||
REGISTER_LONG_CONSTANT("GLOB_ERR", GLOB_ERR, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_ERR", GLOB_ERR, CONST_PERSISTENT);
|
||||
#else
|
||||
# define GLOB_ERR 0
|
||||
#endif
|
||||
|
@ -184,8 +184,8 @@ PHP_MINIT_FUNCTION(dir)
|
|||
/* This is used for checking validity of passed flags (passing invalid flags causes segfault in glob()!! */
|
||||
#define GLOB_AVAILABLE_FLAGS (0 | GLOB_BRACE | GLOB_MARK | GLOB_NOSORT | GLOB_NOCHECK | GLOB_NOESCAPE | GLOB_ERR | GLOB_ONLYDIR)
|
||||
|
||||
REGISTER_LONG_CONSTANT("GLOB_ONLYDIR", GLOB_ONLYDIR, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_AVAILABLE_FLAGS", GLOB_AVAILABLE_FLAGS, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_ONLYDIR", GLOB_ONLYDIR, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("GLOB_AVAILABLE_FLAGS", GLOB_AVAILABLE_FLAGS, CONST_PERSISTENT);
|
||||
|
||||
#endif /* HAVE_GLOB */
|
||||
|
||||
|
|
|
@ -416,32 +416,32 @@ const php_password_algo php_password_algo_argon2id = {
|
|||
PHP_MINIT_FUNCTION(password) /* {{{ */
|
||||
{
|
||||
zend_hash_init(&php_password_algos, 4, NULL, ZVAL_PTR_DTOR, 1);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", "2y", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", "2y", CONST_PERSISTENT);
|
||||
|
||||
if (FAILURE == php_password_algo_register("2y", &php_password_algo_bcrypt)) {
|
||||
return FAILURE;
|
||||
}
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_BCRYPT", "2y", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_BCRYPT", "2y", CONST_PERSISTENT);
|
||||
|
||||
#ifdef HAVE_ARGON2LIB
|
||||
if (FAILURE == php_password_algo_register("argon2i", &php_password_algo_argon2i)) {
|
||||
return FAILURE;
|
||||
}
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_PERSISTENT);
|
||||
|
||||
if (FAILURE == php_password_algo_register("argon2id", &php_password_algo_argon2id)) {
|
||||
return FAILURE;
|
||||
}
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_BCRYPT_DEFAULT_COST", PHP_PASSWORD_BCRYPT_COST, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_BCRYPT_DEFAULT_COST", PHP_PASSWORD_BCRYPT_COST, CONST_PERSISTENT);
|
||||
#ifdef HAVE_ARGON2LIB
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_PASSWORD_ARGON2_MEMORY_COST, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_PASSWORD_ARGON2_TIME_COST, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_PASSWORD_ARGON2_THREADS, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_PASSWORD_ARGON2_MEMORY_COST, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_PASSWORD_ARGON2_TIME_COST, CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_PASSWORD_ARGON2_THREADS, CONST_PERSISTENT);
|
||||
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "standard", CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "standard", CONST_PERSISTENT);
|
||||
#endif
|
||||
|
||||
return SUCCESS;
|
||||
|
|
|
@ -2115,13 +2115,13 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
|
|||
|
||||
register_main_symbols(module_number);
|
||||
|
||||
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_CS | CONST_NO_FILE_CACHE);
|
||||
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_NO_FILE_CACHE);
|
||||
|
||||
php_binary_init();
|
||||
if (PG(php_binary)) {
|
||||
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", PG(php_binary), strlen(PG(php_binary)), CONST_PERSISTENT | CONST_CS | CONST_NO_FILE_CACHE);
|
||||
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", PG(php_binary), strlen(PG(php_binary)), CONST_PERSISTENT | CONST_NO_FILE_CACHE);
|
||||
} else {
|
||||
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", "", 0, CONST_PERSISTENT | CONST_CS | CONST_NO_FILE_CACHE);
|
||||
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", "", 0, CONST_PERSISTENT | CONST_NO_FILE_CACHE);
|
||||
}
|
||||
|
||||
/* this will read in php.ini, set up the configuration parameters,
|
||||
|
|
|
@ -182,7 +182,7 @@ struct _php_stream_wrapper {
|
|||
#define PHP_STREAM_FLAG_NO_FCLOSE 0x80
|
||||
|
||||
/* Suppress generation of PHP warnings on stream read/write errors.
|
||||
* Currently for internal use only. */
|
||||
* Currently, for internal use only. */
|
||||
#define PHP_STREAM_FLAG_SUPPRESS_ERRORS 0x100
|
||||
|
||||
/* Do not close handle except it is explicitly closed by user (e.g. fclose) */
|
||||
|
|
|
@ -536,7 +536,7 @@ static void cli_register_file_handles(void)
|
|||
s_out = php_stream_open_wrapper_ex("php://stdout", "wb", 0, NULL, sc_out);
|
||||
s_err = php_stream_open_wrapper_ex("php://stderr", "wb", 0, NULL, sc_err);
|
||||
|
||||
/* Release stream resources, but don't free the underlying handles. Othewrise,
|
||||
/* Release stream resources, but don't free the underlying handles. Otherwise,
|
||||
* extensions which write to stderr or company during mshutdown/gshutdown
|
||||
* won't have the expected functionality.
|
||||
*/
|
||||
|
@ -557,15 +557,15 @@ static void cli_register_file_handles(void)
|
|||
php_stream_to_zval(s_out, &oc.value);
|
||||
php_stream_to_zval(s_err, &ec.value);
|
||||
|
||||
ZEND_CONSTANT_SET_FLAGS(&ic, CONST_CS, 0);
|
||||
Z_CONSTANT_FLAGS(ic.value) = 0;
|
||||
ic.name = zend_string_init_interned("STDIN", sizeof("STDIN")-1, 0);
|
||||
zend_register_constant(&ic);
|
||||
|
||||
ZEND_CONSTANT_SET_FLAGS(&oc, CONST_CS, 0);
|
||||
Z_CONSTANT_FLAGS(oc.value) = 0;
|
||||
oc.name = zend_string_init_interned("STDOUT", sizeof("STDOUT")-1, 0);
|
||||
zend_register_constant(&oc);
|
||||
|
||||
ZEND_CONSTANT_SET_FLAGS(&ec, CONST_CS, 0);
|
||||
Z_CONSTANT_FLAGS(ec.value) = 0;
|
||||
ec.name = zend_string_init_interned("STDERR", sizeof("STDERR")-1, 0);
|
||||
zend_register_constant(&ec);
|
||||
}
|
||||
|
@ -938,7 +938,7 @@ do_repeat:
|
|||
zend_register_bool_constant(
|
||||
ZEND_STRL("PHP_CLI_PROCESS_TITLE"),
|
||||
is_ps_title_available() == PS_TITLE_SUCCESS,
|
||||
CONST_CS, 0);
|
||||
0, 0);
|
||||
|
||||
*arg_excp = arg_free; /* reconstruct argv */
|
||||
|
||||
|
|
|
@ -911,19 +911,19 @@ void phpdbg_register_file_handles(void) /* {{{ */
|
|||
php_stream_to_zval(s_err, &zerr);
|
||||
|
||||
ic.value = zin;
|
||||
ZEND_CONSTANT_SET_FLAGS(&ic, CONST_CS, 0);
|
||||
Z_CONSTANT_FLAGS(ic.value) = 0;
|
||||
ic.name = zend_string_init(ZEND_STRL("STDIN"), 0);
|
||||
zend_hash_del(EG(zend_constants), ic.name);
|
||||
zend_register_constant(&ic);
|
||||
|
||||
oc.value = zout;
|
||||
ZEND_CONSTANT_SET_FLAGS(&oc, CONST_CS, 0);
|
||||
Z_CONSTANT_FLAGS(oc.value) = 0;
|
||||
oc.name = zend_string_init(ZEND_STRL("STDOUT"), 0);
|
||||
zend_hash_del(EG(zend_constants), oc.name);
|
||||
zend_register_constant(&oc);
|
||||
|
||||
ec.value = zerr;
|
||||
ZEND_CONSTANT_SET_FLAGS(&ec, CONST_CS, 0);
|
||||
Z_CONSTANT_FLAGS(ec.value) = 0;
|
||||
ec.name = zend_string_init(ZEND_STRL("STDERR"), 0);
|
||||
zend_hash_del(EG(zend_constants), ec.name);
|
||||
zend_register_constant(&ec);
|
||||
|
|
|
@ -55,8 +55,8 @@ PHP_WINUTIL_API void php_win32_signal_ctrl_handler_init(void)
|
|||
vm_interrupt_flag = &EG(vm_interrupt);
|
||||
ZVAL_UNDEF(&ctrl_handler);
|
||||
|
||||
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_C", CTRL_C_EVENT, CONST_PERSISTENT | CONST_CS);
|
||||
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_BREAK", CTRL_BREAK_EVENT, CONST_PERSISTENT | CONST_CS);
|
||||
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_C", CTRL_C_EVENT, CONST_PERSISTENT);
|
||||
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_BREAK", CTRL_BREAK_EVENT, CONST_PERSISTENT);
|
||||
}/*}}}*/
|
||||
|
||||
PHP_WINUTIL_API void php_win32_signal_ctrl_handler_shutdown(void)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue