]> granicus.if.org Git - apache/commit
Merge r1827362, r1828926, r1828927, r1829557, r1829573, r1829645, r1829657 from trunk:
authorYann Ylavic <ylavic@apache.org>
Fri, 22 Jun 2018 10:04:49 +0000 (10:04 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 22 Jun 2018 10:04:49 +0000 (10:04 +0000)
commit0f7bb9c6af3c5dfb6cb7ea9db2890c39c81b292e
treead54c2cd6433d1a9e4fddb69c59f4648170a3927
parent527efea531914bcdf6c01250dee43d80954468b5
Merge r1827362, r1828926, r1828927, r1829557, r1829573, r1829645, r1829657 from trunk:

core: ap_getline_core() reads nothing for n == 0.

PR62199: add worker parameter ResponseFieldSize to mod_proxy

Submitted By: Hank Ibell
Committed By: covener

add log id for r1828926

core: Add and handle AP_GETLINE_NOSPC_EOL flag in ap_rgetline_core().

This tells the ap_getline() family of functions to consume the end of line
when the buffer is exhausted.

PR 62198.

mod_proxy_http: make use of AP_GETLINE_NOSPC_EOL in ap_proxygetline().

Fixes response header thrown away after the previous one was considered too
large and truncated.

PR 62196.

core: forward flags to recursive/folding call to ap_rgetline_core().

We still need them when folding, other than AP_GETLINE_FOLD itself of course.

mod_proxy_http: follow up to r1829573: remain EBCDIC friendly.

Keep using ap_rgetline() as before r1829573, since ap_rgetline_core() is
EBCDIC agnostic.

Submitted by: ylavic, covener, covener, ylavic, ylavic, ylavic, ylavic
Reviewed by: ylavic, covener, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834093 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
docs/manual/mod/mod_proxy.xml
include/ap_mmn.h
include/http_protocol.h
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy.h
modules/proxy/mod_proxy_http.c
server/protocol.c