Skip to content

Commit 77ee92a

Browse files
jorgsowajorgsowa
authored
Remove unnecessary usage of CONST_CS
Closes GH-9685.
1 parent 289822d commit 77ee92a

17 files changed

+58
-60
lines changed

Diff for: ‎Zend/zend_builtin_functions.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ ZEND_FUNCTION(define)
510510

511511
register_constant:
512512
/* non persistent */
513-
ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, PHP_USER_CONSTANT);
513+
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
514514
c.name = zend_string_copy(name);
515515
if (zend_register_constant(&c) == SUCCESS) {
516516
RETURN_TRUE;

Diff for: ‎Zend/zend_compile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8403,7 +8403,7 @@ static void zend_compile_halt_compiler(zend_ast *ast) /* {{{ */
84038403
name = zend_mangle_property_name(const_name, sizeof(const_name) - 1,
84048404
ZSTR_VAL(filename), ZSTR_LEN(filename), 0);
84058405

8406-
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), offset, CONST_CS, 0);
8406+
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), offset, 0, 0);
84078407
zend_string_release_ex(name, 0);
84088408
}
84098409
/* }}} */

Diff for: ‎Zend/zend_vm_def.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -6049,7 +6049,7 @@ ZEND_VM_C_LABEL(add_unpack_again):
60496049
if (EXPECTED(Z_TYPE_P(op1) == IS_ARRAY)) {
60506050
HashTable *ht = Z_ARRVAL_P(op1);
60516051
zval *val;
6052-
6052+
60536053
if (HT_IS_PACKED(ht) && (zend_hash_num_elements(result_ht) == 0 || HT_IS_PACKED(result_ht))) {
60546054
zend_hash_extend(result_ht, zend_hash_num_elements(result_ht) + zend_hash_num_elements(ht), 1);
60556055
ZEND_HASH_FILL_PACKED(result_ht) {
@@ -7616,7 +7616,7 @@ ZEND_VM_HOT_NOCONST_HANDLER(198, ZEND_JMP_NULL, CONST|TMP|VAR|CV, JMP_ADDR)
76167616
uint32_t short_circuiting_type = opline->extended_value & ZEND_SHORT_CIRCUITING_CHAIN_MASK;
76177617
if (EXPECTED(short_circuiting_type == ZEND_SHORT_CIRCUITING_CHAIN_EXPR)) {
76187618
ZVAL_NULL(result);
7619-
if (OP1_TYPE == IS_CV
7619+
if (OP1_TYPE == IS_CV
76207620
&& UNEXPECTED(Z_TYPE_P(val) == IS_UNDEF)
76217621
&& (opline->extended_value & ZEND_JMP_NULL_BP_VAR_IS) == 0
76227622
) {
@@ -8044,7 +8044,7 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
80448044
}
80458045
}
80468046
/* non persistent, case sensitive */
8047-
ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, PHP_USER_CONSTANT);
8047+
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
80488048
c.name = zend_string_copy(Z_STR_P(name));
80498049

80508050
if (zend_register_constant(&c) == FAILURE) {

Diff for: ‎Zend/zend_vm_execute.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎docs/input-filter.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ PHP_MINIT_FUNCTION(my_input_filter)
5454
{
5555
ZEND_INIT_MODULE_GLOBALS(my_input_filter, php_my_input_filter_init_globals, NULL);
5656

57-
REGISTER_LONG_CONSTANT("POST", PARSE_POST, CONST_CS | CONST_PERSISTENT);
58-
REGISTER_LONG_CONSTANT("GET", PARSE_GET, CONST_CS | CONST_PERSISTENT);
59-
REGISTER_LONG_CONSTANT("COOKIE", PARSE_COOKIE, CONST_CS | CONST_PERSISTENT);
57+
REGISTER_LONG_CONSTANT("POST", PARSE_POST, CONST_PERSISTENT);
58+
REGISTER_LONG_CONSTANT("GET", PARSE_GET, CONST_PERSISTENT);
59+
REGISTER_LONG_CONSTANT("COOKIE", PARSE_COOKIE, CONST_PERSISTENT);
6060

6161
sapi_register_input_filter(my_sapi_input_filter);
6262
return SUCCESS;

Diff for: ‎ext/com_dotnet/com_com.c

+4-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ PHP_METHOD(com, __construct)
3939
CLSID clsid;
4040
CLSCTX ctx = CLSCTX_SERVER;
4141
HRESULT res = E_FAIL;
42-
int mode = COMG(autoreg_case_sensitive) ? CONST_CS : 0;
4342
ITypeLib *TL = NULL;
4443
COSERVERINFO info;
4544
COAUTHIDENTITY authid = {0};
@@ -235,7 +234,7 @@ PHP_METHOD(com, __construct)
235234

236235
if (TL) {
237236
if (COMG(autoreg_on)) {
238-
php_com_import_typelib(TL, mode, obj->code_page);
237+
php_com_import_typelib(TL, 0, obj->code_page);
239238
}
240239

241240
/* cross your fingers... there is no guarantee that this ITypeInfo
@@ -254,15 +253,15 @@ PHP_METHOD(com, __construct)
254253
zend_string *typelib_str = php_com_olestring_to_string(name, obj->code_page);
255254

256255
if (NULL != php_com_cache_typelib(TL, ZSTR_VAL(typelib_str), ZSTR_LEN(typelib_str))) {
257-
php_com_import_typelib(TL, mode, obj->code_page);
256+
php_com_import_typelib(TL, 0, obj->code_page);
258257

259258
/* add a reference for the hash */
260259
ITypeLib_AddRef(TL);
261260
}
262261
zend_string_release_ex(typelib_str, /* persistent */ false);
263262
} else {
264263
/* try it anyway */
265-
php_com_import_typelib(TL, mode, obj->code_page);
264+
php_com_import_typelib(TL, 0, obj->code_page);
266265
}
267266

268267
ITypeLib_Release(TL);
@@ -817,7 +816,7 @@ PHP_FUNCTION(com_load_typelib)
817816
php_com_initialize();
818817
pTL = php_com_load_typelib_via_cache(name, codepage);
819818
if (pTL) {
820-
if (php_com_import_typelib(pTL, cs ? CONST_CS : 0, codepage) == SUCCESS) {
819+
if (php_com_import_typelib(pTL, 0, codepage) == SUCCESS) {
821820
RETVAL_TRUE;
822821
}
823822

Diff for: ‎ext/com_dotnet/com_extension.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ static PHP_INI_MH(OnTypeLibFileUpdate)
101101
ITypeLib *pTL;
102102
char *typelib_name;
103103
char *modifier, *ptr;
104-
int mode = CONST_CS | CONST_PERSISTENT; /* CONST_PERSISTENT is ok here */
105104

106105
if (typelib_name_buffer[0]==';') {
107106
continue;
@@ -129,7 +128,7 @@ static PHP_INI_MH(OnTypeLibFileUpdate)
129128
}
130129

131130
if ((pTL = php_com_load_typelib_via_cache(typelib_name, COMG(code_page))) != NULL) {
132-
php_com_import_typelib(pTL, mode, COMG(code_page));
131+
php_com_import_typelib(pTL, CONST_PERSISTENT, COMG(code_page));
133132
ITypeLib_Release(pTL);
134133
}
135134
}

Diff for: ‎ext/hash/hash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ static void mhash_init(INIT_FUNC_ARGS)
11861186
}
11871187

11881188
len = slprintf(buf, 127, "MHASH_%s", algorithm.mhash_name);
1189-
zend_register_long_constant(buf, len, algorithm.value, CONST_CS | CONST_PERSISTENT, module_number);
1189+
zend_register_long_constant(buf, len, algorithm.value, CONST_PERSISTENT, module_number);
11901190
}
11911191

11921192
/* TODO: this cause #69823 zend_register_internal_module(&mhash_module_entry); */

Diff for: ‎ext/opcache/zend_accelerator_util_funcs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script,
387387

388388
name = zend_mangle_property_name(haltoff, sizeof(haltoff) - 1, ZSTR_VAL(persistent_script->script.filename), ZSTR_LEN(persistent_script->script.filename), 0);
389389
if (!zend_hash_exists(EG(zend_constants), name)) {
390-
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), persistent_script->compiler_halt_offset, CONST_CS, 0);
390+
zend_register_long_constant(ZSTR_VAL(name), ZSTR_LEN(name), persistent_script->compiler_halt_offset, 0, 0);
391391
}
392392
zend_string_release_ex(name, 0);
393393
}

