* STATUS
  Vote on a backport.

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

Vote on a backport.

Move two that are approved to the right section. (rpluem and fielding both
posted on dev@httpd that they are okay with trunk version going in instead.)

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

8 of 10 on the fugly scale

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

* Vote, promote, comment

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

Merge r506621 from trunk:

* Save the key we generate during our first run of cache_generate_key_default
  on each request in the request_config. During consecutive runs of
  cache_generate_key_default during processing the request we restore it
  from there as we might not be able to generate the same key again as
  the ingredients used to compose the key might have changed and we constantly
  must use a key that could be generated during the quick handler phase.

PR: 41475

Submitted by: rpluem
Reviewed by: rpluem, jerenkrantz, jim

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

Merge r504183 from trunk:

* Add CacheIgnoreQueryString directive to cache requests with a query string
  even if no expiration time is specified. Futhermore the query string will not
  be used for key generation such that requests to the same URI path, but with
  different query strings are mapped to the same cache entity. Turning this
  setting to ON violates RFC 2616/13.9 and thus it is turned off by default.

PR: 41484
Submitted by: Fredrik Widlund <fredrik.widlund qbrick.com>
Reviewed by: rpluem, jerenkrantz, jim

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

easy votes

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

I have lots of love for mod_cache and I want to share it with the world!
(Propose another mod_cache-related backport)

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

Bundle in r539054 as well to this backport proposal collection.

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

And promote... Will likely apply 1st round of
approved patches later on today :)

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

Cast 2 votes

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

Reply to rpluem and propose another round of cache fixes for backport.

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

Low hanging fruit...

I'm looking at the varios cache patches today and
will likely vote them later on.

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

Merge r425787 from trunk:

* Remove all filters that are before the cache_out filter. This ensures
  that we kick off the filter stack with our cache_out filter being the
  first in the chain. This make sense because we want to restore things
  in the same manner as we saved them.
  There may be filters before our cache_out filter, because

  1. We call ap_set_content_type during cache_select. This causes
     Content-Type specific filters to be added.
  2. We call the insert_filter hook. This causes filters e.g. like
     the ones set with SetOutputFilter to be added.

PR: 40090

Submitted by: rpluem
Reviewed by: rpluem, wrowe, jerenkrantz

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

* Add a comment

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

Give mod_cache some more lovin': cast some votes and propose a backport.

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

* Add comment

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

I think I found the PKCS#7 patch

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

added proposals for backporting patches for PRs 39985 and 41302,
and various prerequisite patches

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

vote and explanation

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

* Add a proposal

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

Roll up patches and attach to bug so there's a URL to point to

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

Propose trivial bugfix

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

* This proposal resurrected in r536002. It was already backported in r535903.
  So remove it.

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

Merge r535169 from trunk:

* Add extern "C" linkage to several headers to make it easier to use
  them in C++ code.

PR: 42286
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem, wrowe, niq

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

vote&promote low-hanging fruit

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

* Cast a vote

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

* Add a comment

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

new suggestion, make mod_so more informative

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

Merge r473278 from trunk:

Add alternate is_socket_connected by using APR functions.
Submitted by: mturk
Reviewed by: jim

Merge r535354 from trunk:

Abstract out (kinda) MSG_PEEK. This way when we
actually update APR and apr_socket_recvfrom()
to know about APR_MSG_OOB, APR_MSG_PEEK, etc...
this code won't need to be adjusted. Also,
make nicer for 2.2 backport.

Reviewed by: jim

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

Promote

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

Cast vote

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

After all, add the original proposer to the vote.

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

Ups. Filed under wrong chapter. Sorry :)

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

Propose a trunk bugfix for ApacheMonitor so it can be run on Windows Vista

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

whitespace

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

Done; condense, vote and promote.

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

