move the 5 oldest backports to the stalled area, can be bumped
back up individually if there's renewed interest.

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

this was proposed at the top of the backport list

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

vote

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

* Add a proposal

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

Merge r1039304, r1053584 from trunk:

* Put a note in the connection notes that the SSL handshake to the backend
  failed such that mod_proxy can put the worker in error state.

PR: 50332
Submitted by: Daniel Ruggeri <DRuggeri primary.net>
Reviewed by: rpluem

* Fix r1039304 and make the patch similar to the one proposed for
  2.2.x: If the SSL handshake to the backend fails we cannot even
  sent an HTTP request. So the check needs to happen already when
  we sent data not when we receive data.

Reviewed by: rpluem, jim, wrowe

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

* Promote

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

Votes

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

Add backport proposal.

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

remove copy

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

  *) prefork: Update MPM state in children during a graceful restart.
       Allow the HTTP connection handling loop to terminate early
            during a graceful restart.  PR 41743.
                 [Andrew Punch <andrew.punch 247realmedia.com>]

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

Merge r1051468, r1058133, r1059037 from trunk:

* Do not drop contents of incomplete lines, but safe them for the next
  round of reading.

PR: 50481

* Fix comment typo as noticed by jorton

* We can only get there if the line is too long and in this case
  we should return the partial line as defined in util_filter.h.

Submitted by: rpluem
Reviewed/backported by: jim

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

PR47766

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

And promote

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

Votes

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

Update.

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

Fixed buildconf hint about missing APR/APU.

With the httpd 2.2.x branch we use by default the APR 1.4.x
and APU 1.3.x branch and not trunk; also most likely the 2.2.x
configure stuff is not prepared for APR-2 where APR and APU are
now merged and no longer in separate directories.

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

* Vote

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

Revert 1068310 as vetoed by Roy:

This requirement will
be (or has already been) removed from httpbis because it hinders
extensibility and breaks content management systems, just as the
change below causes content-language to be broken.  That is why
we never implemented this requirement when it was added (without
consensus) to RFC 2616.

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

RPM spec file: Make the httpd init script consistent with the htcacheclean
init script. Multiple daemons can be started by creating symlinks to the
init script.

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

Propose PR 41743 fix.

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

Vote.

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

Merge r1001884 from trunk:

mod_cache: Make sure that we never allow a 304 Not Modified response
that we asked for to leak to the client should the 304 response be
uncacheable. PR45341

Submitted by: minfrin
Reviewed by: minfrin, jim, covener

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

Merge r1026746 from trunk:

If an unknown Content-* header is received for a PUT request, we must not
ignore it but reply with 501 per RFC 2616 9.6.

PR: 42978

Submitted by: sf
Reviewed by: rpluem, covener, poirier

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

Merge r1026743 from trunk:

If a malformed Content-Range header is received for a PUT request, we
must not use the supplied content per RFC 2616 14.16. Send 400 response
instead of ignoring the Content-Range.

PR: 49825

Submitted by: sf
Reviewed by: rpluem, jorton, covener

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

backport 1042090 from trunk:

    PR44076: allow "userdir disabled" or "userdir public_html" in global scope to
    be merged with lists of enabled users in virtual host context as one would
    expect.

Reviewed by: covener, rpluem, poirier

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

backport r1043023 from trunk:

    PR50349: Honor 'AcceptPathInfo OFF' during internal redirects,
    such as per-directory mod_rewrite substitutions.   This would be left floating
    around in the request_rec with a pcalloc'ed value, so the core fixup
    hook thought some module had overridden it.

Reviwed by: covener, rpluem, jorton

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

Promote passed proposals

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

Vote to fix merge of server config for mod_userdir

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

Vote to fix RFC compliance in mod_dav

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

Propose NoDecode option for AllowEncodedSlashes

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

Updates.

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

Propose r1064269: revert from LIFO to FIFO for fd Queue processing

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

revert manpage dates

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

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

break lines in <example>

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

the forgotten

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

DrBacchus sez fix-a-docs-bug
PR 44758
LimitRequestBody doesn't apply to proxies in 2.2.

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

DrBacchus sez fix-a-docs-bug
PR 50396
Pedantry over description of qs-values.

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

DrBacchus says Fix-a-docs-bug
PR 50396
Historical reasons for using IP-based virtualhosting no longer deserve
to be featured in our docs.

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

Update.

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

xforms

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

Merge r1063587 from trunk:

the comparison string has been decoded for rewriterule comparison.  PR50653

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

Merge r1063585 from trunk:

point to where SERVER_NAME and SERVER_PORT get their
values.  PR50655

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

Oops... forgot this section.

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

Update w/ more up-to-date info.

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

Update.

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

vote on mod_privileges patch

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

vote on "Suexec off"

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

promote two approved backports

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

votes on some simple DAV backports

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

Update.

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

Rebuilds various recent changes.

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

Changes from trunk, as per tid50417

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

* Update proposal

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

Votes.

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

* Add proposals

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

* Add a comment

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

* Comments are now resolved, so move it back

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

Rebuild transformations.

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

Sync with the much better explanation and example in trunk.

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

Merge r1055701 from trunk:

Add some weasel language, and a warning about Windows + TransmitFile, to the
SendBufferSize doc.

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

typoes caught by noodl

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

xforms

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

synch up with trunk for the first half of RewriteRule:

PR#44838: be more up front with how the per-dir RewriteRule comparison is
the filesystem path minus the Directory the rules were listed in.

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

Rebuild HTML.

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

Clarify trailing slashes on aliases. Resolves tid50545

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

Update STATUS with a further thread safety fix.

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

Fix the warning as pointed out by rpluem.

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

Update copyright year.

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

* Update comment

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

* Add a release showstopper

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

Update copyright to 2011

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

Fixed NetWare NCF script; for now removed ap2prod.ncf.

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

Create a 2.2 version of the patch, minus the cache_run_cache_status hook.

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

Typos.

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

Update.

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

Merge r992625 from trunk:

mod_cache: Check the request to determine whether we are allowed
to return cached content at all, and respect a "Cache-Control:
no-cache" header from a client. Previously, "no-cache" would
behave like "max-age=0".

Submitted by: minfrin
Reviewed by: minfrin, jim, covener

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

* mod_mem_cache: Add a debug msg when a streaming response exceeds
  MCacheMaxStreamingBuffer, since mod_cache will follow up with a scary
  'memory allocation failed' debug message.

PR: 49604
Submitted by: covener
Reviewed by: covener, poirier, rpluem

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

* Unpromote patch as it does not compile with 2.2.x

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

* Update proposal

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

* Wordsmith

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

* Add comment

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

* Promote

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

xforms

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

Merge r1053523 from trunk:

PR50525: Header always ... doesn't really mean "always" in terms of what you
can edit/merge/append/set since it only looks at r->err_headers_out and
the initial value may have lived in r->headers_out.

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

Rebuild doc transformations.

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

Removes trailing slash on <Directory /home> example. tid50421

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

Typo and grammatical corrections in French error docs, provided by
Xavier Robin. tid50517

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

Removed define obsolete since r96478.

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

Removed define obsolete since r93260.

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

* Adjust comment

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

* Promote

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

* Vote

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

* Add a comment

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

* Add a proposal

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

Text, please

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

Update.

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

generated doc changes

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

merge r956059, 1000130, and 1000474 from trunk:

improve connection pooling overview and descriptions of
min, max, smax, and ttl parameters

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