rpms/mod_http2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 1.15.7

Browse Source
This commit is contained in:
Joe Orton 2020-03-06 15:34:30 +00:00
parent bc6b2b9b4f
commit 0b23493df2
3 changed files with 5 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
mod_http2-1.15.5-warnfix.patch
View File

@ -1,66 +0,0 @@
From e21a68a6c4e94cdafccb869c5aa9d771b0e18b91 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 7 Feb 2020 13:23:10 +0000
Subject: [PATCH] Remove unused leave_ctx from h2_beam_lock structure and
adjust callers.
Not sure why but I'm seeing gcc 10 warnings on s390x (only) for this.
h2_bucket_beam.c: In function 'h2_beam_abort':
h2_bucket_beam.c:222:9: error: 'bl.leave_ctx' may be used uninitialized in this function [-Werror=maybe-uninitialized]
222 | pbl->leave(pbl->leave_ctx, pbl->mutex);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
h2_bucket_beam.c:710:18: note: 'bl.leave_ctx' was declared here
710 | h2_beam_lock bl;
| ^~
h2_bucket_beam.c: In function 'h2_beam_close':
h2_bucket_beam.c:222:9: error: 'bl.leave_ctx' may be used uninitialized in this function [-Werror=maybe-uninitialized]
222 | pbl->leave(pbl->leave_ctx, pbl->mutex);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
mod_http2/h2_bucket_beam.c | 5 ++---
mod_http2/h2_bucket_beam.h | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/mod_http2/h2_bucket_beam.c b/mod_http2/h2_bucket_beam.c
index a7f5edf..607ac1e 100644
--- a/mod_http2/h2_bucket_beam.c
+++ b/mod_http2/h2_bucket_beam.c
@@ -196,9 +196,8 @@ static apr_bucket *h2_beam_bucket(h2_bucket_beam *beam,
* bucket beam that can transport buckets across threads
******************************************************************************/
-static void mutex_leave(void *ctx, apr_thread_mutex_t *lock)
+static void mutex_leave(apr_thread_mutex_t *lock)
{
- (void)ctx;
apr_thread_mutex_unlock(lock);
}
@@ -219,7 +218,7 @@ static void leave_yellow(h2_bucket_beam *beam, h2_beam_lock *pbl)
{
(void)beam;
if (pbl->leave) {
- pbl->leave(pbl->leave_ctx, pbl->mutex);
+ pbl->leave(pbl->mutex);
}
}
diff --git a/mod_http2/h2_bucket_beam.h b/mod_http2/h2_bucket_beam.h
index f260762..1a6418c 100644
--- a/mod_http2/h2_bucket_beam.h
+++ b/mod_http2/h2_bucket_beam.h
@@ -126,12 +126,11 @@ typedef struct {
* buffers until the transmission is complete. Star gates use a similar trick.
*/
-typedef void h2_beam_mutex_leave(void *ctx, struct apr_thread_mutex_t *lock);
+typedef void h2_beam_mutex_leave(struct apr_thread_mutex_t *lock);
typedef struct {
apr_thread_mutex_t *mutex;
h2_beam_mutex_leave *leave;
- void *leave_ctx;
} h2_beam_lock;
typedef struct h2_bucket_beam h2_bucket_beam;

7
mod_http2.spec
View File

@ -2,14 +2,13 @@
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
Name: mod_http2
Version: 1.15.5
Version: 1.15.7
Release: 1%{?dist}
Summary: module implementing HTTP/2 for Apache 2
License: ASL 2.0
URL: https://icing.github.io/mod_h2/
Source0: https://github.com/icing/mod_h2/releases/download/v%{version}/mod_http2-%{version}.tar.gz
Patch1: mod_http2-1.14.1-buildfix.patch
Patch2: mod_http2-1.15.5-warnfix.patch
BuildRequires: gcc
BuildRequires: pkgconfig, httpd-devel >= 2.4.20, libnghttp2-devel >= 1.7.0, openssl-devel >= 1.0.2
Requires: httpd-mmn = %{_httpd_mmn}
@ -22,7 +21,6 @@ top of libnghttp2 for httpd 2.4 servers.
%prep
%setup -q
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .warnfix
%build
%configure
@ -46,6 +44,9 @@ echo "LoadModule proxy_http2_module modules/mod_proxy_http2.so" > %{buildroot}%{
%{_httpd_moddir}/mod_proxy_http2.so
%changelog
* Fri Mar 6 2020 Joe Orton <jorton@redhat.com> - 1.15.7-1
- update to 1.15.7
* Fri Feb 7 2020 Joe Orton <jorton@redhat.com> - 1.15.5-1
- update to 1.15.5

2
sources
View File

@ -1 +1 @@
SHA512 (mod_http2-1.15.5.tar.gz) = 6255a46a22e5df6f8fed9ce65079979a3c613cccf1a95559ff0832ab2efe5fb98d51abfe83c006b9a3c7452bb4e78e3e67e94d7c14618fa312c7236a34e6b280
SHA512 (mod_http2-1.15.7.tar.gz) = effe0a8f41603865a9dceea6fa109a924e6f2f904a2a02ebf10a20e0315f248cfaf91d4b2a0d6168ee94fb0f4af2680a6992c43cc91b0bf47a13d739b4cf9228