Diff for: ‎ext/sodium/sodium_pwhash.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,18 @@ PHP_MINIT_FUNCTION(sodium_password_hash) /* {{{ */ {
183183
if (FAILURE == php_password_algo_register("argon2i", &sodium_algo_argon2i)) {
184184
return FAILURE;
185185
}
186-
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_CS | CONST_PERSISTENT);
186+
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_PERSISTENT);
187187

188188
if (FAILURE == php_password_algo_register("argon2id", &sodium_algo_argon2id)) {
189189
return FAILURE;
190190
}
191-
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_CS | CONST_PERSISTENT);
191+
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_PERSISTENT);
192192

193-
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_SODIUM_PWHASH_MEMLIMIT, CONST_CS | CONST_PERSISTENT);
194-
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_SODIUM_PWHASH_OPSLIMIT, CONST_CS | CONST_PERSISTENT);
195-
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_SODIUM_PWHASH_THREADS, CONST_CS | CONST_PERSISTENT);
193+
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_SODIUM_PWHASH_MEMLIMIT, CONST_PERSISTENT);
194+
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_SODIUM_PWHASH_OPSLIMIT, CONST_PERSISTENT);
195+
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_SODIUM_PWHASH_THREADS, CONST_PERSISTENT);
196196

197-
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "sodium", CONST_CS | CONST_PERSISTENT);
197+
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "sodium", CONST_PERSISTENT);
198198

