Move up two accepted patches

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

vote.

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

Backport fix for PR#39672 (Don't try to insert an undefined filter)
and chop outdated blurb.

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

Propose speling thingey; vote&promote worker patch

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

update transformation

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

Submitted by Vincent "noodl" Bray.
Adds link to the other caching doc, where many secrets are revealed and
mysteries uncovered.

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

Referring to stuff added in 1.1, in the 2.2 docs, seems a little
archaic. Rephrase a little.

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

Remove an appendix that hasn't really been useful since the turn of the
century.

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

update transformation

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

Based on report from alex.extreme2@gmail.com (Alex Smith) poked around a
bit, and there were a lot of incorrect paths in this document. Also, the
'apache.exe' file is now named 'httpd.exe' as god intended.
"C:\Program Files\Apache Group" becomes "C:\Program Files\Apache
Software Foundation" and the cooresponding change also made in the
registry paths.

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

Gramatical nitpicking.

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

authnz_ldap backport proposal

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

* Propose fix for PR 39647 for backport.

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

Merge r377291 from trunk:

Make the worker and event MPMs support GracefulShutdownTimeout just like
the prefork MPM does.

Submitted by: Chris Darroch <chrisd pearsoncmg.com>
Ported to event MPM by: rooneg
Issue number: 38621

* server/mpm/worker/worker.c
  (ap_mpm_run): Make the graceful shutdown log message refer to the right
   signal, and respect the graceful shutdown timeout if there is one.

* server/mpm/experimental/event/event.c
  (ap_mpm_run): Ditto.

* CHANGES: Note change.

Submitted by: chrisd, rooneg
Reviewed by: chrisd, rpluem, trawick
PR: 38621

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

Merge r399388 from trunk:

* Add Content-Type to headers_out if not already set. This ensures that
  the Content-Type of the cached entity gets restored correctly.

PR: 39266

Submitted by: rpluem
Reviewed by: rpluem, trawick, jim

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

* add a vote

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

Done one, reset one.

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

Merge r407265 from trunk:

* modules/generators/mod_autoindex.c (output_directories): Escape
filename in non-FancyIndexing case.

PR: 38910
Submitted by: Robby Griffin <rmg terc.edu>
Reviewed by: jorton, rpluem, trawick

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

And bump up patch with 3 +1s

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

votes baby

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

* Vote and promote

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

vote for simple mod_filter fix

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

Propose backport of fix to PR#39672

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

The syntax ">&/dev/null" is csh-style, not bourne-style shell syntax.
Change it so that all bourne-style shells understand it.

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

review/vote for a few patches

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

* Cast a vote

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

Propose backport of PRs 38621 and 38737.

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

* Cast some votes

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

* Propose fix for PR 39593 for backport

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

Note location of patch against 2.2.x head, incorporating Joe Orton's review

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

Add two.

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

* Cast a vote

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

Propose backport of ServerName directive enhancement

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

Backport trawick's mod_charset_lite patch

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

Vote&promote (and fix typo while we're at it)

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

* Do some votes

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

* Propose fix for PR 39266 for backport

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

propose backports of two mod_charset_lite fixes

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

- 2.2.2 is out.

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

  Two common win32 reconfigurations (SSLMutex -must- be default).

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

Remove GENURI.nlm from the prebuild target

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

update transformation

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

Update.
English Revision: 396056

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

fix typo.
Submitted by: kano@na.rim.or.jp

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

update.
English Revision: 396056

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

fix typo.
Submitted by: kano@na.rim.or.jp

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

fix typo.
Submitted by: kano@na.rim.or.jp

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

  This resource /D syntax was pretty horridly imported into VS 2005,
  change the quotation to ensure a peaceful transition to sln/vcproj files.

Backports: 397647

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

  Remove all /machine:I386 references, these are getting in the way
  of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused.)

Backports: 397407

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

  Make clean was -borked-!  Too many extra target specifiers.

