summaryrefslogtreecommitdiffstats
path: root/upstream.patch
blob: 866cdd3f51c8b79c95d85f3cf796846d791139b5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From 4fc9970a29c205ec328f36edc8c119c158129324 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:59:07 +0100
Subject: [PATCH] Fix #5: Build with php-src master is broken

---
 php_imap.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/php_imap.c b/php_imap.c
index 38b11b8..df2f8dd 100644
--- a/php_imap.c
+++ b/php_imap.c
@@ -806,8 +806,13 @@ PHP_FUNCTION(imap_append)
 		}
 
 		zend_string_release(regex);
+#if PHP_VERSION_ID >= 80400
+		php_pcre_match_impl(pce, internal_date, return_value, subpats, global,
+			Z_L(0), Z_L(0));
+#else
 		php_pcre_match_impl(pce, internal_date, return_value, subpats, global,
 			0, Z_L(0), Z_L(0));
+#endif
 
 		if (!Z_LVAL_P(return_value)) {
 			// TODO Promoto to error?
From 65de3c0c338642a88edf82335a78bb521c8d123a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 4 Jan 2024 11:35:52 +0100
Subject: [PATCH] Report extension version in phpinfo() output

---
 php_imap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/php_imap.c b/php_imap.c
index 22ad1b0..38b11b8 100644
--- a/php_imap.c
+++ b/php_imap.c
@@ -571,6 +571,7 @@ PHP_RSHUTDOWN_FUNCTION(imap)
 PHP_MINFO_FUNCTION(imap)
 {
 	php_info_print_table_start();
+	php_info_print_table_row(2, "IMAP extension Version", PHP_IMAP_VERSION);
 	php_info_print_table_row(2, "IMAP c-Client Version", CCLIENTVERSION);
 #ifdef HAVE_IMAP_SSL
 	php_info_print_table_row(2, "SSL Support", "enabled");