199199
return SUCCESS;
200200
}

Diff for: ‎ext/standard/dir.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -125,50 +125,50 @@ PHP_MINIT_FUNCTION(dir)
125125

126126
dirsep_str[0] = DEFAULT_SLASH;
127127
dirsep_str[1] = '\0';
128-
REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", dirsep_str, CONST_CS|CONST_PERSISTENT);
128+
REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", dirsep_str, CONST_PERSISTENT);
129129

130130
pathsep_str[0] = ZEND_PATHS_SEPARATOR;
131131
pathsep_str[1] = '\0';
132-
REGISTER_STRING_CONSTANT("PATH_SEPARATOR", pathsep_str, CONST_CS|CONST_PERSISTENT);
132+
REGISTER_STRING_CONSTANT("PATH_SEPARATOR", pathsep_str, CONST_PERSISTENT);
133133

134-
REGISTER_LONG_CONSTANT("SCANDIR_SORT_ASCENDING", PHP_SCANDIR_SORT_ASCENDING, CONST_CS | CONST_PERSISTENT);
135-
REGISTER_LONG_CONSTANT("SCANDIR_SORT_DESCENDING", PHP_SCANDIR_SORT_DESCENDING, CONST_CS | CONST_PERSISTENT);
136-
REGISTER_LONG_CONSTANT("SCANDIR_SORT_NONE", PHP_SCANDIR_SORT_NONE, CONST_CS | CONST_PERSISTENT);
134+
REGISTER_LONG_CONSTANT("SCANDIR_SORT_ASCENDING", PHP_SCANDIR_SORT_ASCENDING, CONST_PERSISTENT);
135+
REGISTER_LONG_CONSTANT("SCANDIR_SORT_DESCENDING", PHP_SCANDIR_SORT_DESCENDING, CONST_PERSISTENT);
136+
REGISTER_LONG_CONSTANT("SCANDIR_SORT_NONE", PHP_SCANDIR_SORT_NONE, CONST_PERSISTENT);
137137

138138
#ifdef HAVE_GLOB
139139

