This repository has been archived by the owner on Sep 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Steve Simpson
committed
Jan 6, 2022
1 parent
bb31d89
commit 98500e7
Showing
2 changed files
with
44 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# ./pullrev.sh 1894152 | ||
http://svn.apache.org/viewvc?view=revision&revision=1894152 | ||
|
||
--- httpd-2.4.51/modules/filters/mod_deflate.c.r1894152 | ||
+++ httpd-2.4.51/modules/filters/mod_deflate.c | ||
@@ -835,6 +835,7 @@ | ||
while (!APR_BRIGADE_EMPTY(bb)) | ||
{ | ||
apr_bucket *b; | ||
+ apr_status_t rv; | ||
|
||
/* | ||
* Optimization: If we are a HEAD request and bytes_sent is not zero | ||
@@ -914,8 +915,6 @@ | ||
} | ||
|
||
if (APR_BUCKET_IS_FLUSH(e)) { | ||
- apr_status_t rv; | ||
- | ||
/* flush the remaining data from the zlib buffers */ | ||
zRC = flush_libz_buffer(ctx, c, f->c->bucket_alloc, deflate, | ||
Z_SYNC_FLUSH, NO_UPDATE_CRC); | ||
@@ -947,7 +946,12 @@ | ||
} | ||
|
||
/* read */ | ||
- apr_bucket_read(e, &data, &len, APR_BLOCK_READ); | ||
+ rv = apr_bucket_read(e, &data, &len, APR_BLOCK_READ); | ||
+ if (rv) { | ||
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10298) | ||
+ "failed reading from %s bucket", e->type->name); | ||
+ return rv; | ||
+ } | ||
if (!len) { | ||
apr_bucket_delete(e); | ||
continue; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ | |
|
||
Summary: Apache HTTP Server | ||
Name: httpd24u | ||
Version: 2.4.51 | ||
Version: 2.4.52 | ||
Release: 1%{?dist} | ||
URL: https://httpd.apache.org/ | ||
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 | ||
|
@@ -81,6 +81,8 @@ Patch27: httpd-2.4.2-icons.patch | |
Patch30: httpd-2.4.4-cachehardmax.patch | ||
Patch34: httpd-2.4.17-socket-activation.patch | ||
Patch41: httpd-2.4.43-r1861793+.patch | ||
|
||
Patch65: httpd-2.4.51-r1894152.patch | ||
|
||
# Security fixes | ||
|
||
|
@@ -293,6 +295,7 @@ interface for storing and accessing per-user session data. | |
%patch30 -p1 -b .cachehardmax | ||
%{?with_systemd:%patch34 -p1 -b .socketactivation} | ||
%patch41 -p1 -b .r1861793+ | ||
%patch65 -p1 -b .r1894152 | ||
|
||
# Patch in the vendor string | ||
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h | ||
|
@@ -824,6 +827,10 @@ exit $rv | |
|
||
|
||
%changelog | ||
* Thu Jan 06 2022 Steve Simpson <[email protected]> - 2.4.52-1 | ||
- Updated to 2.4.52 from Upstream | ||
- Added patch r1894152 from FC | ||
|
||
* Fri Oct 08 2021 Steve Simpson <[email protected]> - 2.4.51-1 | ||
- Latest upstream | ||
|
||
|