summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-06-06 18:41:33 +0200
committerRemi Collet <remi@php.net>2023-06-06 18:41:33 +0200
commite95b6e186b901aba36bd5cd2419755f47215fc60 (patch)
tree8407d9a9ad3c0eb63080976248d37cb88997c1cc
parent3f6a0b0aa9d7ca69869cad7a5d3df3b798463bfd (diff)
more upstream patch
-rw-r--r--php-ghsa-76gg-c692-v2mw.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/php-ghsa-76gg-c692-v2mw.patch b/php-ghsa-76gg-c692-v2mw.patch
index 409ffec..aa67ee6 100644
--- a/php-ghsa-76gg-c692-v2mw.patch
+++ b/php-ghsa-76gg-c692-v2mw.patch
@@ -100,3 +100,27 @@ index ee3dcbdc9a..e3a9afdbe9 100644
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(digest), "nc", sizeof("nc")-1)) != NULL &&
Z_TYPE_P(tmp) == IS_LONG) {
+From 40439039c224bb8cdebd1b7b3d03b8cc11e7cce7 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 6 Jun 2023 18:05:22 +0200
+Subject: [PATCH] Fix GH-11382 add missing hash header for bin2hex
+
+---
+ ext/soap/php_http.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
+index e3a9afdbe9f..912b8e341d8 100644
+--- a/ext/soap/php_http.c
++++ b/ext/soap/php_http.c
+@@ -22,6 +22,7 @@
+ #include "ext/standard/base64.h"
+ #include "ext/standard/md5.h"
+ #include "ext/standard/php_random.h"
++#include "ext/hash/php_hash.h"
+
+ static char *get_http_header_value_nodup(char *headers, char *type, size_t *len);
+ static char *get_http_header_value(char *headers, char *type);
+--
+2.40.1
+