140140
#ifdef GLOB_BRACE
141-
REGISTER_LONG_CONSTANT("GLOB_BRACE", GLOB_BRACE, CONST_CS | CONST_PERSISTENT);
141+
REGISTER_LONG_CONSTANT("GLOB_BRACE", GLOB_BRACE, CONST_PERSISTENT);
142142
#else
143143
# define GLOB_BRACE 0
144144
#endif
145145

146146
#ifdef GLOB_MARK
147-
REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_CS | CONST_PERSISTENT);
147+
REGISTER_LONG_CONSTANT("GLOB_MARK", GLOB_MARK, CONST_PERSISTENT);
148148
#else
149149
# define GLOB_MARK 0
150150
#endif
151151

152152
#ifdef GLOB_NOSORT
153-
REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_CS | CONST_PERSISTENT);
153+
REGISTER_LONG_CONSTANT("GLOB_NOSORT", GLOB_NOSORT, CONST_PERSISTENT);
154154
#else
155155
# define GLOB_NOSORT 0
156156
#endif
157157

158158
#ifdef GLOB_NOCHECK
159-
REGISTER_LONG_CONSTANT("GLOB_NOCHECK", GLOB_NOCHECK, CONST_CS | CONST_PERSISTENT);
159+
REGISTER_LONG_CONSTANT("GLOB_NOCHECK", GLOB_NOCHECK, CONST_PERSISTENT);
160160
#else
161161
# define GLOB_NOCHECK 0
162162
#endif
163163

164164
#ifdef GLOB_NOESCAPE
165-
REGISTER_LONG_CONSTANT("GLOB_NOESCAPE", GLOB_NOESCAPE, CONST_CS | CONST_PERSISTENT);
165+
REGISTER_LONG_CONSTANT("GLOB_NOESCAPE", GLOB_NOESCAPE, CONST_PERSISTENT);
166166
#else
167167
# define GLOB_NOESCAPE 0
168168
#endif
169169

170170
#ifdef GLOB_ERR
171-
REGISTER_LONG_CONSTANT("GLOB_ERR", GLOB_ERR, CONST_CS | CONST_PERSISTENT);
171+
REGISTER_LONG_CONSTANT("GLOB_ERR", GLOB_ERR, CONST_PERSISTENT);
172172
#else
173173
# define GLOB_ERR 0
174174
#endif
@@ -184,8 +184,8 @@ PHP_MINIT_FUNCTION(dir)
184184
/* This is used for checking validity of passed flags (passing invalid flags causes segfault in glob()!! */
185185
#define GLOB_AVAILABLE_FLAGS (0 | GLOB_BRACE | GLOB_MARK | GLOB_NOSORT | GLOB_NOCHECK | GLOB_NOESCAPE | GLOB_ERR | GLOB_ONLYDIR)
186186

187-
REGISTER_LONG_CONSTANT("GLOB_ONLYDIR", GLOB_ONLYDIR, CONST_CS | CONST_PERSISTENT);
188-
REGISTER_LONG_CONSTANT("GLOB_AVAILABLE_FLAGS", GLOB_AVAILABLE_FLAGS, CONST_CS | CONST_PERSISTENT);
187+
REGISTER_LONG_CONSTANT("GLOB_ONLYDIR", GLOB_ONLYDIR, CONST_PERSISTENT);
188+
REGISTER_LONG_CONSTANT("GLOB_AVAILABLE_FLAGS", GLOB_AVAILABLE_FLAGS, CONST_PERSISTENT);
189189

190190
#endif /* HAVE_GLOB */
191191

