Compare commits

...

13 Commits

2 changed files with 9 additions and 1 deletions

View File

@ -87,3 +87,8 @@ index 9dcbed1..a1b564d 100644
if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
ap_set_content_type(r, apr_pstrdup(r->pool, buf));
<<<<<<< HEAD
--
2.39.2
=======
>>>>>>> c8-stream-2.4

View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.37
Release: 62%{?dist}
Release: 62%{?dist}.alma.1
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source2: httpd.logrotate
@ -983,6 +983,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Fri Dec 08 2023 Eduard Abdullin <eabdullin@almalinux.org> - 2.4.37-62.alma
- Debrand for AlmaLinux
* Thu Aug 17 2023 Johnny Hughes <jhughes@redhat.com> - 2.4.37-62
- change for CentOS Stream Branding