diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -4,6 +4,8 @@ PHP NEWS - Mbstring: . Fixed bug #75944 (Wrong cp1251 detection). (dmk001) + . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1). + (chrullrich, cmb) - ODBC: . Fixed bug #76088 (ODBC functions are not available by default on Windows). diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index bf59d3fdd3..eecd8c2471 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -449,7 +449,7 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const char *pattern, int patl OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN]; rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen); - if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) { + if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) { if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) { onig_error_code_to_str(err_str, err_code, &err_info); php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str); |