Diff for: ‎ext/standard/password.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -416,32 +416,32 @@ const php_password_algo php_password_algo_argon2id = {
416416
PHP_MINIT_FUNCTION(password) /* {{{ */
417417
{
418418
zend_hash_init(&php_password_algos, 4, NULL, ZVAL_PTR_DTOR, 1);
419-
REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", "2y", CONST_CS | CONST_PERSISTENT);
419+
REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", "2y", CONST_PERSISTENT);
420420

421421
if (FAILURE == php_password_algo_register("2y", &php_password_algo_bcrypt)) {
422422
return FAILURE;
423423
}
424-
REGISTER_STRING_CONSTANT("PASSWORD_BCRYPT", "2y", CONST_CS | CONST_PERSISTENT);
424+
REGISTER_STRING_CONSTANT("PASSWORD_BCRYPT", "2y", CONST_PERSISTENT);
425425

426426
#ifdef HAVE_ARGON2LIB
427427
if (FAILURE == php_password_algo_register("argon2i", &php_password_algo_argon2i)) {
428428
return FAILURE;
429429
}
430-
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_CS | CONST_PERSISTENT);
430+
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2I", "argon2i", CONST_PERSISTENT);
431431

432432
if (FAILURE == php_password_algo_register("argon2id", &php_password_algo_argon2id)) {
433433
return FAILURE;
434434
}
435-
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_CS | CONST_PERSISTENT);
435+
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2ID", "argon2id", CONST_PERSISTENT);
436436
#endif
437437

438-
REGISTER_LONG_CONSTANT("PASSWORD_BCRYPT_DEFAULT_COST", PHP_PASSWORD_BCRYPT_COST, CONST_CS | CONST_PERSISTENT);
438+
REGISTER_LONG_CONSTANT("PASSWORD_BCRYPT_DEFAULT_COST", PHP_PASSWORD_BCRYPT_COST, CONST_PERSISTENT);
439439
#ifdef HAVE_ARGON2LIB
440-
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_PASSWORD_ARGON2_MEMORY_COST, CONST_CS | CONST_PERSISTENT);
441-
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_PASSWORD_ARGON2_TIME_COST, CONST_CS | CONST_PERSISTENT);
442-
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_PASSWORD_ARGON2_THREADS, CONST_CS | CONST_PERSISTENT);
440+
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_PASSWORD_ARGON2_MEMORY_COST, CONST_PERSISTENT);
441+
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_PASSWORD_ARGON2_TIME_COST, CONST_PERSISTENT);
442+
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_PASSWORD_ARGON2_THREADS, CONST_PERSISTENT);
443443

444-
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "standard", CONST_CS | CONST_PERSISTENT);
444+
REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "standard", CONST_PERSISTENT);
445445
#endif
446446

447447
return SUCCESS;

Diff for: ‎main/main.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -2115,13 +2115,13 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
21152115

21162116
register_main_symbols(module_number);
21172117

2118-
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_CS | CONST_NO_FILE_CACHE);
2118+
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_NO_FILE_CACHE);
21192119

21202120
php_binary_init();
21212121
if (PG(php_binary)) {
2122-
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", PG(php_binary), strlen(PG(php_binary)), CONST_PERSISTENT | CONST_CS | CONST_NO_FILE_CACHE);
2122+
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", PG(php_binary), strlen(PG(php_binary)), CONST_PERSISTENT | CONST_NO_FILE_CACHE);
21232123
} else {
2124-
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", "", 0, CONST_PERSISTENT | CONST_CS | CONST_NO_FILE_CACHE);
2124+
REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", "", 0, CONST_PERSISTENT | CONST_NO_FILE_CACHE);
21252125
}
21262126

21272127
/* this will read in php.ini, set up the configuration parameters,

Diff for: ‎main/php_streams.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ struct _php_stream_wrapper {
182182
#define PHP_STREAM_FLAG_NO_FCLOSE 0x80
183183

184184
/* Suppress generation of PHP warnings on stream read/write errors.
185-
* Currently for internal use only. */
185+
* Currently, for internal use only. */
186186
#define PHP_STREAM_FLAG_SUPPRESS_ERRORS 0x100
187187

188188
/* Do not close handle except it is explicitly closed by user (e.g. fclose) */

Diff for: ‎sapi/cli/php_cli.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ static void cli_register_file_handles(void)
536536
s_out = php_stream_open_wrapper_ex("php://stdout", "wb", 0, NULL, sc_out);
537537
s_err = php_stream_open_wrapper_ex("php://stderr", "wb", 0, NULL, sc_err);
538538

