7.4

chuan-yun · May 27, 2021 · cf18c5c · cf18c5c
1 parent b7af9bb
commit cf18c5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: c
 
 env:
+ - MO_PHP_VERSION=7.4.19
  - MO_PHP_VERSION=7.3.2
  - MO_PHP_VERSION=7.2.2
  - MO_PHP_VERSION=7.1.2

diff --git a/molten_intercept.c b/molten_intercept.c
@@ -335,7 +335,12 @@ static char *pcre_common_match(char *pattern, int len, char *subject)
 #else
  if ((cache = pcre_get_compiled_regex_cache(pattern, len)) != NULL) {
 #endif
+#if PHP_VERSION_ID >= 70400
+ zend_string *subject_str = zend_string_init(subject, strlen(subpats), 0);
+ php_pcre_match_impl(cache, subject_str, result, subpats, 0, 0, 0, 0 TSRMLS_CC);
+#else
  php_pcre_match_impl(cache, subject, strlen(subject), result, subpats, 0, 0, 0, 0 TSRMLS_CC);
+#endif
  zval *match = NULL;
  if (Z_LVAL_P(result) > 0 && MO_Z_TYPE_P(subpats) == IS_ARRAY) {
 #if PHP_VERSION_ID >= 70000