mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-06 13:57:14 +02:00
84 lines
2.1 KiB
Diff
84 lines
2.1 KiB
Diff
Patch-Source: https://github.com/phpredis/phpredis/commit/a51215ce2b22bcd1f506780c35b6833471e0b8cb
|
|
From a51215ce2b22bcd1f506780c35b6833471e0b8cb Mon Sep 17 00:00:00 2001
|
|
From: michael-grunder <michael.grunder@gmail.com>
|
|
Date: Mon, 18 Mar 2024 14:42:35 -0700
|
|
Subject: [PATCH] Update random includes.
|
|
|
|
PHP 8.4 has some breaking changes with respect to where PHP's random methods and
|
|
helpers are. This commit fixes those issues while staying backward compatible.
|
|
|
|
Fixes #2463
|
|
---
|
|
backoff.c | 12 ++++++------
|
|
library.c | 7 ++++++-
|
|
redis.c | 6 +++++-
|
|
3 files changed, 17 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/backoff.c b/backoff.c
|
|
index d0961fcfaf..1be04a8fe8 100644
|
|
--- a/backoff.c
|
|
+++ b/backoff.c
|
|
@@ -1,14 +1,14 @@
|
|
#include "common.h"
|
|
|
|
+#if PHP_VERSION_ID < 80400
|
|
#include <ext/standard/php_rand.h>
|
|
-
|
|
-#if PHP_VERSION_ID >= 70100
|
|
-#include <ext/standard/php_mt_rand.h>
|
|
#else
|
|
+#include <ext/random/php_random.h>
|
|
+#endif
|
|
+
|
|
+#if PHP_VERSION_ID < 70100
|
|
static zend_long php_mt_rand_range(zend_long min, zend_long max) {
|
|
- zend_long number = php_rand();
|
|
- RAND_RANGE(number, min, max, PHP_RAND_MAX);
|
|
- return number;
|
|
+ return min + php_rand() % (max - min + 1)
|
|
}
|
|
#endif
|
|
|
|
diff --git a/library.c b/library.c
|
|
index 3d65c8529d..f81556a9ed 100644
|
|
--- a/library.c
|
|
+++ b/library.c
|
|
@@ -56,9 +56,14 @@
|
|
#include <ext/json/php_json.h>
|
|
#endif
|
|
|
|
-#include <ext/standard/php_rand.h>
|
|
#include <ext/hash/php_hash.h>
|
|
|
|
+#if PHP_VERSION_ID < 80400
|
|
+#include <ext/standard/php_rand.h>
|
|
+#else
|
|
+#include <ext/random/php_random.h>
|
|
+#endif
|
|
+
|
|
#define UNSERIALIZE_NONE 0
|
|
#define UNSERIALIZE_KEYS 1
|
|
#define UNSERIALIZE_VALS 2
|
|
diff --git a/redis.c b/redis.c
|
|
index ec6f65d2ed..2330bf7edf 100644
|
|
--- a/redis.c
|
|
+++ b/redis.c
|
|
@@ -27,12 +27,16 @@
|
|
#include "redis_cluster.h"
|
|
#include "redis_commands.h"
|
|
#include "redis_sentinel.h"
|
|
-#include <standard/php_random.h>
|
|
#include <ext/spl/spl_exceptions.h>
|
|
#include <zend_exceptions.h>
|
|
#include <ext/standard/info.h>
|
|
#include <ext/hash/php_hash.h>
|
|
|
|
+#if PHP_VERSION_ID < 80400
|
|
+#include <ext/standard/php_random.h>
|
|
+#else
|
|
+#include <ext/random/php_random.h>
|
|
+#endif
|
|
|
|
#ifdef PHP_SESSION
|
|
#include <ext/session/php_session.h>
|