Attachment #216374 for bug #247906

View | Details | Raw Unified | Return to bug 247906
Collapse All | Expand All

Lines 1-8 Link Here

(-)Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= redis	3	PORTNAME= redis
4	PORTVERSION= 5.3.0	4	PORTVERSION= 5.3.1
5	PORTREVISION= 1
6	CATEGORIES= databases	5	CATEGORIES= databases
7		6
8	MAINTAINER= daniel@blodan.se	7	MAINTAINER= daniel@blodan.se

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593576257	1	TIMESTAMP = 1594148191
2	SHA256 (PECL/redis-5.3.0.tgz) = cd532d9e0975fe0e584d823932890c0b8b4f8fdaffb7c453d74c4f3942d450a5	2	SHA256 (PECL/redis-5.3.1.tgz) = 7c29e49c5cbc6b54ccccc00b44fac4d3ed9895e5718fcf62a5b06281dda8809d
3	SIZE (PECL/redis-5.3.0.tgz) = 264024	3	SIZE (PECL/redis-5.3.1.tgz) = 264485




Patch can be removed in next release
Upstream fix: 
https://github.com/phpredis/phpredis/pull/1800

--- redis.c.orig	2020-07-03 06:16:52 UTC
+++ redis.c
@@ -30,7 +30,7 @@
 #include <standard/php_random.h>
 #include <zend_exceptions.h>
 #include <ext/standard/info.h>
-
+#include <ext/hash/php_hash.h>
 
 #ifdef PHP_SESSION
 #include <ext/session/php_session.h>




Patch can be removed in next release
Upstream fix;
https://github.com/phpredis/phpredis/pull/1804

--- redis_session.c.orig	2020-07-03 06:17:19 UTC
+++ redis_session.c
@@ -480,7 +480,8 @@ PS_OPEN_FUNC(redis)
             }
 
             redis_sock = redis_sock_create(addr, addrlen, port, timeout, read_timeout,
-                                           persistent, ZSTR_VAL(persistent_id), retry_interval);
+                                           persistent, persistent_id ? ZSTR_VAL(persistent_id) : NULL,
+                                           retry_interval);
 
             redis_pool_add(pool, redis_sock, weight, db);
             redis_sock->prefix = prefix;

Return to bug 247906

Lines 1-15 Link Here

(-)files/patch-redis.c (-15 lines)
1	Patch can be removed in next release
2	Upstream fix:
3	https://github.com/phpredis/phpredis/pull/1800
4
5	--- redis.c.orig 2020-07-03 06:16:52 UTC
6	+++ redis.c
7	@@ -30,7 +30,7 @@
8	#include <standard/php_random.h>
9	#include <zend_exceptions.h>
10	#include <ext/standard/info.h>
11	-
12	+#include <ext/hash/php_hash.h>
13
14	#ifdef PHP_SESSION
15	#include <ext/session/php_session.h>

Lines 1-16 Link Here

(-)files/patch-redis__session.c (-16 lines)
1	Patch can be removed in next release
2	Upstream fix;
3	https://github.com/phpredis/phpredis/pull/1804
4
5	--- redis_session.c.orig 2020-07-03 06:17:19 UTC
6	+++ redis_session.c
7	@@ -480,7 +480,8 @@ PS_OPEN_FUNC(redis)
8	}
9
10	redis_sock = redis_sock_create(addr, addrlen, port, timeout, read_timeout,
11	- persistent, ZSTR_VAL(persistent_id), retry_interval);
12	+ persistent, persistent_id ? ZSTR_VAL(persistent_id) : NULL,
13	+ retry_interval);
14
15	redis_pool_add(pool, redis_sock, weight, db);
16	redis_sock->prefix = prefix;