Skip to content
Snippets Groups Projects
Commit 07f1a798 authored by Evangelos Foutras's avatar Evangelos Foutras :smiley_cat:
Browse files

New upstream release.

parent ecd9868c
No related branches found
No related tags found
No related merge requests found
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
pkgname=php-memcache
pkgver=3.0.8
pkgrel=8
_commit=fdbd46bbc6f53ed6e024521895e142cbfc9b3340
pkgver=4.0.5.2
pkgrel=1
pkgdesc="Memcache module for PHP"
arch=('x86_64')
url="https://pecl.php.net/package/memcache"
license=('PHP')
depends=('php')
makedepends=('git')
checkdepends=('memcached')
backup=('etc/php/conf.d/memcache.ini')
install=php-memcache.install
#source=(https://pecl.php.net/get/memcache-$pkgver.tgz)
source=("git+https://github.com/websupport-sk/pecl-memcache.git#commit=$_commit"
php73.patch)
sha256sums=('SKIP'
'4192de8fde7e69ce8d14053d1e0842d61239da4ca9a1317a9451075c4188be0f')
prepare() {
cd "$srcdir/pecl-memcache"
# https://github.com/php/php-src/blob/php-7.3.0RC1/UPGRADING.INTERNALS#L90-L96
patch -Np1 -i ../php73.patch
# Disable UDP tests
sed -i "s|^\(\$udpPort2\? =\) .*|\1 0;|" tests/connect.inc
# Remove flaky tests
# [tests/040.phpt] memcache->increment()/decrement() with multiple keys
# [tests/042.phpt] memcache->set() with multiple values
# strange keys [tests/005.phpt]
# ini_set('session.save_handler') [tests/036.phpt]
# ini_set('memcache.session_redundancy') [tests/044.phpt]
# ini_set('session.save_handler') with unix domain socket [tests/053.phpt]
# session locking [tests/057.phpt]
rm tests/{005,034,036,040,042,044,053,057}.phpt
}
source=(https://pecl.php.net/get/memcache-$pkgver.tgz)
sha256sums=('7b7667813baea003671f174bbec849e43ff235a8ea4ab7e36c3a0380c2a9ed63')
build() {
cd "$srcdir/pecl-memcache"
cd "$srcdir/memcache-$pkgver"
phpize
./configure --prefix=/usr
......@@ -48,7 +23,7 @@ build() {
}
check() {
cd "$srcdir/pecl-memcache"
cd "$srcdir/memcache-$pkgver"
sed -i "s|^\(\$domainsocket =\) .*|\1 'unix://$PWD/memcached.sock';|" \
tests/connect.inc
......@@ -67,7 +42,7 @@ check() {
}
package() {
cd "$srcdir/pecl-memcache"
cd "$srcdir/memcache-$pkgver"
make INSTALL_ROOT="$pkgdir" install
echo ';extension=memcache.so' >memcache.ini
......
diff --git a/php7/memcache.c b/php7/memcache.c
index c7d4e0a..1818db4 100644
--- a/php7/memcache.c
+++ b/php7/memcache.c
@@ -721,7 +721,7 @@ mmc_t *mmc_find_persistent(const char *host, int host_len, unsigned short port,
mmc = mmc_server_new(host, host_len, port, udp_port, 1, timeout, retry_interval);
le->type = le_memcache_server;
le->ptr = mmc;
- GC_REFCOUNT(le) = 1;
+ GC_SET_REFCOUNT(le, 1);
/* register new persistent connection */
if (zend_hash_str_update_mem(&EG(persistent_list), key, key_len, le, sizeof(*le)) == NULL) {
@@ -779,7 +779,7 @@ static mmc_t *php_mmc_pool_addserver(
pool->failure_callback = &php_mmc_failure_callback;
list_res = zend_register_resource(pool, le_memcache_pool);
add_property_resource(mmc_object, "connection", list_res);
- GC_REFCOUNT(list_res)++;
+ GC_ADDREF(list_res);
}
else {
pool = zend_fetch_resource_ex(connection, "connection", le_memcache_pool);
@@ -863,7 +863,7 @@ static void php_mmc_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool persistent)
mmc_object = return_value;
object_init_ex(mmc_object, memcache_ce);
add_property_resource(mmc_object, "connection", list_res);
- GC_REFCOUNT(list_res)++;
+ GC_ADDREF(list_res);
} else {
RETVAL_TRUE;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment