Noted backport revno 1727544 which actually occurs at r1775758

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

Resume building the appropriate patches for relevant 2.2.x -> 2.4.x changes
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

Backports: r1057372
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

Backports: r1237407
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

Backports: r1213391
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

Backports: r892678
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

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

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

Delete gratuitous delta between 2.3-dev and 2.2.x branch.

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

Branching at 2.2.x to arrive at 2.4.23 to *then* apply all of the already
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

Backports: r1635762
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

Backports: r1621419 (protocol.c only)
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

Backports: r1433613
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

Backports: r1407528
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

Backports: r1407088
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

Backports: r1407004
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

Backports: r1392347
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

Backports: r1352911
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

Backports: r1237407
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

Backports: r1213391
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

Backports: r1188745
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

Backports: r1185385
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

Backports: r1178566
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

Backports: r1102124 (in part, protocol.c only)
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

Backports: r1100511
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

Backports: r1057372
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

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@1775692 13f79535-47bb-0310-9956-ffa450edef68

Backports: r892678
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

For purposes of constructing a patch against 2.2.31, show all work since 2.2.32 bump

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

And we are at .32-dev

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

Prepare to tag 2.2.31

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

Fix Copyright of any latex conversions of the docs

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

Fix MOD_OPTIONAL_HOOK_EXPORT_H #include guard spelling (silliest compile
warning in 2.2 codebase?)
Backports: r1514215
Submitted by: trawick

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

Approve and commit symbols export, with simplified CHANGES

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

+1

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

Address mod_proxy_balancer's linking issue on Windows.

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

remove dependency to store.h removed from OpenSSL 1.0.x

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

Easy vote.

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

fix silly warning?

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

Rebuild.

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

XML updates.

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

On to 2.2.31-dev

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

Prepare to tag 2.2.30

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

Rebuild all of httpd-2.2 docs

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

Add CHANGES entry for r1678698.

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

Merge r1688536 and r1688538 from trunk.

http: follow up to r1685345, also needed in 2.4.x/2.2.x by r1686271/r1687339.
Handle reentrance of state BODY_CHUNK_CR to avoid AH02901 when we eat BWS
from multiple reads.

http: follow up to r1685345.
Be lenient up to 10 (room for 32bit decimals) Bad White Spaces (BWS)
between chunk-size and chunk-ext/CRLF.

Submitted by: ylavic
Reviewed by: ylavic, wrowe, mrumph

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

Vote for http_filters fix

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

Vote up one patch across two branches

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

Rebuild.

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

XML update.

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

I guess this is also a showstopper in 2.2.x, some (new/dedicated) framework
tests fail without it.

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

Merge r1688274 from trunk.

http: Fix LimitRequestBody checks when there is no more bytes to read.

Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
Committed by: ylavic
Reviewed  by: ylavic, mrumph, wrowe

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

Accept patches against showstopper

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

Generated doc changes

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

Grammar, spelling, and other minor corrections

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

Propose follow up to r1686271 (chunk-size parsing) for 2.2.x.

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

Add Bill's fixes to SubstituteInheritBefore proposal.

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

Address wrowe's -1.

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

This patch is a no-go, will defer to post-2.2.30

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

Vote for fix to LimitRequestBody

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

Propose fix for LimitRequestBody check.

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

Note discarded vote and refer to 2.2.x instead of 2.4.x for the backport.

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

Update mod_substitute proposal with r1687539 and r1687680, plus the backport patch.

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

Note objection

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

Merge r1685345, r1685347, r1685349 and r1685350 from trunk.

core: Allow spaces after chunk-size for compatibility with implementations
using a pre-filled buffer.

Submitted by: ylavic, trawick
Reviewed by: ylavic, wrowe, minfrin

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

SECURITY: CVE-2015-3183 (cve.mitre.org)
core: Fix chunk header parsing defect.
Remove apr_brigade_flatten(), buffering and duplicated code from
the HTTP_IN filter, parse chunks in a single pass with zero copy.
Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
authorized characters.

Submitted by: minfrin, ylavic
Reviewed by: ylavic, wrowe, minfrin
Reported by: regilero <regis.leroy makina-corpus.com>
Backports: 1484852, 1684513

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

Votes.

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

Vote and promote.

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

Upvote, clarify that -v6 is applied before -v3 (confusing, yes)

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

Propose same v3 patch as 2.4.x which adjusts CHANGES entry.

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

Add PR to CHANGES entry.

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

