update to 1.13.0

This commit is contained in:
Joe Orton 2019-02-27 16:56:00 +00:00
parent b4e5e36db7
commit 33f02aa766
3 changed files with 34 additions and 3 deletions

View File

@ -0,0 +1,26 @@
From 0d7f9a32659e168e4abbda6899ce5c82010f4926 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 26 Feb 2019 17:06:04 +0000
Subject: [PATCH] Fix GCC warning if first "goto cleanup" branch is taken.
mod_proxy_http2.c: In function 'proxy_http2_handler':
mod_proxy_http2.c:460:12: error: 'status' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (status != APR_SUCCESS) {
^
---
mod_http2/mod_proxy_http2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod_http2/mod_proxy_http2.c b/mod_http2/mod_proxy_http2.c
index 8479d7a..bb6880e 100644
--- a/mod_http2/mod_proxy_http2.c
+++ b/mod_http2/mod_proxy_http2.c
@@ -358,7 +358,7 @@ static int proxy_http2_handler(request_rec *r,
ctx->flushall = apr_table_get(r->subprocess_env, "proxy-flushall")? 1 : 0;
ctx->req_buffer_size = (32*1024);
ctx->r = r;
- ctx->r_status = HTTP_SERVICE_UNAVAILABLE;
+ ctx->r_status = status = HTTP_SERVICE_UNAVAILABLE;
ctx->r_done = 0;
ctx->r_may_retry = 1;

View File

@ -2,12 +2,13 @@
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)} %{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
Name: mod_http2 Name: mod_http2
Version: 1.12.1 Version: 1.13.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: module implementing HTTP/2 for Apache 2 Summary: module implementing HTTP/2 for Apache 2
License: ASL 2.0 License: ASL 2.0
URL: https://icing.github.io/mod_h2/ URL: https://icing.github.io/mod_h2/
Source0: https://github.com/icing/mod_h2/releases/download/v%{version}/mod_http2-%{version}.tar.gz Source0: https://github.com/icing/mod_h2/releases/download/v%{version}/mod_http2-%{version}.tar.gz
Patch0: mod_http2-1.13.0-warnings.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pkgconfig, httpd-devel >= 2.4.20, libnghttp2-devel >= 1.7.0, openssl-devel >= 1.0.2 BuildRequires: pkgconfig, httpd-devel >= 2.4.20, libnghttp2-devel >= 1.7.0, openssl-devel >= 1.0.2
Requires: httpd-mmn = %{_httpd_mmn} Requires: httpd-mmn = %{_httpd_mmn}
@ -19,6 +20,7 @@ top of libnghttp2 for httpd 2.4 servers.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .warnings
%build %build
%configure %configure
@ -51,6 +53,9 @@ make check
%{_httpd_moddir}/mod_proxy_http2.so %{_httpd_moddir}/mod_proxy_http2.so
%changelog %changelog
* Tue Feb 26 2019 Joe Orton <jorton@redhat.com> - 1.13.0-1
- update to 1.13.0
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (mod_http2-1.12.1.tar.gz) = 72cb915bdd283742a7bc2676adf3440d5e30588df87e4dc5750886747b0026e0cd0a36f08a39c323e647c83ecef6b434b33c23c96bb7c00ad480d430c1f37f44 SHA512 (mod_http2-1.13.0.tar.gz) = 1302d4e9255811411432043df606dee775fbecd986bb5d9da53b5ef5c8a3600f3e23904f59e3d35d67910b70bde0e1d906445d5e3037ac80e5381eefe3839082