update mod_http2 to 1.15.11

This commit is contained in:
eaglegai 2020-06-23 17:07:02 +08:00
parent 8428c5801c
commit acb439ca25
4 changed files with 39 additions and 4 deletions

View File

@ -0,0 +1,28 @@
From dfe2b46068d92872084a22efc7e5229651889711 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 14 Mar 2019 10:40:18 +0000
Subject: [PATCH] Fix build with earlier 2.4.x which don't define
AP_STATUS_IS_HEADER_ONLY.
---
mod_http2/h2_from_h1.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/mod_http2/h2_from_h1.c b/mod_http2/h2_from_h1.c
index edb1d8e..0753099 100644
--- a/mod_http2/h2_from_h1.c
+++ b/mod_http2/h2_from_h1.c
@@ -35,6 +35,10 @@
#include "h2_task.h"
#include "h2_util.h"
+#ifndef AP_STATUS_IS_HEADER_ONLY
+#define AP_STATUS_IS_HEADER_ONLY(x) ((x) == HTTP_NO_CONTENT || \
+ (x) == HTTP_NOT_MODIFIED)
+#endif
/* This routine is called by apr_table_do and merges all instances of
* the passed field values into a single array that will be further
--
1.8.3.1

Binary file not shown.

BIN
mod_http2-1.15.11.tar.gz Normal file

Binary file not shown.

View File

@ -1,12 +1,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.10.20 Version: 1.15.11
Release: 4 Release: 1
Summary: Support for the HTTP/2 transport layer Summary: Support for the HTTP/2 transport layer
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}/%{name}-%{version}.tar.gz Source0: https://github.com/icing/mod_h2/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch1: fix-build-with-earlier-2.4.x-which-don-t-define-AP_S.patch
BuildRequires: gcc pkgconfig httpd-devel libnghttp2-devel openssl-devel BuildRequires: gcc pkgconfig httpd-devel libnghttp2-devel openssl-devel
Requires: httpd-mmn = %{_httpd_mmn} Requires: httpd-mmn = %{_httpd_mmn}
@ -25,8 +26,8 @@ See Apache downloads to get a released version. mod_proxy_h[ttp]2 has been relea
%install %install
%make_install %make_install
mv -f %{buildroot}%{_httpd_moddir}/mod_http2.so.0.0.0 %{buildroot}%{_httpd_moddir}/mod_http2.so #mv -f %{buildroot}%{_httpd_moddir}/mod_http2.so.0.0.0 %{buildroot}%{_httpd_moddir}/mod_http2.so
mv -f %{buildroot}%{_httpd_moddir}/mod_proxy_http2.so.0.0.0 %{buildroot}%{_httpd_moddir}/mod_proxy_http2.so #mv -f %{buildroot}%{_httpd_moddir}/mod_proxy_http2.so.0.0.0 %{buildroot}%{_httpd_moddir}/mod_proxy_http2.so
mkdir -p %{buildroot}%{_httpd_modconfdir} mkdir -p %{buildroot}%{_httpd_modconfdir}
echo "LoadModule http2_module modules/mod_http2.so" > %{buildroot}%{_httpd_modconfdir}/10-h2.conf echo "LoadModule http2_module modules/mod_http2.so" > %{buildroot}%{_httpd_modconfdir}/10-h2.conf
echo "LoadModule proxy_http2_module modules/mod_proxy_http2.so" > %{buildroot}%{_httpd_modconfdir}/10-proxy_h2.conf echo "LoadModule proxy_http2_module modules/mod_proxy_http2.so" > %{buildroot}%{_httpd_modconfdir}/10-proxy_h2.conf
@ -48,6 +49,12 @@ make check
%exclude /etc/httpd/share/doc/* %exclude /etc/httpd/share/doc/*
%changelog %changelog
* Tue Jun 23 2020 gaihuiying <gaihuiying1@huawei.com> - 1.15.11-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update mod_http2 to 1.15.11-1
* Thu Sep 05 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.10.20-4 * Thu Sep 05 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.10.20-4
- Type:enhance - Type:enhance
- ID:NA - ID:NA