summaryrefslogtreecommitdiffstats
path: root/8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-12-21 13:43:30 +0100
committerRemi Collet <remi@remirepo.net>2018-12-21 13:43:30 +0100
commit489347d97db58d442e822d7c4839c2d31f307378 (patch)
treea83c4fb8a2abd02d103a777493e150ee647c7186 /8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch
parentae08082c2966a1b4ea5d006e259997d20196ab65 (diff)
v3.1.0
Diffstat (limited to '8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch')
-rw-r--r--8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch65
1 files changed, 0 insertions, 65 deletions
diff --git a/8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch b/8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch
deleted file mode 100644
index bde5acc..0000000
--- a/8bfdbcc9063dafcb25fdb1d1705e07ee027d7379.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8bfdbcc9063dafcb25fdb1d1705e07ee027d7379 Mon Sep 17 00:00:00 2001
-From: Aaron Stone <aaron@serendipity.cx>
-Date: Thu, 29 Mar 2018 23:26:46 -0700
-Subject: [PATCH] Update for new PHP 7.3 REFCOUNT macros (#390)
-
----
- .travis.yml | 3 +++
- php_memcached.c | 4 ++--
- php_memcached_private.h | 7 +++++++
- php_memcached_session.c | 2 +-
- 4 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/php_memcached.c b/php_memcached.c
-index a42ff19..bd0f559 100644
---- a/php_memcached.c
-+++ b/php_memcached.c
-@@ -1298,7 +1298,7 @@ static PHP_METHOD(Memcached, __construct)
- le.type = php_memc_list_entry();
- le.ptr = intern->memc;
-
-- GC_REFCOUNT(&le) = 1;
-+ GC_SET_REFCOUNT(&le, 1);
-
- /* plist_key is not a persistent allocated key, thus we use str_update here */
- if (zend_hash_str_update_mem(&EG(persistent_list), ZSTR_VAL(plist_key), ZSTR_LEN(plist_key), &le, sizeof(le)) == NULL) {
-@@ -3831,7 +3831,7 @@ PHP_METHOD(MemcachedServer, on)
-
- Z_TRY_ADDREF(fci.function_name);
- if (fci.object) {
-- GC_REFCOUNT(fci.object)++;
-+ GC_ADDREF(fci.object);
- }
- }
- RETURN_BOOL(rc);
-diff --git a/php_memcached_private.h b/php_memcached_private.h
-index a04e19b..abc0459 100644
---- a/php_memcached_private.h
-+++ b/php_memcached_private.h
-@@ -72,6 +72,13 @@ typedef unsigned long int uint32_t;
- # endif
- #endif
-
-+/* Backwards compatibility for GC API change in PHP 7.3 */
-+#if PHP_VERSION_ID < 70300
-+# define GC_ADDREF(p) ++GC_REFCOUNT(p)
-+# define GC_DELREF(p) --GC_REFCOUNT(p)
-+# define GC_SET_REFCOUNT(p, rc) GC_REFCOUNT(p) = rc
-+#endif
-+
- /****************************************
- Structures and definitions
- ****************************************/
-diff --git a/php_memcached_session.c b/php_memcached_session.c
-index d8e9be6..607a02c 100644
---- a/php_memcached_session.c
-+++ b/php_memcached_session.c
-@@ -376,7 +376,7 @@ PS_OPEN_FUNC(memcached)
- le.type = s_memc_sess_list_entry();
- le.ptr = memc;
-
-- GC_REFCOUNT(&le) = 1;
-+ GC_SET_REFCOUNT(&le, 1);
-
- /* plist_key is not a persistent allocated key, thus we use str_update here */
- if (zend_hash_str_update_mem(&EG(persistent_list), plist_key, plist_key_len, &le, sizeof(le)) == NULL) {