View | Details | Raw Unified | Return to bug 247717 | Differences between
and this patch

Collapse All | Expand All

(-)databases/pecl-redis/Makefile (+1 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	redis
3
PORTNAME=	redis
4
PORTVERSION=	5.3.0
4
PORTVERSION=	5.3.0
5
PORTREVISION=	1
5
CATEGORIES=	databases
6
CATEGORIES=	databases
6
7
7
MAINTAINER=	daniel@blodan.se
8
MAINTAINER=	daniel@blodan.se
(-)databases/pecl-redis/files/patch-redis.c (+15 lines)
Line 0 Link Here
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>
(-)databases/pecl-redis/files/patch-redis__session.c (+16 lines)
Line 0 Link Here
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;

Return to bug 247717