diff options
author | Remi Collet <remi@remirepo.net> | 2025-07-17 12:04:20 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2025-07-17 12:04:20 +0200 |
commit | 6df6e06275420b5dbb43eac181805ccf4a71b7c6 (patch) | |
tree | d70596d2c4ad1960d5983ffdd1591235ee5d09ce /0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch | |
parent | 5a573398d86905f21043aa67a821d50b2447bb85 (diff) |
add patch for PHP 8.5.0alpha2 (sent to author)
Diffstat (limited to '0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch')
-rw-r--r-- | 0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch b/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch new file mode 100644 index 0000000..acbfcf2 --- /dev/null +++ b/0001-use-zend_ce_exception-instead-of-zend_exception_get_.patch @@ -0,0 +1,49 @@ +From 78f56ef5c90109564eb37a65baec69fa8f29b108 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 17 Jul 2025 11:35:34 +0200 +Subject: [PATCH] use zend_ce_exception instead of zend_exception_get_default() + for 8.5 + +--- + util.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/util.c b/util.c +index adde54d..8002297 100644 +--- a/util.c ++++ b/util.c +@@ -34,7 +34,7 @@ php_socket_t php_ev_zval_to_fd(zval *pfd) + /* PHP stream or PHP socket resource */ + if ((stream = (php_stream *)zend_fetch_resource2(Z_RES_P(pfd), NULL, php_file_le_stream(), php_file_le_pstream())) != NULL) { + if (php_stream_is(stream, PHP_STREAM_IS_MEMORY) || php_stream_is(stream, PHP_STREAM_IS_TEMP)) { +- zend_throw_exception(zend_exception_get_default(), ++ zend_throw_exception(zend_ce_exception, + "Cannot fetch file descriptor from memory based stream", 0); + return -1; + } +@@ -42,7 +42,7 @@ php_socket_t php_ev_zval_to_fd(zval *pfd) + php_stream_from_zval_no_verify(stream, pfd); + + if (stream == NULL) { +- zend_throw_exception(zend_exception_get_default(), "Stream resource is invalid", 0); ++ zend_throw_exception(zend_ce_exception, "Stream resource is invalid", 0); + return -1; + } + +@@ -88,11 +88,11 @@ php_socket_t php_ev_zval_to_fd(zval *pfd) + /* Numeric fd */ + file_desc = Z_LVAL_P(pfd); + if (file_desc < 0) { +- zend_throw_exception(zend_exception_get_default(), "Invalid file descriptor", 0); ++ zend_throw_exception(zend_ce_exception, "Invalid file descriptor", 0); + return -1; + } + } else { +- zend_throw_exception(zend_exception_get_default(), "Invalid file descriptor", 0); ++ zend_throw_exception(zend_ce_exception, "Invalid file descriptor", 0); + return -1; + } + +-- +2.50.1 + |