diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-20 16:52:42 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-03-20 16:53:17 +0100 |
| commit | 8f5c34cd399496f58bf91fe426444c6366db8df3 (patch) | |
| tree | 3f3db45308b47a4714a4dbfa49152f1bd4e67995 /ext/mbstring/php_mbregex.c | |
| parent | cd2912af5ead4174cb8e3e91a755e471fd7ec08a (diff) | |
| parent | 4072b2787074ee8e247a6639585b49e10c5a55fe (diff) | |
| download | php-git-8f5c34cd399496f58bf91fe426444c6366db8df3.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76113: mbstring does not build with Oniguruma 6.8.1
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |