From 14fc3d156665e20f8e97ba38b91d6a250fa80e85 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Mon, 25 Sep 2023 19:38:42 +0200 Subject: [PATCH 1/2] Fix GH-12297: PHP Startup: Invalid library (maybe not a PHP library) 'mysqlnd.so' in Unknown on line On some configurations, the COMPILE_DL_MYSQLND must come from config.h. If it isn't set, the get_module function won't be exposed, resulting in a failure when trying to load the library. It's the same issue ext/fileinfo had a while back that was fixed in b0ba368d5. Closes GH-12299. --- NEWS | 4 ++++ ext/mysqlnd/php_mysqlnd.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 22ccf6af0ed..570beeebf3c 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,10 @@ PHP NEWS . Fixed bug GH-12282 (IntlDateFormatter::construct should throw an exception on an invalid locale). (David Carlier) +- MySQLnd: + . Fixed bug GH-12297 (PHP Startup: Invalid library (maybe not a PHP library) + 'mysqlnd.so' in Unknown on line). (nielsdos) + - PCRE: . Fixed bug GH-11956 (Backport upstream fix, PCRE regular expressions with JIT enabled gives different result). (nielsdos) diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index ff31a54b454..dd7ded12c20 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -15,6 +15,9 @@ +----------------------------------------------------------------------+ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "php.h" #include "mysqlnd.h" #include "mysqlnd_priv.h" From 07811b63901e88093de311d2ad1da918a9078a17 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Mon, 25 Sep 2023 20:00:53 +0200 Subject: [PATCH 2/2] Fix GH-11997: ctype_alnum 5 times slower in PHP 8.1 or greater Currently, a common function is used where a function pointer gets passed to check the character class type. If we instead use a macro, the macro version of these character class type checkers can be used. While this gives only a minor speed-up for glibc-based systems, on Alpine this gives a multi-facor speed-up This is essentially a manual revert of dc80ea7e38. Full discussion in GH-11997. Closes GH-12300. --- NEWS | 4 +++ ext/ctype/ctype.c | 71 ++++++++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/NEWS b/NEWS index 570beeebf3c..6798a29e7e6 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,10 @@ PHP NEWS ext/dom). (nielsdos) . Fixed bug GH-12273 (__builtin_cpu_init check). (Freaky) +- CType: + . Fixed bug GH-11997 (ctype_alnum 5 times slower in PHP 8.1 or greater). + (nielsdos) + - Filter: . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov) diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index 939959bc090..21ea526d8de 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -61,27 +61,9 @@ static PHP_MINFO_FUNCTION(ctype) } /* }}} */ -static void ctype_impl( - INTERNAL_FUNCTION_PARAMETERS, int (*iswhat)(int), bool allow_digits, bool allow_minus) { - zval *c; - - ZEND_PARSE_PARAMETERS_START(1, 1); - Z_PARAM_ZVAL(c) - ZEND_PARSE_PARAMETERS_END(); - - if (Z_TYPE_P(c) == IS_STRING) { - char *p = Z_STRVAL_P(c), *e = Z_STRVAL_P(c) + Z_STRLEN_P(c); - if (e == p) { - RETURN_FALSE; - } - while (p < e) { - if (!iswhat((int)*(unsigned char *)(p++))) { - RETURN_FALSE; - } - } - RETURN_TRUE; - } - +/* Slow fallback for deprecated cases defined in a no-inline function to not bloat code. */ +static zend_never_inline void ctype_fallback(zval *c, zval *return_value, int (*iswhat)(int), bool allow_digits, bool allow_minus) +{ php_error_docref(NULL, E_DEPRECATED, "Argument of type %s will be interpreted as string in the future", zend_zval_type_name(c)); if (Z_TYPE_P(c) == IS_LONG) { @@ -99,80 +81,105 @@ static void ctype_impl( } } +/* Define as a macro such that iswhat can use the macro version instead of the function version. + * This heavily reduces the overhead. (GH-11997) */ +#define ctype_impl(iswhat, allow_digits, allow_minus) do { \ + zval *c; \ + \ + ZEND_PARSE_PARAMETERS_START(1, 1); \ + Z_PARAM_ZVAL(c) \ + ZEND_PARSE_PARAMETERS_END(); \ + \ + if (Z_TYPE_P(c) == IS_STRING) { \ + char *p = Z_STRVAL_P(c), *e = Z_STRVAL_P(c) + Z_STRLEN_P(c); \ + if (e == p) { \ + RETURN_FALSE; \ + } \ + while (p < e) { \ + if (!iswhat((int)*(unsigned char *)(p++))) { \ + RETURN_FALSE; \ + } \ + } \ + RETURN_TRUE; \ + } \ + \ + ctype_fallback(c, return_value, iswhat, allow_digits, allow_minus); \ + } while (0); + /* {{{ Checks for alphanumeric character(s) */ PHP_FUNCTION(ctype_alnum) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isalnum, 1, 0); + ctype_impl(isalnum, 1, 0); } /* }}} */ /* {{{ Checks for alphabetic character(s) */ PHP_FUNCTION(ctype_alpha) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isalpha, 0, 0); + ctype_impl(isalpha, 0, 0); } /* }}} */ /* {{{ Checks for control character(s) */ PHP_FUNCTION(ctype_cntrl) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, iscntrl, 0, 0); + ctype_impl(iscntrl, 0, 0); } /* }}} */ /* {{{ Checks for numeric character(s) */ PHP_FUNCTION(ctype_digit) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isdigit, 1, 0); + ctype_impl(isdigit, 1, 0); } /* }}} */ /* {{{ Checks for lowercase character(s) */ PHP_FUNCTION(ctype_lower) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, islower, 0, 0); + ctype_impl(islower, 0, 0); } /* }}} */ /* {{{ Checks for any printable character(s) except space */ PHP_FUNCTION(ctype_graph) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isgraph, 1, 1); + ctype_impl(isgraph, 1, 1); } /* }}} */ /* {{{ Checks for printable character(s) */ PHP_FUNCTION(ctype_print) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isprint, 1, 1); + ctype_impl(isprint, 1, 1); } /* }}} */ /* {{{ Checks for any printable character which is not whitespace or an alphanumeric character */ PHP_FUNCTION(ctype_punct) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, ispunct, 0, 0); + ctype_impl(ispunct, 0, 0); } /* }}} */ /* {{{ Checks for whitespace character(s)*/ PHP_FUNCTION(ctype_space) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isspace, 0, 0); + ctype_impl(isspace, 0, 0); } /* }}} */ /* {{{ Checks for uppercase character(s) */ PHP_FUNCTION(ctype_upper) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isupper, 0, 0); + ctype_impl(isupper, 0, 0); } /* }}} */ /* {{{ Checks for character(s) representing a hexadecimal digit */ PHP_FUNCTION(ctype_xdigit) { - ctype_impl(INTERNAL_FUNCTION_PARAM_PASSTHRU, isxdigit, 1, 0); + ctype_impl(isxdigit, 1, 0); } /* }}} */