A typo that was corrected in trunk branch.

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

* 2.2.11 is now released.

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

Increment version.ent. We are at 2.2.12-dev.

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

* Add a proposal

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

We are at 2.2.12-dev

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

Get ready to tag as 2.2.11

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

* Update transformation

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

Merge r713605 from trunk:

Grammar fixes

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

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@723098 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@723093 13f79535-47bb-0310-9956-ffa450edef68

* Update transformation

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

* Things look good now. Update intended T&R date.

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

Merge r722213,r722081, and r721679 from trunk:

* Avoid sending no answer at all if a custom error page causes an
  AP_FILTER_ERROR.

* allow ap_invoke_handler() to pass-through AP_FILTER_ERROR as if it were
  a reserved status code (OK/DECLINED/SUSPENDED). Prevents ap_die() from seeing a
  500 error when the http header filter has already taken care of the proper
  error response

* To be safe, consume the entire brigade after processing an error bucket in
  the HTTP output filter.

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

Vote, promote

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

* Vote

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

Merge r684326 from trunk:

Admonish people not to put "AllowOverride All" in <Directory /> and
expect it to do anything useful.

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

add r722213 to backport proposal

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

Merge r721796 from trunk:

* Enable the use of autoconf >= 2.62 without causing APR / APR-UTIL options
  passed to the configure script issue warnings about unknown options.

Submitted by: rpluem
Reviewed by: rpluem, pquerna, tdonovan

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

* Add a comment

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

* Promote

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

vote.  autoconf option-checking warning fix
Tested with autoconf 2.59 (before problem) and 2.62 (after)

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

Vote

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

update AP_FILTER_ERROR proposal to include 722081, resetting votes
(discussion moved to dev@httpd)

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

vote.

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

sync with IANA registry as of 2008 Nov 30 14:17 PST

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

* Add a proposal

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

Merge r657354, r657459 from trunk:

configure: Don't reject libtool 2.x
PR 44817

Revert unintentional changes in r657354

Reviewed/backported by: jim

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

Promote

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

Cleanup STATUS. Vote and stall

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

Answer rpluem comment.  I need to take this to the list or shut up

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

* Add a comment

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

Vote, but with reservation.

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

Merge r689261 from trunk:

Add option to insert something in autoindex head.

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

vote & promote IndexHeadInsert

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

stray line from 721718

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

* Vote

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

* IMHO this one is at least stalled

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

propose a fix for mangling of error responses set by the filter chain

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

Merge r720955 from trunk:

Slight clarification to the way rewrite works in per-directory context.
Suggested by Peter Kehl on the users mailing list.

Reviewed by: rbowen, covener, takashi

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

My 2c on PCRE in 2.2

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

opinions on sni..

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

* Vote

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

* Add comment

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

Backport proposals

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

Major changes that differ from trunk are just what our ABI-compatibility
promise needs.  Yeah, right.

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

Update docs

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

Merge r693120, r720250 from trunk:

Add in useful feature. %k which logs the keepalives
value.
PR: 45762
        Dan Poirier <poirier@pobox.com>

Make %k work as it should. No regression noted in perl
test framework.

Reviewed by: jim

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

Voted.

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

reply

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

my not terribly well informed opinion on PCRE bump

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

promote

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

VOTE!

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

notes about PCRE

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

* Question is resolved so vote.

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

Update with latest xforms

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

Note that r720250 exists which closes out the discussion

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

Merge r574456, r720496 and r720500 from trunk:

Run optipng[1] with -o7 over all PNG files.  Files were only modified if the optimized version is smaller.  There is no change to the rendering as seen by users.

Update 'icons/apache_pb2' images for Apache-2.2

Delete the images from docroot/.
These are not needed after r105393.
The same images are still in icons/.

[1] - http://optipng.sourceforge.net/

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

Merge r704726, r704845 from trunk:

Export and install the mod_rewrite.h header to ensure the optional
rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are
available to third party modules.

Minor bump when exporting mod_rewrite.h

Reviewed by: minfrin, niq, rpluem

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

Vote, promote

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

* Add a comment

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

Merge r719357 from trunk:

Fix MaxRequestsPerChild on the Event MPM.  It hasn't worked for 4 years.

* server/mpm/experimental/event/event.c
    (process_socket): Be consistent about our return value, returning 0
      means this connection is done, and that we can decrement requests_this_child.

Submitted by: pquerna
Reviewed by: jim

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

promote

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

cast vote

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

New backport proposal... PR: 45762

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

Merge r411464 from trunk:

* info->expire and info->date are in microseconds. So convert the difference
  to seconds before comparing it to age which is in seconds.

PR: 39713
Submitted by: Owen Taylor <otaylor redhat.com>
Reviewed by: rpluem, jim, jfclere

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

Merge r711993 from trunk:

* Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.

PR: 46018

Submitted by: rpluem
Reviewed by: rpluem, jim, jfclere

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

* Promote

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

My votes.

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

* Vote

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

vote for a little fix to the event mpm.

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

+1 baby!

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

backup offer

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

* Note down my intention to T&R.

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

Merge r709666 from trunk:

* Use distinct char pointers for sending and receiving buffers to avoid
  destroying the pointer to the sending buffer in the ajp message if
  data is received from the backend before all data is sent to the
  backend.

PR: 45911

Submitted by: rpluem
Reviewed by: rpluem, jim, jfclere

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

Merge r451572 from trunk:

Add force recovery for balancer.
In case all balancer members were in error state 503
was returned until the recovery timeout expired.
The patch forces recovery in case all balancer members
are in error state regardless of recovery timeout
directive.
This fixes the time gap when 503 was returned and
backend was already up and running.

Submitted by: mturk
Reviewed by: jim, rpluem, jfclere

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

* Promote

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

My votes.

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

* Mention the author.

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

* Vote

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

* This one was backported in r713146.

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

Userland changes

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

  *) mod_proxy: Prevent segmentation faults by correctly adjusting the lifetime
     of the buckets read from the proxy backend. PR 45792 [Ruediger Pluem]

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

   * mod_proxy: Add the possibility to set the worker parameters
     connectiontimeout and ping in milliseconds.
     Trunk version of patch:
       http://svn.apache.org/viewvc?rev=705005&view=rev
       http://svn.apache.org/viewvc?rev=707022&view=rev
     Backport version for 2.2.x of patch:
       http://people.apache.org/~rpluem/patches/milli_seconds.diff
     +1: rpluem, pgollucci, jim

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

Merge r707163 from trunk:

Remove potential for memory leak... allocate on this
request which is now viable due to connection pooling.

Reviewed by: jim

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

Merge r708902 from trunk:

Avoid time traveling :)

Reviewed by: jim

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

Merge r711421 from trunk:

Holey moley. Marcus Burke noted this in Rich's Nuts/Bolts talk.
How embarassing!

Reviewed by: jim

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

Promote

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

Votes

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

cast some votes for backport

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

Some typos

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

* Add a remark regarding a regression fixed.

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

* Update proposal

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

* Whitespace fixes.

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

backport 704771 & 704883 from trunk
Windows: Always build the odbc dbd driver on windows,
to be consistent with the apr-util default.
DBD_LIST is still used to build additional dbd drivers.

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

* Add proposal

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

* Add another proposal.

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

* Add a proposal.

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

Hold off until I learn more from Ruediger

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

Merge r707649, r707665 from trunk:

AJP was dropping pre-existing cookies. Use same logic
as HTTP to tuck them away

* save_table needs to be declared first before it can be used.

Reviewed by: rpluem, jim, mturk

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

* Revoke vote and add a comment

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