From: Nikita Popov Date: Mon, 22 Mar 2021 16:53:37 +0000 (+0100) Subject: Revert "Use better function" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f42f539324f3d48cec2f64ff36756533a4ebd230;p=php Revert "Use better function" This reverts commit 9162116a854fe37ce2c07a75b5ef7d797acba0ee. This causes many "__HALT_COMPILER(); must be declared in a phar" errors in phar tests on windows. --- diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index ad92ce5791..978c57ecd7 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -488,7 +488,7 @@ ZEND_API zend_result zend_register_constant(zend_constant *c) printf("Registering constant for module %d\n", c->module_number); #endif - const char *slash = zend_memrchr(ZSTR_VAL(c->name), '\\', ZSTR_LEN(c->name)); + const char *slash = strrchr(ZSTR_VAL(c->name), '\\'); if (slash) { lowercase_name = zend_string_init(ZSTR_VAL(c->name), ZSTR_LEN(c->name), persistent); zend_str_tolower(ZSTR_VAL(lowercase_name), slash - ZSTR_VAL(c->name));