Rollback my previous commit. Sorry ;-(

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

Add the improvement proposed by rpluem to my backporting proposal.

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

A bit more garbage I missed in the previous conflict

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

Vote, promote, demote

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

* Add a proposal

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

* This one was backported

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

Merge r476625 from trunk:

* Use the query string stored in r->parsed_uri.query instead of r->args
  as r->args could have been changed (e.g. via mod_rewrite) after the quick
  handler hook. This causes resources to be stored under a key, where they
  cannot be fetched again in the quick handler.

PR: 40805

Submitted by: rpluem
Reviewed by: rpluem, jim, sctemme

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

* Promote one patch

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

Cast vote for mod_cache patch.

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

* Add a comment, a vote and a proposal

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

Note suppl patch which makes this more tasty.

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

Note backport that should be in our collective consciousness
but the MSB_PEEK flag needs to be looked at...

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

Backport r535248

As discussed on docs@httpd, remove the FAQ and replace it with the contents
of the old support.xml and a pointer to the wiki.

Of possible interest: I've also removed the link to the professional support
database, since it was returning error 500 for some time and nobody
seemed to care.

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

English Revision: 421100

Submitted by: Takashi Sato
Reviewed by: Hiroaki Kawai

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

Sync with httpd-trunk descript

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

Applied

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

Merge r527969 from trunk:

HTTP proxy ProxyErrorOverride: Leave 1xx and 3xx responses alone.  Only
processing of error responses (4xx, 5xx) will be altered.

PR: 39245

This is based on a patch submitted by Bart van der Schans <schans hippo.nl>
and tweaked slightly by me based on discussions on dev@ since April 2006.
I think rpleum was the first to mention the 1xx issue.

Submitted by: trawick
Reviewed by: jim

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

Applied

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

Approved backport

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

Applied backport

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

Approved backport:

    * mod_ssl: Move thread locking upcall initialization before
      hardware library initialization, so hardware library can use
      these upcalls when run in a threaded MPM. Fixes PR 20951.

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

Update STATUS for applied patch

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

Backports:

Correct behavior of HTTP request headers sent by ab in presence of -H command-
line overrides.  Previously, ab would concatenate a supplied -H User-Agent:
header to the existing one, and send duplicate headers if either -H Host: or
-H Accept: were specified on the command line.

Now, the default headers are not sent if they are overridden using the -H
command-line flag.

Submitted by:  Arvind Srinivasan arvind.srinivasan  sun.com
Reviewed by: sctemme
PR: 31268, 26554

The apr_port_t type is unsigned, but ab was using a signed format code in
its reports. PR 42070. Submitted by Takashi Sato serai  lans-tv.com,
reviewed by sctemme.

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

... and promote...

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

Cast some votes...

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

port r532162 to the 2.2.x stable branch

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

Merge r409442 from trunk:

* Fix documentation about the data types of attributes in the AJP protocol.

PR: 39658

Submitted by: rpluem

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

* Add a backport proposal

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

* Cast some votes

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

`build extraclean all`
`build convmap`

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

newlines

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

Add forgotten '|| true' to prevent 'make install-man' from returning an error (if rsync is not present on the platform)

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

* Cast a vote

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

merge fix to 39245?

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

Merge r484789 from trunk:

We are doing nothing here... but keep the stubs
in case we ever do.

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

Apply approved backport

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

merge from trunk:

core: Correct a regression since 2.0.x in the handling of AllowOverride
Options.

PR: 41829

Submitted by: Torsten Förtsch <torsten.foertsch gmx.net>
Reviewed by: niq, rpluem, trawick

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

proposals++

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

Propose backport of two minor ab.c fixes

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

Propose backport of hardware SSL fix

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

Backport Order fix.

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

Additional Fix for 40310.

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

* Vote and promote

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

Propose backport

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

Update status with comment and votes

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

Cast votes for 2 backports...

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

Sure. Why not :)

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

* Cast a vote

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

mod_ldap backport proposal

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

Add the case_flt experimental modules to the NetWare build

Submitted by: Guenter Knauf <fuankg apache.org>

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

Backport of r515403, quote filesystem paths that might have spaces in them when expanded.

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

Generated HTML from previous XML changes and some housekeeping changes by build system

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

Hardware crypto support is less experimental in 2.2

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

unpropose a backport (sorry, Brad)

I'll back out the trunk commit if a reasonable solution
doesn't present itself very soon

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

Merge r486320 from trunk:

* Handle request bodies larger than 2 GB by converting the Content-Length
  header string of the request correctly to apr_off_t.

PR: 40883

Submitted by: rpluem
Reviewed by: jim

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

Move up

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

Cast a vote

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

Merge r507516 from trunk:

Patch for PR#11540 (submitted by Stuart Children)

Submitted by: niq
Reviewed by: jim

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

vote

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

simple LDAP API usage fix

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

Vote...

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

votes++

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

Actually, I think this should be a show-stopper, since the
current behavior is broke broke broke.

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