]> granicus.if.org Git - php/commitdiff
Revert "Use better function"
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 22 Mar 2021 16:53:37 +0000 (17:53 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 22 Mar 2021 16:53:37 +0000 (17:53 +0100)
This reverts commit 9162116a854fe37ce2c07a75b5ef7d797acba0ee.

This causes many "__HALT_COMPILER(); must be declared in a phar"
errors in phar tests on windows.

Zend/zend_constants.c

index ad92ce5791b5aef182b5a53bc2289927db64b8d9..978c57ecd7a4932bf14885f0c3c9fd53f7886ec5 100644 (file)
@@ -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));