Backports 397397 (say that five times fast)

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

  Fix lingering typo from previous mass-removal of .awk targets

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

  Move flex/bison/sed steps into a "mod_ssl - Win32 Lexical" grammer
  build target, outside of the normal Debug/Release builds.

  Continues on the path of eliminating external tool requirements,
  as we especially expect users will never modify these grammers
  in the course of their build.

  (Also, prevent mistakes such as r396980 reverted)

Backports: 396670

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

  Resolve three files mis-committed in r396974

  (Damn I swear these didn't appear in svn status :(  -  the next
  commit to mod_ssl.dsp will spare everyone this mistake in the future.)

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

  After appropriate time sitting on trunk, and some review by our
  win32 builders, eliminate platform-specific use of 'awk' to create
  our .rc resources.  (Deliberately waited until a clean 2.2.2 was
  pulled from the branch.)  The end goal is to make building simpler
  for our 'free' VisualStudio 2005 Express users, to encourage more
  end users to explore the source code.  Eliminating thousands of
  lines of build-script is a nice side effect.

Backports: 395418

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

  With all the enhancements to mod_proxy.so (core) the module no
  longer fits - give this module a larger reservation for debug
  builders.

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

  Add static httpd.rc, which takes all of it's flags from the specific
  module's project /Defines, and ap_release.h.

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

  Add AP_SERVER_BASEPROJECT (distinct from AP_SERVER_BASEPRODUCT which -must-
  remain "Apache" for our server tokens string) to identify the Apache HTTP
  Project.  This is to benefit our httpd.rc file, and eliminate a host of
  dependencies upon 'awk', coming shortly.

Backports 1st file commit of r395418

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

Propose backport for bugfix

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

update version reference

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

fix revision references again. *sigh*
Touching all files and tagging for release immediately is not a real good idea.

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

Roll on development to 2.2.3-dev.

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

Prepare the 2.2.x branch for the 2.2.2 tag.

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

Revert r395231 from the 2.2.x branch.  This gets us back to the old place with regard to the copyright statements.

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

Remove merged patch.

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

Merge r394065 and r394446 from trunk.
PR: 38227, 38267
Reviewed By:  rpluem, jim, wrowe

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

Merge r394088 and r395180 from trunk.
PR: 38793
Reviewed By: rpluem, jim, wrowe, trawick

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

2.2.1 was tagged, but not released

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

remove backpored patch.

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

Backport r393364 from trunk, fixing a bug with crypt in htdbm.
Reviewed By: trawick, colm, jim

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

Fix mod_deflate to work in an internal redirect

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

Backport fix to PR#39282

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

Backport mod_dbd updates

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

  Backport 395419, replace /GX win32 compile flag with /EHsc to match.
  Reviewed by all active win32 contributors, and committed as an arch
  maintenance fix.  This permits Win32 VisualStudio 2005 users to build
  httpd without extranious 'deprectated option' emits.

Reviewed by: wrowe, colm

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

Vote on the win32 compiler flag change, following a bout with MSVS

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

Move up the mod_dbd patch to accepted.

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

Move up accepted patch.

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

Vote early. Vote often.

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

Move up accepted patch.

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

vote, promote

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

  Vote up two patches, and propose to make life simpler for our
  visualstudio compiler users.

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

update transformation

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

Update and fix typo.

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

* add my comment to niq's and jim's remarks

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

doh! update version here as well

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

fix revision references

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

Cast a conditional vote

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

Update the last year of copyright for the 2.2.x branch

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

need another fix for proxy reslist maintenance

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

http_protocol: Fix escaping of Expect error message
+1: mjc, trawick, rpluem, jim

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

Vote early, vote often

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

add a backport proposal, including recording of wrowe's list vote
from the list (ianh's vote is less clear).

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

  Promote and promote

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

casting...

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

* Vote and promote

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

vote

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

Expect header issue should be backported

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

* Missed one patch in my backport proposal

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

* Add three backport proposals

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

Fix PR#39321 (Segfault if bad URL is specified in ProxyPass)

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

Update one of the more important copyright notices prior to any 2006
releases.

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