Propose mod_substitute merge order fix.

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

Propose same fix as of 2.4.14's regression.

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

Fix missing lib (.mak was previously updated)

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

Adjust IDs.

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

Adjust URL for public consumption

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

Offer a showstopper for 2.2.30 requiring one more reviewer/vote

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

Merge r1585090 from trunk:

Bring SNI behavior into better conformance with RFC 6066:

- no longer send a warning-level unrecognized_name(112) alert
  when no matching vhost is found (PR 56241)

<not backported to 2.2.x>
- at startup, only issue warnings about IP/port conflicts and name-based
  SSL vhosts when running with an OpenSSL without TLS extension support
  (almost 5 years after SNI was added to 2.2.x, the
  "[...] only work for clients with TLS server name indication support"
  warning feels obsolete)
</not backported to 2.2.x>

Proposed by: kbrand
Reviewed by: ylavic, jorton, wrowe

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

Yes, this. Vote & promote w/thanks.

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

Revert mis-commit, re-fixing STATUS in a moment

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

Yes, this. Vote & promote w/thanks.

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

Vote.

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

Remove entry backported in r1683808 (along with dependent proposal).

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

Propose RFC 6066 (SNI) conformance fix.

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

core, modules: Avoid error response/document handling by the core if some
handler or input filter already did it while reading the request (causing
a double response body).

Submitted by: ylavic
Backports: r1482522 (partial, ap_map_http_request_error() things only!),
           r1529988, r1529991, r1643537, r1643543, r1657897, r1665625,
           r1665721, r1674056
Reviewed by: ylavic, wrowe, covener

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

vote/promote two remaining backports

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

Xforms.

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

Try to clarify extended uses of SSLCertificateFile.

Backport of r1682923 and r1682937 from trunk,
resp. r1682929 and r1682939 from 2.4.x.

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

Vote up

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

Propose.

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

Clarify the change to the default cipher suite lists

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

Rebuild.

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

XML update.

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

Merge r1551685, r1652929 from trunk.

r1551685 | trawick | 2013-12-17 21:25:54 +0100 (Tue, 17 Dec 2013) | 5 lines

FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.

PR: 53824

r1652929 | ylavic | 2015-01-19 09:06:56 +0100 (Mon, 19 Jan 2015) | 4 lines

Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic

Reviewed by: ylavic, trawick, rjung
Backported by: ylavic

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

Vote for simple patch. Promote.

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

+1

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

... and vote.

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

Propose IPv4-mapped (configure) fix for freebsd 5+.

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

Merged r979120 from trunk.

r979120 | rjung | 2010-07-25 23:08:15 +0200 (Sun, 25 Jul 2010) | 26 lines

Adding sub second timestamps and request end time to mod_log_config.

Add special format tokens to %{...}t. The extended syntax allows the
form: "WHICH:WHAT".

WHICH is either:
- "begin": use the time when the request started
- "end": take "now" as the time
You can omit WHICH, default is "begin".
If you omit WHICH, the separating column is not allowed.

WHAT is either:
- "sec": timestamp in Unix seconds
- "msec": timestamp in Unix milliseconds
- "msec_frac": millisecond fraction of the Unix timestamp,
               3 digits, 0-padded
- "usec": timestamp in Unix microseconds
- "usec_frac": microsecond fraction of the Unix timestamp
               6 digits, 0-padded
- anything different from those tokens: use strftime()
You can omit WHAT, default is the formatted timestamp as
used by the Common Log Format.

The implementation uses a new request_config for mod_log_config
to pass the request end time around between different calls to
log formatters, but the end time is only generated if needed.

Reviewed by: rjung, wrowe, ylavic
Backported by: ylavic

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

Merge r1665215, r1665218 from trunk.

r1665215 | ylavic | 2015-03-09 13:45:56 +0100 (Mon, 09 Mar 2015) | 8 lines

mod_proxy: use the original (non absolute) form of the request-line's URI
for requests embedded in CONNECT payloads used to connect SSL backends via
a ProxyRemote forward-proxy. PR 55892.

Submitted by: Hendrik Harms <hendrik.harms gmail com>
Reviewed  by: wrowe, ylavic
Committed by: ylavic

r1665218 | ylavic | 2015-03-09 13:54:38 +0100 (Mon, 09 Mar 2015) | 1 line

mod_proxy: follow up to r1665215: CHANGES entry.

Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic

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

Vote, promote.

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