Merge branch 'php:master' into php-8.1-fix-openssl-20221123020501

Author: Eno-CN

Zend/zend_builtin_functions.c

@@ -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;

Zend/zend_compile.c

@@ -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);
 }
 /* }}} */

Zend/zend_vm_def.h

@@ -6049,7 +6049,7 @@ ZEND_VM_C_LABEL(add_unpack_again):
 	if (EXPECTED(Z_TYPE_P(op1) == IS_ARRAY)) {
 		HashTable *ht = Z_ARRVAL_P(op1);
 		zval *val;
-		
+
 		if (HT_IS_PACKED(ht) && (zend_hash_num_elements(result_ht) == 0 || HT_IS_PACKED(result_ht))) {
 			zend_hash_extend(result_ht, zend_hash_num_elements(result_ht) + zend_hash_num_elements(ht), 1);
 			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)
 	uint32_t short_circuiting_type = opline->extended_value & ZEND_SHORT_CIRCUITING_CHAIN_MASK;
 	if (EXPECTED(short_circuiting_type == ZEND_SHORT_CIRCUITING_CHAIN_EXPR)) {
 		ZVAL_NULL(result);
-		if (OP1_TYPE == IS_CV 
+		if (OP1_TYPE == IS_CV
 			&& UNEXPECTED(Z_TYPE_P(val) == IS_UNDEF)
 			&& (opline->extended_value & ZEND_JMP_NULL_BP_VAR_IS) == 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) {

Zend/zend_vm_execute.h

@@ -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;

docs/input-filter.md

@@ -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,15 +253,15 @@ 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);
 				}
 				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;
 		}
 

ext/com_dotnet/com_com.c

@@ -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);
 		}
 	}