.gear/apache2-mod_http2.spec | 158 ++++++++++++++++++++++++++++++++++++++++++ .gear/apache2-mod_http2.watch | 3 + .gear/rules | 4 ++ .gear/tags/list | 1 + .gear/upstream/remotes | 3 + configure.ac | 2 +- mod_http2/mod_proxy_http2.c | 2 +- 7 files changed, 171 insertions(+), 2 deletions(-) diff --git a/.gear/apache2-mod_http2.spec b/.gear/apache2-mod_http2.spec new file mode 100644 index 0000000..48e09f5 --- /dev/null +++ b/.gear/apache2-mod_http2.spec @@ -0,0 +1,158 @@ +Name: apache2-mod_http2 +Version: 2.0.21 +Release: alt1 +Summary: module implementing HTTP/2 for Apache 2 +Group: System/Servers +License: Apache-2.0 +URL: https://icing.github.io/mod_h2/ +Source0: %name-%version.tar +Source1: %name.watch +Patch0: %name-%version-alt.patch +BuildRequires(pre): apache2-devel > 2.4.27-alt1 +BuildRequires: pkgconfig, libnghttp2-devel >= 1.7.0, libssl-devel >= 1.0.2, libaprutil1-devel, libcurl-devel +Provides: mod_h2 = %EVR +Provides: mod_http2 = %EVR +Provides: apache2-mod_h2 = %EVR + +%description +The mod_h2 Apache httpd module implements the HTTP2 protocol (h2+h2c) on +top of libnghttp2 for httpd 2.4 servers. + +%prep +%setup -q +%patch0 -p1 + +%build +%autoreconf -fisv +%configure +%make + +%install +make DESTDIR=%{buildroot} install +rm -rf %buildroot/etc/httpd/share/doc/ + +# create configuration +mkdir -p %buildroot%apache2_mods_available +echo "LoadModule http2_module modules/mod_http2.so" > %buildroot%apache2_mods_available/%name.load +echo "LoadModule proxy_http2_module modules/mod_proxy_http2.so" > %buildroot%apache2_mods_available/mod_proxy_http2.load + +%files +%doc README README.md ChangeLog AUTHORS LICENSE +%apache2_mods_available/*.load +%apache2_moduledir/mod_http2.so +%apache2_moduledir/mod_proxy_http2.so + +%changelog +* Fri Aug 11 2023 Anton Farygin 2.0.21-alt1 +- 2.0.18 -> 2.0.21 + +* Sun Jun 04 2023 Anton Farygin 2.0.18-alt1 +- 2.0.16 -> 2.0.18 + +* Tue May 23 2023 Anton Farygin 2.0.16-alt1 +- 2.0.15 -> 2.0.16 + +* Mon May 15 2023 Anton Farygin 2.0.15-alt1 +- 2.0.14 -> 2.0.15 + +* Fri May 12 2023 Anton Farygin 2.0.14-alt1 +- 2.0.12 -> 2.0.14 + +* Wed Feb 01 2023 Anton Farygin 2.0.12-alt1 +- 2.0.11 -> 2.0.12 + +* Wed Nov 09 2022 Anton Farygin 2.0.11-alt1 +- 2.0.9 -> 2.0.11 + +* Wed Oct 05 2022 Anton Farygin 2.0.9-alt1 +- 2.0.2 -> 2.0.9 + +* Fri Dec 10 2021 Anton Farygin 2.0.2-alt1 +- 2.0.1 -> 2.0.2 + +* Sun Dec 05 2021 Anton Farygin 2.0.1-alt1 +- 1.15.24 -> 2.0.1 + +* Sun Sep 26 2021 Anton Farygin 1.15.24-alt1 +- 1.15.24 + +* Tue Aug 03 2021 Anton Farygin 1.15.23-alt1 +- 1.15.23 + +* Thu May 20 2021 Anton Farygin 1.15.19-alt1 +- 1.15.19 + +* Thu Feb 25 2021 Anton Farygin 1.15.17-alt1 +- 1.15.17 + +* Mon Sep 28 2020 Anton Farygin 1.15.16-alt1 +- 1.15.16 + +* Tue Aug 18 2020 Anton Farygin 1.15.14-alt1 +- 1.15.14 + +* Thu Jul 23 2020 Anton Farygin 1.15.13-alt1 +- 1.15.13 + +* Thu Jun 04 2020 Anton Farygin 1.15.10-alt1 +- 1.15.10 + +* Tue Apr 07 2020 Anton Farygin 1.15.7-alt1 +- 1.15.7 + +* Thu Dec 26 2019 Anton Farygin 1.15.5-alt1 +- 1.15.5 + +* Wed Nov 27 2019 Anton Farygin 1.15.4-alt1 +- 1.15.4 + +* Tue Jul 23 2019 Anton Farygin 1.15.3-alt1 +- 1.15.3 + +* Thu Jun 20 2019 Anton Farygin 1.15.2-alt1 +- 1.15.2 + +* Sat Jun 01 2019 Anton Farygin 1.15.1-alt1 +- 1.15.1 + +* Fri Mar 15 2019 Anton Farygin 1.14.1-alt1 +- 1.14.1 + +* Thu Feb 21 2019 Anton Farygin 1.12.5-alt1 +- 1.12.5 + +* Wed Feb 06 2019 Anton Farygin 1.12.2-alt1 +- 1.12.2 + +* Sun Jan 20 2019 Anton Farygin 1.12.1-alt1 +- 1.12.1 + +* Mon Nov 12 2018 Anton Farygin 1.11.4-alt1 +- 1.11.4 + +* Thu Oct 11 2018 Anton Farygin 1.11.3-alt1 +- 1.11.3 + +* Mon Sep 03 2018 Anton Farygin 1.11.0-alt1 +- 1.11.0 + +* Wed Aug 29 2018 Grigory Ustinov 1.10.20-alt1.1 +- NMU: Rebuild with new openssl 1.1.0. + +* Tue May 08 2018 Anton Farygin 1.10.20-alt1 +- 1.10.20 + +* Sat Mar 31 2018 Anton Farygin 1.10.16-alt1 +- new version + +* Wed Jan 10 2018 Anton Farygin 1.10.14-alt1 +- new version + +* Wed Nov 01 2017 Anton Farygin 1.10.13-alt1 +- new version + +* Tue Oct 10 2017 Anton Farygin 1.10.12-alt1 +- new version + +* Wed Jul 19 2017 Anton Farygin 1.10.7-alt1 +- first build for ALT diff --git a/.gear/apache2-mod_http2.watch b/.gear/apache2-mod_http2.watch new file mode 100644 index 0000000..ad653aa --- /dev/null +++ b/.gear/apache2-mod_http2.watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/mod_h2-$1\.tar\.gz/ \ +https://github.com/icing/mod_h2/tags .*/v?(\d\S+)\.tar\.gz diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..48dd99d --- /dev/null +++ b/.gear/rules @@ -0,0 +1,4 @@ +tar: v@version@:. +copy: .gear/*.watch +diff: v@version@:. . name=@name@-@version@-alt.patch +spec: .gear/apache2-mod_http2.spec diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..0f30ac6 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +25c091c278d0659c63398fbfbff3fbdb176e586f v2.0.21 diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 0000000..d867980 --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = https://github.com/icing/mod_h2 + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/configure.ac b/configure.ac index a64d684..2b02077 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,7 @@ LIBEXEC_DIR="$($APXS -q LIBEXECDIR)" AC_SUBST(LIBEXEC_DIR) LDFLAGS="-L$libdir $LDFLAGS" -CPPFLAGS="-I$($APXS -q includedir) -I$($APXS -q APR_INCLUDEDIR) $($APXS -q EXTRA_CPPFLAGS) $CPPFLAGS" +CPPFLAGS="-I$($APXS -q includedir) -I$($APXS -q APR_INCLUDEDIR) -I$($APXS -q APU_INCLUDEDIR) $($APXS -q EXTRA_CPPFLAGS) $CPPFLAGS" HTTPD_VERSION="$($APXS -q HTTPD_VERSION)" AC_SUBST(HTTPD_VERSION) diff --git a/mod_http2/mod_proxy_http2.c b/mod_http2/mod_proxy_http2.c index 6e24dde..69c9c1f 100644 --- a/mod_http2/mod_proxy_http2.c +++ b/mod_http2/mod_proxy_http2.c @@ -320,7 +320,7 @@ static int proxy_http2_handler(request_rec *r, char *locurl = url, *u; apr_size_t slen; int is_ssl = 0; - apr_status_t status; + apr_status_t status = APR_EINIT; h2_proxy_ctx *ctx; apr_uri_t uri; int reconnects = 0;