Propose some backports.

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

A few missing line breaks.

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

vote

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

* Remove backported patches from STATUS

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

Merge r443503 from trunk:

* PROXY_WORKER_IS_INITIALIZED checks if PROXY_WORKER_INITIALIZED is set in
  worker->s->status, but we need to check here if it is set in worker->status.

  As PROXY_WORKER_INITIALIZED is set in worker->s->status in
  ap_proxy_initialize_worker_share, which is called just before
  ap_proxy_initialize_worker we never initialize the worker. This is very bad
  as we create no reslist for the pool in this case.

Reviewed by: jim, rpluem, trawick

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

Merge r452213 from trunk:

* Fix precedence problem.

PR: 40658
Submitted by: Larry Cipriani <lvc lucent.com>
Reviewed by: rpluem, niq, trawick

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

Merge r452212 from trunk:

* Fix precedence problem.

PR: 40656
Submitted by: Larry Cipriani <lvc lucent.com>
Reviewed by: rpluem, niq, trawick

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

* Propose new backport

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

vote, promote

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

spellcheck

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

Vote for fruit hanging so low it's ready-picked ...

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

* Two backport proposals

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

Move those with at least 3 +1s up as approved

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

Cast some vote... those with 3 +1s to be moved up
with next commit

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

* Vote and promote

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

Add a vote

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

Propose bugfix backport

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

Propose another backport

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

More backport...

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

* cast another vote

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

* cast a vote

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

Propose another backport.

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

Propose a backport

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

Propose for backport

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

Typo. Aoache -> Apache. Submitted by "Photomatt".

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

Aoache -> Apache typo.

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

Change wording as suggested by jslive.

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

Add extra explanatory clause to VirtualHost docs

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

This patch is required for 2.2.4...

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

* Cast a vote

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

merge from trunk (but preserve ap_get_server_version()):

  *) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now
     deprecated, and is replaced by ap_get_server_banner() and
     ap_get_server_description().

Reviewed by: rpluem, jim

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

Yep. I agree!

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

Bugfix backport

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

Propose backport for cool feature

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

Propose backporting bugfix

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

backport build changes to link htcacheclean and httxt2dbm
statically with apr[-util]??

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

Merge r427172 from trunk:

Add in a very simple balancer "set" concept, which allows
for members to be assigned to a particular cluster set
such that members in lower-numbered sets are checked/used
before those in higher ones.

Also bundled in this are some HTML cleanups for the balancer
manager UI. Sorry for the mixins :)

Compiles/builds clean: passes test framework as well
as more normal usage tests ;)

Reviewed by: jim
Merge r427368, r428352, r428361, r432352 from trunk:

Reset standby flags for each loop through the cluster sets

Initialization change. Move to a different format
to force resets as well as a common technique, in case
_route is updated at some point.

Update docs for proxy:

  1. Put params in abc order
  2. Add hot-standby example
  3. Add in new features that hadn't been documented yet (lbset, ...)

Reviewed by: jim

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

* Move accepted patches up

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

* Cast a vote

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

Note location of unified patch

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

Cast quick vote.

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

* Cast a vote

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

point to new server version patch, with fixes for screw-ups
pointed out by Ruediger

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

* Propose fix for PR40400 for backport

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

propose a concrete patch for backporting ap_get_server_version()
changes to 2.2.x without breaking existing modules

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

* Cast a vote

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

propose backport of simple mod_ext_filter fix

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

  Backport simplest change to silence VC 2005 'posix errors'.

Backports: 439639

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

  Add more ignores when building under VC 2005, we create these
  binaries which have a corresponding .manifest to invoke them.

Backport: 439870

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

remove backported patch

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

Merge r421287 from trunk:

The number of times elected as well as the i/o
of the workers is useful info to show in the
manager.

Reviewed by: jim

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

Merge r420936, r420954, r420986, r421283 from trunk:

Restructure the find_route_worker() function. Basically,
it should take care of knowing about usable and unusable
workers. By centralizing this logic, it will make it
easier and more streamlined to add in the forthcoming
hot-standby status workers.

Clean up some proxy macros. Avoid the use of magic
numbers, and instead use pre-defined defines. Also,
ensure that usable workers have been initialized :)

Allocate a bit for hot standbys. Adjust so that
normal "usable" workers don't count these.

Add in hot-standby balancer member. If all other members
are disabled or not-usable, ONLY THEN will the hot
standby's be used.

