summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-01-27 06:02:32 +0000
committerCoprDistGit <infra@openeuler.org>2024-01-27 06:02:32 +0000
commita24a4e292850c2b553dfff3901dbcd91869077c2 (patch)
treeaa76334f80ccf4b225dddf5483f308a6f2f541fc
parentdba972ff2bd79ecde1841b68446953d53f3e2b4a (diff)
automatic import of httpd
-rw-r--r--backport-fix-memory-leak-in-calc_sha256_hash.patch27
-rw-r--r--httpd.spec1
2 files changed, 0 insertions, 28 deletions
diff --git a/backport-fix-memory-leak-in-calc_sha256_hash.patch b/backport-fix-memory-leak-in-calc_sha256_hash.patch
deleted file mode 100644
index e16fc2a..0000000
--- a/backport-fix-memory-leak-in-calc_sha256_hash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ff558f52f528dd21eb0a77de74d828e1459cdd62 Mon Sep 17 00:00:00 2001
-From: Joe Orton <notroj@redhat.com>
-Date: Fri, 7 Jul 2023 08:04:38 PM GMT+0800
-Subject: [PATCH] fix memory leak in calc_sha256_hash
-
-Conflict:NA
-Reference:https://github.com/apache/httpd/commmit/ff558f52f528dd21eb0a77de74d828e1459cdd62
-
----
- modules/http2/h2_push.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/http2/h2_push.c b/modules/http2/h2_push.c
-index 462c470..dd0928b 100644
---- a/modules/http2/h2_push.c
-+++ b/modules/http2/h2_push.c
-@@ -502,6 +502,7 @@ static void calc_sha256_hash(h2_push_diary *diary, apr_uint64_t *phash, h2_push
- sha256_update(md, push->req->authority);
- sha256_update(md, push->req->path);
- EVP_DigestFinal(md, hash, &len);
-+ EVP_MD_CTX_destroy(md);
-
- val = 0;
- for (i = 0; i != len; ++i)
---
-2.23.0
-
diff --git a/httpd.spec b/httpd.spec
index 5820299..d107682 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -69,7 +69,6 @@ Patch15: backport-httpd-2.4.43-gettid.patch
Patch16: backport-httpd-2.4.43-r1861793+.patch
Patch17: backport-httpd-2.4.48-r1828172+.patch
Patch18: backport-httpd-2.4.46-htcacheclean-dont-break.patch
-Patch21: backport-fix-memory-leak-in-calc_sha256_hash.patch
BuildRequires: gcc autoconf pkgconfig findutils xmlto perl-interpreter perl-generators systemd-devel
BuildRequires: zlib-devel libselinux-devel lua-devel brotli-devel