* server/core.c (merge_core_server_configs): Fix merging of
  HttpProtocolOptions from global to vhost context.

Reviewed by: jorton, wrowe, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1783441 13f79535-47bb-0310-9956-ffa450edef68

http: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4).


http: follow up to r1777460.
We MUST unfold outgoing HTTP headers in any case, "message/http" is for
inner content.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1778094 13f79535-47bb-0310-9956-ffa450edef68

Merge r1775199, r1775664 from trunk:

Fix strict Host: header checking on EBCDIC

on zOS, isascii() really means 7 bit ascii, but our strings
are in ebcdic for 99.95% of the lifetime of the server.



remove initial isascii check entirely

We are already checking an even narrower set of characters
just below.


Submitted by: covener
Reviewed/backported by: jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1777247 13f79535-47bb-0310-9956-ffa450edef68

#define MODULE_MAGIC_NUMBER_MAJOR 20051115

Props to whoever wrote the test that checks the comment vs
the define!




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1777182 13f79535-47bb-0310-9956-ffa450edef68

Confirmed with Bill over email.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1777178 13f79535-47bb-0310-9956-ffa450edef68

For complete patch evolution, see;

http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-merge-http-strict/



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775780 13f79535-47bb-0310-9956-ffa450edef68

Submitted By: Edward Lu <Chaosed0 gmail.com>
Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR 57167 [Edward Lu <Chaosed0 gmail.com>]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775776 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775774 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: ylavic
core: Avoid a possible truncation of the faulty header included in the
HTML response when LimitRequestFieldSize is reached.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775769 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: jailletc36
core: Do not over allocate memory within 'ap_rgetline_core' for the common case.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775767 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775759 13f79535-47bb-0310-9956-ffa450edef68

Backports: r1710095, r1727544
Submitted by: ylavic, rpluem

core: Limit to ten the number of tolerated empty lines between request,
and consume them before the pipelining check to avoid possible response
delay when reading the next request without flushing.

Before this commit, the maximum number of empty lines was the same as
configured LimitRequestFields, defaulting to 100, which was way too much.
We now use a fixed/hard limit of 10 (DEFAULT_LIMIT_BLANK_LINES).

check_pipeline() is changed to check for (up to the limit) and comsume the
trailing [CR]LFs so that they won't be interpreted as pipelined requests,
otherwise we would block on the next read without flushing data, and hence
possibly delay pending response(s) until the next/real request comes in or
the keepalive timeout expires.
 
Finally, when the maximum number of empty line is reached in
read_request_line(), or that request line does not contains at least a method
and an (valid) URI, we can fail early and avoid some failure detected in
further processing.

Ensure that proto_num and protocol is set in another "error out early" edge
case. This can happen with invalid CONNECT requests as described in the PR.
PR: 58929

Borrow Yann's effort at cross-porting this to 2.2.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775758 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775756 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775752 13f79535-47bb-0310-9956-ffa450edef68

to allow us to apply the 2.4.x already-reviewed HttpProtocolOptions and
parser changes.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775749 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: trawick
Another comment-only backport syncing to 2.4.x




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775735 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: trawick
s/ensure/insure/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775733 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: trawick
zap an unhelpful, out of date comment from httpd 1.2



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775732 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: niq
Reject requests containing (invalid) NULL characters in request line
or request headers.
PR 43039

Backports: r892808
Submitted by: rpluem
Fix up r892678


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775731 13f79535-47bb-0310-9956-ffa450edef68

trunk patch: http://svn.apache.org/r1483005
Submitted by: jailletc36


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775730 13f79535-47bb-0310-9956-ffa450edef68

No effective code change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775728 13f79535-47bb-0310-9956-ffa450edef68

navigated 2.4.x-merge-http-strict backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775727 13f79535-47bb-0310-9956-ffa450edef68

Submitted By: Edward Lu <Chaosed0 gmail.com>
Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR 57167 [Edward Lu <Chaosed0 gmail.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775718 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: jailletc36
Fix sscanf format spotted by cppcheck 
(changes version major/minor types from signed to unsigned)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775717 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: jailletc36
Improve error message
PR 54384



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775715 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: sf
remove obsolete comment from 1.3 days


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775714 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: sf
remove some more old unused code


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775713 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: sf
Remove unused code. "Next week" hasn't happened in the last 10 years or so.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775712 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: trawick
core: ErrorDocument now works for requests without a Host header.
PR: 48357


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775711 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: sf
Make sure that a triggering LimitRequestFieldSize is always logged, even if the
first read already exeeds the limit and ap_rgetline does not return a header
name.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775710 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: trawick
s/ensure/insure/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775708 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: trawick
zap an unhelpful, out of date comment from httpd 1.2



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775707 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: rpluem
Correctly return a 400 (Bad request) in case of a HTTP/0.9 request like
GET @example.org/foo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775706 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: sf
Downgrade some more log messages indicating client errors from level error to
info. Add log messages for various reasons to return HTTP_BAD_REQUEST.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775705 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: sf
Enforce LimitRequestFieldSize after multiple headers with the same
name have been merged.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775699 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: sf
Use APR_STATUS_IS_... in some more cases.
While this is not strictly necessary everywhere, it makes it much easier
to find the problematic cases.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775697 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: covener
use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775696 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: trawick
comment on where multiple headers with same name get merged

(some strict Cookie parsers can't handle what happens later,
but that is not our fault)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775695 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: rpluem
Fix up r892678



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775692 13f79535-47bb-0310-9956-ffa450edef68

Submitted by: niq
Reject requests containing (invalid) NULL characters in request line
or request headers.
PR 43039


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775691 13f79535-47bb-0310-9956-ffa450edef68