Reviewed by: jim

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

* Vote and promote

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

* Add comment

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

Add in combined patch - dependent on one's patch being
smart enough to create modules/proxy/ajp_utils.c

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

Working on combined patch... just need to find out how to get 'svn diff'
to "create" a new file...

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

Refer to combined diff patch obtained via svn.merge and
that uses "working copy" instead of Arbeitskopie (more
up-to-date)

Remove rpluem's vote to allow him to revote with revised info.

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

Add in the 2 pre-dependent commits and refer to full large diffset.

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

* Add comments to proposal

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

* Vote and move

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

* Add comment to proposal

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

Merge r437768 from trunk:

Minor nit: why make the logic more complex than it needs to
be ? :)

Reviewed by: jim

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

update transformation

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

Merge r434483 from trunk:

* Close connection to backend if reading of request body fails.

PR: 40310
Submitted by: Ian Abel <ianabel mxtelecom.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

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

And remove backported info

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

Merge r417443 from trunk:

* Retry worker chosen by client supplied route / redirect worker if it
  is in error state before sending "Service Temporarily Unavailable".

PR: 38962
Submitted by: Christian Boitel <cboitel lfdj.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

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

And move up those with at least 3 +1s

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

Yeppers. Looks good on 2.2

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

Propose mpm_winnt fix for handling the return
values from wait_for_many_objects.

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

Some votes.

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

Add in the cping/cpong backport... will vote in a bit, but didn't
want to forget this.

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

Some votes

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

Propose load balancer enhancements from trunk for backport.
These are:

   o Hot Standby
   o Cluster set
   o balancer_manager additional info
   o docs updates for above

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

* Fix broken links in proposal

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

* Propose rework of mod_deflate's inflate and deflate output filter for
  backport. This fixes PR 39854. Also remove previous backport proposal for
  fixing PR 39854 and restart voting. The patch for the previous backport
  proposal is contained inside this proposal.

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

Backport README change

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

Cast some votes

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

* Add proposal to fix PR: 40310

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

* Cast one vote and add a proposal

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

Fix contributed by  Bjarne D Mathiesen <macintosh@mathiesen.info>

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

Add a backport, approve another, vote and note on others...

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

Backport:
My last effort was a little too succinct and not quite precise
enough.  Try being more explicit.

This does leave the danger that people will clip the <Location>
example as the proper way to do things, when they should be
reading on to the <Directory> example.  The <Location> example
is only correct when used in conjunction with Alias.

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

Backport case sensitivity note for windows.

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

Backport:
Make it clear that url-path is always case-sensitive.
Provide an example of using a regex to make it case-insensitive.
Make it clear that ScriptAlias is only used when you want
BOTH mapping and script-designation.

Partially in response to the disputed vulnerability:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4110

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

update convmap

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

fix messed up paths. How did that happen?

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

Update manual transformations

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

Update the proxy module docs to reflect current reality.
Add in the flush settings, which are part of 2.2.x and
reorder params to be in abc order (to make 'em easier
to find)

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

  Sync to httpd/trunk where we've reverted the /d "LONG_NAME=foo bar" syntax,
  which confuses the ability of MS VS 6 to export makefiles.

  Also syncs the fix to some debug/release targets observed by hunter.

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

Vote on the PCRE backport; While it is 3rd party software, we must take responsibility for it when we are distributing it. The choice to not include it should be discussed on dev@httpd, or voted on separately.

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

2.2.3 was released.

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

Add PKCS#7 backport.

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

  Bump after tag 2.2.3

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

  Prepare to tag

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

  Last quick observation

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

  Wrong project name

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

SECURITY: CVE-2006-3747 (cve.mitre.org)
mod_rewrite: Fix an off-by-one security problem in the ldap scheme
handling.  For some RewriteRules this could lead to a pointer being
written out of bounds.  Reported by Mark Dowd of McAfee.

Ack: trawick, lars, jorton, wrowe, benl

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

  Changes from trunk noted by Mladen, fix %~na typo and activate our
  config rewriting; and copy a NOTICE

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

  Jeff's dead on - a diff is needed

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

Merge r425210 from trunk:

* Add a check to make sure that the base provider and the alias names are
  different and also that the alias has not been registered before.

PR: 40051
Submitted by: bnicholes
Reviewed by: bnicholes, rpluem, fielding

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