539-
/* Release stream resources, but don't free the underlying handles. Othewrise,
539+
/* Release stream resources, but don't free the underlying handles. Otherwise,
540540
* extensions which write to stderr or company during mshutdown/gshutdown
541541
* won't have the expected functionality.
542542
*/
@@ -557,15 +557,15 @@ static void cli_register_file_handles(void)
557557
php_stream_to_zval(s_out, &oc.value);
558558
php_stream_to_zval(s_err, &ec.value);
559559

560-
ZEND_CONSTANT_SET_FLAGS(&ic, CONST_CS, 0);
560+
Z_CONSTANT_FLAGS(ic.value) = 0;
561561
ic.name = zend_string_init_interned("STDIN", sizeof("STDIN")-1, 0);
562562
zend_register_constant(&ic);
563563

564-
ZEND_CONSTANT_SET_FLAGS(&oc, CONST_CS, 0);
564+
Z_CONSTANT_FLAGS(oc.value) = 0;
565565
oc.name = zend_string_init_interned("STDOUT", sizeof("STDOUT")-1, 0);
566566
zend_register_constant(&oc);
567567

568-
ZEND_CONSTANT_SET_FLAGS(&ec, CONST_CS, 0);
568+
Z_CONSTANT_FLAGS(ec.value) = 0;
569569
ec.name = zend_string_init_interned("STDERR", sizeof("STDERR")-1, 0);
570570
zend_register_constant(&ec);
571571
}
@@ -938,7 +938,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
938938
zend_register_bool_constant(
939939
ZEND_STRL("PHP_CLI_PROCESS_TITLE"),
940940
is_ps_title_available() == PS_TITLE_SUCCESS,
941-
CONST_CS, 0);
941+
0, 0);
942942

943943
*arg_excp = arg_free; /* reconstruct argv */
944944

Diff for: ‎sapi/phpdbg/phpdbg.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -911,19 +911,19 @@ void phpdbg_register_file_handles(void) /* {{{ */
911911
php_stream_to_zval(s_err, &zerr);
912912

913913
ic.value = zin;
914-
ZEND_CONSTANT_SET_FLAGS(&ic, CONST_CS, 0);
914+
Z_CONSTANT_FLAGS(ic.value) = 0;
915915
ic.name = zend_string_init(ZEND_STRL("STDIN"), 0);
916916
zend_hash_del(EG(zend_constants), ic.name);
917917
zend_register_constant(&ic);
918918

919919
oc.value = zout;
920-
ZEND_CONSTANT_SET_FLAGS(&oc, CONST_CS, 0);
920+
Z_CONSTANT_FLAGS(oc.value) = 0;
921921
oc.name = zend_string_init(ZEND_STRL("STDOUT"), 0);
922922
zend_hash_del(EG(zend_constants), oc.name);
923923
zend_register_constant(&oc);
924924

925925
ec.value = zerr;
926-
ZEND_CONSTANT_SET_FLAGS(&ec, CONST_CS, 0);
926+
Z_CONSTANT_FLAGS(ec.value) = 0;
927927
ec.name = zend_string_init(ZEND_STRL("STDERR"), 0);
928928
zend_hash_del(EG(zend_constants), ec.name);
929929
zend_register_constant(&ec);

Diff for: ‎win32/signal.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ PHP_WINUTIL_API void php_win32_signal_ctrl_handler_init(void)
5555
vm_interrupt_flag = &EG(vm_interrupt);
5656
ZVAL_UNDEF(&ctrl_handler);
5757

58-
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_C", CTRL_C_EVENT, CONST_PERSISTENT | CONST_CS);
59-
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_BREAK", CTRL_BREAK_EVENT, CONST_PERSISTENT | CONST_CS);
58+
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_C", CTRL_C_EVENT, CONST_PERSISTENT);
59+
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_EVENT_CTRL_BREAK", CTRL_BREAK_EVENT, CONST_PERSISTENT);
6060
}/*}}}*/
6161

6262
PHP_WINUTIL_API void php_win32_signal_ctrl_handler_shutdown(void)

0 commit comments

Comments
 (0)