Compare commits
No commits in common. "c8-stream-2.4" and "stream-httpd-2.4-rhel-8.10.0" have entirely different histories.
c8-stream-
...
stream-htt
3
.do-not-sync-with-fedora
Normal file
3
.do-not-sync-with-fedora
Normal file
@ -0,0 +1,3 @@
|
||||
Owner: luhliari
|
||||
Rationale: RHEL branding is used in this package, will be merged manually
|
||||
with Fedora as required.
|
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,2 +1,5 @@
|
||||
SOURCES/apache-poweredby.png
|
||||
SOURCES/httpd-2.4.37.tar.bz2
|
||||
/httpd-2.4.28.tar.bz2
|
||||
/httpd-2.4.33.tar.bz2
|
||||
/httpd-2.4.35.tar.bz2
|
||||
/httpd-2.4.37.tar.bz2
|
||||
/httpd.conf.5
|
||||
|
@ -1,2 +0,0 @@
|
||||
3a7449d6cff00e5ccb3ed8571f34c0528555d38f SOURCES/apache-poweredby.png
|
||||
4a38471de821288b0300148016f2b03dfee8adf2 SOURCES/httpd-2.4.37.tar.bz2
|
1
01-md.conf
Normal file
1
01-md.conf
Normal file
@ -0,0 +1 @@
|
||||
LoadModule md_module modules/mod_md.so
|
@ -1,48 +0,0 @@
|
||||
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
|
||||
index 27c44b2..bfa8952 100644
|
||||
--- a/modules/http/http_filters.c
|
||||
+++ b/modules/http/http_filters.c
|
||||
@@ -1290,6 +1290,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
|
||||
request_rec *r = f->r;
|
||||
conn_rec *c = r->connection;
|
||||
const char *clheader;
|
||||
+ int header_only = (r->header_only || AP_STATUS_IS_HEADER_ONLY(r->status));
|
||||
const char *protocol = NULL;
|
||||
apr_bucket *e;
|
||||
apr_bucket_brigade *b2;
|
||||
@@ -1307,7 +1308,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
|
||||
}
|
||||
else if (ctx->headers_sent) {
|
||||
/* Eat body if response must not have one. */
|
||||
- if (r->header_only || AP_STATUS_IS_HEADER_ONLY(r->status)) {
|
||||
+ if (header_only) {
|
||||
/* Still next filters may be waiting for EOS, so pass it (alone)
|
||||
* when encountered and be done with this filter.
|
||||
*/
|
||||
@@ -1526,14 +1527,21 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
|
||||
|
||||
terminate_header(b2);
|
||||
|
||||
- rv = ap_pass_brigade(f->next, b2);
|
||||
- if (rv != APR_SUCCESS) {
|
||||
- goto out;
|
||||
+ if (header_only) {
|
||||
+ e = APR_BRIGADE_LAST(b);
|
||||
+ if (e != APR_BRIGADE_SENTINEL(b) && APR_BUCKET_IS_EOS(e)) {
|
||||
+ APR_BUCKET_REMOVE(e);
|
||||
+ APR_BRIGADE_INSERT_TAIL(b2, e);
|
||||
+ ap_remove_output_filter(f);
|
||||
+ }
|
||||
+ apr_brigade_cleanup(b);
|
||||
}
|
||||
+
|
||||
+ rv = ap_pass_brigade(f->next, b2);
|
||||
+ apr_brigade_cleanup(b2);
|
||||
ctx->headers_sent = 1;
|
||||
|
||||
- if (r->header_only || AP_STATUS_IS_HEADER_ONLY(r->status)) {
|
||||
- apr_brigade_cleanup(b);
|
||||
+ if (rv != APR_SUCCESS || header_only) {
|
||||
goto out;
|
||||
}
|
||||
|
BIN
apache-poweredby.png
Normal file
BIN
apache-poweredby.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.6 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user