max-age is explicitly specified.

(Backport of r538807)

Reviewed by: jerenkrantz, fielding, rpluem


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

(Backport of r538992, r538997, r539054)

Reviewed by: jerenkrantz, fielding, rpluem


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

directives. PR 40439.

(Backport of r441947)

Reviewed by: rpluem, jim, jerenkrantz


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

(Backport of r520733)

Reviewed by: wrowe, rpluem, niq


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

(Backport of r490142)

Reviewed by: niq, jim, wrowe


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

(Backport of r490156, r499567)

Reviewed by: niq, rpluem, wrowe


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

  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

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

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

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

* 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

* 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

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

(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

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

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

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

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

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

* 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

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

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

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

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

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

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

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

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

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

  So remove it.


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

* 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

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

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

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

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

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

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

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

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