summaryrefslogtreecommitdiffstats
path: root/mailparse-php81.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-09-01 11:01:08 +0200
committerRemi Collet <remi@remirepo.net>2021-09-01 11:01:08 +0200
commit55bc965c1de5826a6053baed18358b76e1979383 (patch)
tree07edd931e93286288f3fbf84575cb89e6964e76e /mailparse-php81.patch
parent68e9e906a1b4ed39d8b5d60911ca38535708b62f (diff)
update to 3.1.2
Diffstat (limited to 'mailparse-php81.patch')
-rw-r--r--mailparse-php81.patch112
1 files changed, 0 insertions, 112 deletions
diff --git a/mailparse-php81.patch b/mailparse-php81.patch
deleted file mode 100644
index a0d1a2a..0000000
--- a/mailparse-php81.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From ae960dba8cb607296b7f85ca23f9d0a2462607d5 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 8 Jun 2021 08:00:37 +0200
-Subject: [PATCH] fix for 8.1
-
----
- mailparse.c | 29 ++++++++++++++++++++++++++++-
- package.xml | 2 +-
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/mailparse.c b/mailparse.c
-index 104ab38..d4b0804 100644
---- a/mailparse.c
-+++ b/mailparse.c
-@@ -413,7 +413,11 @@ static void mailparse_mimemessage_extract(int flags, INTERNAL_FUNCTION_PARAMETER
-
-
- if (part->source.kind == mpSTRING)
-+#if PHP_VERSION_ID < 80100
- srcstream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(&part->source.zval), Z_STRLEN_P(&part->source.zval));
-+#else
-+ srcstream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STR(part->source.zval));
-+#endif
- else
- php_stream_from_zval(srcstream, &part->source.zval);
-
-@@ -430,11 +434,15 @@ static void mailparse_mimemessage_extract(int flags, INTERNAL_FUNCTION_PARAMETER
- if (SUCCESS == extract_part(part, flags, srcstream, callback_data, callback)) {
-
- if (mode == MAILPARSE_EXTRACT_RETURN) {
-+#if PHP_VERSION_ID < 80100
- size_t len;
- char *buf;
-
- buf = php_stream_memory_get_buffer(deststream, &len);
- RETVAL_STRINGL(buf, len);
-+#else
-+ RETVAL_STR(php_stream_memory_get_buffer(deststream));
-+#endif
- } else {
- RETVAL_TRUE;
- }
-@@ -502,7 +510,11 @@ PHP_METHOD(mimemessage, extract_uue)
- }
-
- if (part->source.kind == mpSTRING)
-+#if PHP_VERSION_ID < 80100
- srcstream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(&part->source.zval), Z_STRLEN_P(&part->source.zval));
-+#else
-+ srcstream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STR(part->source.zval));
-+#endif
- else
- php_stream_from_zval(srcstream, &part->source.zval);
-
-@@ -535,11 +547,15 @@ PHP_METHOD(mimemessage, extract_uue)
- if (nparts == index) {
- mailparse_do_uudecode(srcstream, deststream);
- if (mode == MAILPARSE_EXTRACT_RETURN) {
-+#if PHP_VERSION_ID < 80100
- size_t len;
- char *buf;
-
- buf = php_stream_memory_get_buffer(deststream, &len);
- RETVAL_STRINGL(buf, len);
-+#else
-+ RETVAL_STR(php_stream_memory_get_buffer(deststream));
-+#endif
- } else {
- RETVAL_TRUE;
- }
-@@ -584,7 +600,11 @@ PHP_METHOD(mimemessage, enum_uue)
- return;
-
- if (part->source.kind == mpSTRING)
-+#if PHP_VERSION_ID < 80100
- instream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(&part->source.zval), Z_STRLEN_P(&part->source.zval));
-+#else
-+ instream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STR(part->source.zval));
-+#endif
- else
- php_stream_from_zval(instream, &part->source.zval);
-
-@@ -1308,7 +1328,11 @@ static void mailparse_do_extract(INTERNAL_FUNCTION_PARAMETERS, int decode, int i
- close_src_stream = 1;
- } else {
- /* filename is the actual data */
-+#if PHP_VERSION_ID < 80100
- srcstream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(filename), Z_STRLEN_P(filename));
-+#else
-+ srcstream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STR_P(filename));
-+#endif
- close_src_stream = 1;
- }
-
-@@ -1339,12 +1363,15 @@ static void mailparse_do_extract(INTERNAL_FUNCTION_PARAMETERS, int decode, int i
- if (SUCCESS == extract_part(part, decode, srcstream, cbdata, cbfunc)) {
-
- if (deststream != NULL) {
-+#if PHP_VERSION_ID < 80100
- /* return it's contents as a string */
- char *membuf = NULL;
- size_t memlen = 0;
- membuf = php_stream_memory_get_buffer(deststream, &memlen);
- RETVAL_STRINGL(membuf, memlen);
--
-+#else
-+ RETVAL_STR(php_stream_memory_get_buffer(deststream));
-+#endif
- } else {
- RETVAL_TRUE;
- }
-