[Midnightbsd-cvs] mports [23704] trunk/converters/php70-mbstring/files/patch-php__mbregex.c: patch for new libonig.so

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Jul 26 22:50:57 EDT 2018


Revision: 23704
          http://svnweb.midnightbsd.org/mports/?rev=23704
Author:   laffer1
Date:     2018-07-26 22:50:56 -0400 (Thu, 26 Jul 2018)
Log Message:
-----------
patch for new libonig.so

Added Paths:
-----------
    trunk/converters/php70-mbstring/files/patch-php__mbregex.c

Added: trunk/converters/php70-mbstring/files/patch-php__mbregex.c
===================================================================
--- trunk/converters/php70-mbstring/files/patch-php__mbregex.c	                        (rev 0)
+++ trunk/converters/php70-mbstring/files/patch-php__mbregex.c	2018-07-27 02:50:56 UTC (rev 23704)
@@ -0,0 +1,11 @@
+--- php_mbregex.c.orig	2018-02-27 13:16:12 UTC
++++ php_mbregex.c
+@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compi
+ 	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);


Property changes on: trunk/converters/php70-mbstring/files/patch-php__mbregex.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list