Attachment 202567 Details for Bug 236234 – databases_php-memcache.patch

[patch] databases_php-memcache.patch

_databases_php-memcache.patch (text/plain), 3.03 KB, created by Krzysztof on 2019-03-04 22:51:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2019-03-04 22:51:32 UTC

Size: 3.03 KB

patch

obsolete

>diff -ruN databases/php-memcache/files/patch-php7_memcache__pool.c databases/php-memcache.new/files/patch-php7_memcache__pool.c
>--- databases/php-memcache/files/patch-php7_memcache__pool.c	1970-01-01 01:00:00.000000000 +0100
>+++ databases/php-memcache.new/files/patch-php7_memcache__pool.c	2019-03-04 22:51:49.627459000 +0100
>@@ -0,0 +1,12 @@
>+--- php7/memcache_pool.c.orig	2019-03-04 21:49:48 UTC
>++++ php7/memcache_pool.c
>+@@ -44,6 +44,9 @@ ZEND_DECLARE_MODULE_GLOBALS(memcache)
>+ MMC_POOL_INLINE void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size)  /*
>+ 	ensures space for an additional size bytes {{{ */
>+ {
>++#if PHP_VERSION_ID < 70200
>++	register size_t newlen;
>++#endif
>+ 	smart_string_alloc((&(buffer->value)), size, 0);
>+ }
>+ /* }}} */
>diff -ruN databases/php-memcache/files/patch-php7_memcache__pool.h databases/php-memcache.new/files/patch-php7_memcache__pool.h
>--- databases/php-memcache/files/patch-php7_memcache__pool.h	1970-01-01 01:00:00.000000000 +0100
>+++ databases/php-memcache.new/files/patch-php7_memcache__pool.h	2019-03-04 23:15:25.236589000 +0100
>@@ -0,0 +1,11 @@
>+--- php7/memcache_pool.h.orig	2019-03-04 21:55:13 UTC
>++++ php7/memcache_pool.h
>+@@ -396,7 +396,7 @@ int mmc_unpack_value(mmc_t *, mmc_reques
>+ double timeval_to_double(struct timeval tv);
>+ struct timeval double_to_timeval(double sec);
>+ 
>+-int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
>++int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *, char *);
>+ int mmc_prepare_key(zval *, char *, unsigned int *);
>+ 
>+ #define mmc_str_left(h, n, hlen, nlen) ((hlen) >= (nlen) ? memcmp((h), (n), (nlen)) == 0 : 0)
>diff -ruN databases/php-memcache/files/patch-php7-memcache_pool.h databases/php-memcache.new/files/patch-php7-memcache_pool.h
>--- databases/php-memcache/files/patch-php7-memcache_pool.h	2019-02-28 22:35:07.000000000 +0100
>+++ databases/php-memcache.new/files/patch-php7-memcache_pool.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- php7/memcache_pool.h.orig	2019-02-27 20:19:05 UTC
>-+++ php7/memcache_pool.h
>-@@ -396,7 +396,7 @@ int mmc_unpack_value(mmc_t *, mmc_reques
>- double timeval_to_double(struct timeval tv);
>- struct timeval double_to_timeval(double sec);
>- 
>--int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
>-+int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *, char *);
>- int mmc_prepare_key(zval *, char *, unsigned int *);
>- 
>- #define mmc_str_left(h, n, hlen, nlen) ((hlen) >= (nlen) ? memcmp((h), (n), (nlen)) == 0 : 0)
>diff -ruN databases/php-memcache/Makefile databases/php-memcache.new/Makefile
>--- databases/php-memcache/Makefile	2019-03-02 18:46:51.000000000 +0100
>+++ databases/php-memcache.new/Makefile	2019-03-04 23:19:42.427457000 +0100
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	memcache
> PORTVERSION=	4.0.1
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> DISTVERSIONSUFFIX=	-php73
> CATEGORIES=	databases
>@@ -22,7 +23,6 @@
> USE_PHP=	session:build zlib:build
> 
> CONFIGURE_ARGS=	--with-zlib-dir=/usr
>-IGNORE_WITH_PHP=71
> 
> GH_ACCOUNT=	websupport-sk
> GH_PROJECT=	pecl-${PORTNAME}

Actions: View | Diff

Attachments on bug 236234: 202567