diff options
author | Remi Collet <remi@remirepo.net> | 2024-10-08 10:43:15 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2024-10-08 10:43:15 +0200 |
commit | d256a74edfec7568501fd18e0060f7545124441a (patch) | |
tree | 5aca2ed2fd008173248ddf7d7b779976352639f1 /oauth-php84.patch | |
parent | 9d6b2d38a22e0302b9f7ce697fbb29f1aa4130f2 (diff) |
drop patches merged upstream
Diffstat (limited to 'oauth-php84.patch')
-rw-r--r-- | oauth-php84.patch | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/oauth-php84.patch b/oauth-php84.patch deleted file mode 100644 index 3eacf17..0000000 --- a/oauth-php84.patch +++ /dev/null @@ -1,100 +0,0 @@ -From e7f262becf3feb65c8195fff4591d9dbd8acbace Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Tue, 9 Jul 2024 15:09:40 +0200 -Subject: [PATCH 1/2] fix for PHP 8.4 - ---- - oauth.c | 2 +- - php_oauth.h | 6 +++++- - provider.c | 6 +++++- - 3 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/oauth.c b/oauth.c -index 46fe08b..9bd8d2a 100644 ---- a/oauth.c -+++ b/oauth.c -@@ -1330,7 +1330,7 @@ static void make_standard_query(HashTable *ht, php_so_object *soo) /* {{{ */ - gettimeofday((struct timeval *) &tv, (struct timezone *) NULL); - sec = (int) tv.tv_sec; - usec = (int) (tv.tv_usec % 0x100000); -- spprintf(&nonce, 0, "%ld%08x%05x%.8f", php_rand(), sec, usec, php_combined_lcg() * 10); -+ spprintf(&nonce, 0, "%d%08x%05x%.8f", php_mt_rand(), sec, usec, php_combined_lcg() * 10); - } - - add_arg_for_req(ht, OAUTH_PARAM_CONSUMER_KEY, Z_STRVAL_P(soo_get_property(soo, OAUTH_ATTR_CONSUMER_KEY))); -diff --git a/php_oauth.h b/php_oauth.h -index e5a1225..63a29ec 100644 ---- a/php_oauth.h -+++ b/php_oauth.h -@@ -29,7 +29,12 @@ - #include "php_main.h" - #include "php_ini.h" - #include "ext/standard/php_string.h" -+#if PHP_VERSION_ID < 80400 - #include "ext/standard/php_rand.h" -+#include "ext/standard/php_lcg.h" -+#else -+#include "ext/random/php_random.h" -+#endif - #include "ext/standard/php_smart_string.h" - #include "ext/standard/info.h" - #include "ext/standard/php_string.h" -@@ -41,7 +46,6 @@ - #include "php_globals.h" - #include "ext/standard/file.h" - #include "ext/standard/base64.h" --#include "ext/standard/php_lcg.h" - #include "ext/pcre/php_pcre.h" - #include "php_network.h" - -diff --git a/provider.c b/provider.c -index cd853f0..f1f8e2a 100644 ---- a/provider.c -+++ b/provider.c -@@ -235,8 +235,12 @@ static int oauth_provider_parse_auth_header(php_oauth_provider *sop, char *auth_ - #endif - &return_value, - &subpats, -+#if PHP_VERSION_ID < 80400 - 1, /* global */ - 1, /* use flags */ -+#else -+ true, /* global */ -+#endif - 2, /* PREG_SET_ORDER */ - 0 - ); -@@ -956,7 +960,7 @@ SOP_METHOD(generateToken) - php_error_docref(NULL, E_WARNING, "Could not gather enough random data, falling back on rand()"); - } - while (reaped < size) { -- iv[reaped++] = (char) (255.0 * php_rand() / RAND_MAX); -+ iv[reaped++] = (char)php_mt_rand_range(0, 255); - } - } - - -From 95f349152e6e0797068970ca7e6b265310316c0f Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Mon, 30 Sep 2024 09:36:58 +0200 -Subject: [PATCH 2/2] use zend_str_tolower - ---- - oauth.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/oauth.c b/oauth.c -index 9bd8d2a..24c60c9 100644 ---- a/oauth.c -+++ b/oauth.c -@@ -599,8 +599,8 @@ zend_string *oauth_generate_sig_base(php_so_object *soo, const char *http_method - php_url_free(urlparts); - return NULL; - } -- php_strtolower(OAUTH_URL_STR(urlparts->scheme), OAUTH_URL_LEN(urlparts->scheme)); -- php_strtolower(OAUTH_URL_STR(urlparts->host), OAUTH_URL_LEN(urlparts->host)); -+ zend_str_tolower(OAUTH_URL_STR(urlparts->scheme), OAUTH_URL_LEN(urlparts->scheme)); -+ zend_str_tolower(OAUTH_URL_STR(urlparts->host), OAUTH_URL_LEN(urlparts->host)); - smart_string_appends(&sbuf, OAUTH_URL_STR(urlparts->scheme)); - smart_string_appends(&sbuf, "://"); - smart_string_appends(&sbuf, OAUTH_URL_STR(urlparts->host)); |