diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /www/pecl-yaf/files/patch-php84 | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'www/pecl-yaf/files/patch-php84')
| -rw-r--r-- | www/pecl-yaf/files/patch-php84 | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/www/pecl-yaf/files/patch-php84 b/www/pecl-yaf/files/patch-php84 deleted file mode 100644 index 424a5fdd2554..000000000000 --- a/www/pecl-yaf/files/patch-php84 +++ /dev/null @@ -1,46 +0,0 @@ -Obtained from: https://github.com/laruence/yaf/commit/b1d252c944a8d70f0dc28415b3d67a7b3bbbf7ce - ---- routes/yaf_route_regex.c.orig 2024-06-25 03:13:57 UTC -+++ routes/yaf_route_regex.c -@@ -204,11 +204,18 @@ static int yaf_route_regex_match(yaf_route_regex_objec - #if PHP_VERSION_ID < 70400 - php_pcre_match_impl(pce_regexp, (char*)uri, len, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); --#else -+#elif PHP_VERSION_ID < 80400 - { - zend_string *tmp = zend_string_init(uri, len, 0); - php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); -+ zend_string_release(tmp); -+ } -+#else -+ { -+ zend_string *tmp = zend_string_init(uri, len, 0); -+ php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, -+ 0/* global */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); - zend_string_release(tmp); - } - #endif ---- routes/yaf_route_rewrite.c.orig 2024-06-25 03:13:57 UTC -+++ routes/yaf_route_rewrite.c -@@ -209,11 +209,18 @@ static int yaf_route_rewrite_match(yaf_route_rewrite_o - #if PHP_VERSION_ID < 70400 - php_pcre_match_impl(pce_regexp, (char*)uri, len, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); --#else -+#elif PHP_VERSION_ID <80400 - { - zend_string *tmp = zend_string_init(uri, len, 0); - php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, - 0/* global */, 0/* ZEND_NUM_ARGS() >= 4 */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); -+ zend_string_release(tmp); -+ } -+#else -+ { -+ zend_string *tmp = zend_string_init(uri, len, 0); -+ php_pcre_match_impl(pce_regexp, tmp, &matches, &subparts /* subpats */, -+ 0/* global */, 0/*flags PREG_OFFSET_CAPTURE*/, 0/* start_offset */); - zend_string_release(tmp); - } - #endif |