add dev-lang/php-5.6.40
[portage-squeep] / dev-lang / php / files / 5.6-mbstring-oniguruma-6.8.patch
1 diff -aurN a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
2 --- a/ext/mbstring/php_mbregex.c 2018-03-28 17:28:58.000000000 -0400
3 +++ b/ext/mbstring/php_mbregex.c 2018-04-04 12:53:23.268296387 -0400
4 @@ -454,7 +454,7 @@
5 OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
6
7 found = zend_hash_find(&MBREX(ht_rc), (char *)pattern, patlen+1, (void **) &rc);
8 - if (found == FAILURE || (*rc)->options != options || (*rc)->enc != enc || (*rc)->syntax != syntax) {
9 + if (found == FAILURE || onig_get_options(*rc) != options || onig_get_encoding(*rc) != enc || onig_get_syntax(*rc) != syntax) {
10 if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
11 onig_error_code_to_str(err_str, err_code, &err_info);
12 php_error_docref(NULL TSRMLS_CC, E_WARNING, "mbregex compile err: %s", err_str);