Backport to close PR 11540

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

* Promote some patches

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

* Cast some votes

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

Cast vote, and correctly attribute thread locking callback patch

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

port r532162 to the 2.0.x stable branch

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

English Revision: 421174

Submitted by: Takashi Sato
Reviewed by: Hiroaki Kawai

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

`build extraclean all`

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

Propose backport of hardware SSL fix

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

This list sure would make a worthwhile 'final' 2.0.60 release for folks still
waiting on 3rd party modules for 2.2.

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

Propose backport

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

Vote...

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

Note location of 2.0.x specific patch

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

Actually, I consider this a show-stopper, since the current
behavior is broke broke broke

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

Refresh version and carry openssl.cfg with openssl.exe

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

About time to note this

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

This notice should have been propogated to the httpd 2.2 and 2.0 trees.

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

Pull showstopper & braindead patch with no activity, nothing else
here for me to add 2c to.

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

  Correctly evaluate the HTTPS condition string, update CHANGES for attributions
  and recent activity.

PR: 40573
Submitted by: Matt Eaton <asf divinehawk.com>
Backports: 429341

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

  Revert one aspect of the recent mod_isapi overhaul.

  Where any response is sent, return OK from the handler.  Where there
  is no response (but a status code) return the code.  This patch adds
  a great number of debugging emits for failed ap_pass_brigade calls,
  to help diagnose failure cases, and disambiguates OK from APR_SUCCESS.

PR: 40470
Submitted by: wrowe, Matt Eaton <asf divinehawk.com>
Backports: 492333

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

Beg reviews

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

Revert a regression introduced in the recent overhauls of mod_isapi.

PR 40470 points out that we no longer handle ate == headlen, where
there is a headers-only response from the isapi app to the server.

This patch restores the previous behavior of pending those headers
until some amount of body response is ready to be sent to the client.

Backports: 483613

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

    Reword Order section to make 3-pass design clearer.
        Add table showing results of match combinations.
        Fix some tenses.
        Fix case of CENTER & IP Address.

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

mod_isapi: Simply backport the host of fixes for compilation on unix,
and resolve PR#'s 15993 29098 30022 16637 30033 28089
by pushing to trunk/ rev 416293 of modules/arch/win32/mod_isapi.[ch]
which compiles with the addition of [apr_]brigade_insert_file() as
cribbed from apr-util 1.x trunk.  delta previously posted at
  http://people.apache.org/~wrowe/mod_isapi-416293-to-httpd-2.0.patch
and broadly tested with positive results, with the exception of one
more patch incoming to handle ate == left edge case.

Previously reviewed by jerenkrantz, fielding, wrowe for httpd-2.0.
Code committed is identical.

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

update transformation

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

merge from trunk revision 475698:

TimeOut can be set in a vhost context

Submitted by: Eric Covener
Reviewed by:  Jeff Trawick

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

Propose backporting bugfix

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

update transformation

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

Backport case-sensitivity note for Windows.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@433009 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.

(Plus the description of Redirect)

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

drop unneeded svn:keywords

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

  Bump after tag

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

  Prepare to tag 2.0.59

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

  Wrong project name

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

  Last quick observation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@426148 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.

Reviewed by: trawick, lars, jorton, wrowe, benl

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

  NOTICE file is now official (nobody revisited this in quite some time.)

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

  Doxygenation from trunk, no code change

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

  Sorry - no time for 'bring me a rock' - but Jeff's dead to rights that some
  diff is very reasonable.  Here's the diff

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

* Cast a vote

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

  I really hated that bug's title :)

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

  Not big on 2.0 fixes now, but this one has a clean patch and a long
  track record - and is widely deployed in 2.2 now.

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

update revision references

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

update license header text

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

update license header text

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

update according to board resolution

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

update revision reference and transformation

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

update transformation

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

  Afterthought; right URL, push folks to 2.2 rather than explain the
  whole sordid mess.

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

  Fix the openssl half of the instructions, since they were broken.

Backports part of 419635

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

  Replace /GX compile flag which was always an alias of /EHsc
  (/GX is deprecated).  Drop /machine link flag which was always
  implicit, and MS has moved from different /machine flags twords
  using alternate linker binaries.  (And of course, link is a bit
  late to choose machine architecture anyways, if the user hadn't
  used the correct compile flags.)

Backports: 395419, 397407

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

  Matt's proposed this be backported, choose the straight-line approach.

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

Documentation patch submitted by Matt Lewandowsky. Corrects to new name
for the handler.

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

Submitted by martinchon@yahoo.com, with some assistance from
matt@iamcode.net
Corrections to .es version.

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

Backports of mod_usertrack fixes

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

Mark 2.0.58 as released

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

  Whoops, let's not duplicate listeners

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

  Tweak the common issues in ssl.conf on Win32, SSLMutex (must be default)
  and the SSL port.

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

Add missing definition for the httxt2dbm binary to the RPM build.

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

spell check

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

update transformation

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

update German translation

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

Bump the branch to 2.0.59-dev

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

Roll on 2.0.58

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

fix revision references

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

Revert 395235, the major copyright fubar by me.

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

Make the status line for 2.0.56 consistent with previous practise

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

propose simple tweak to avoid crash

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

update transformation

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

fix typo

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

Removing 1.3 refs from 2.x docs

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

fix revision references

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

Bump to 2.0.58-dev

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

Roll on 2.0.57

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

Update the last year of Copyright for the 2.0.x branch.

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

Merge r264759 and r264788 from trunk;

    * mod_cgid suexec_get_identity now runs from the httpd side
      of the cgid socket.

Author: colm

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

Merge 394070 from trunk;

* Initialize last_char as otherwise a random value will be compared
  against APR_ASCII_LF at the end of the loop if bb only contains an
  EOS bucket.

PR: 39282
Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem

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

2.0.x never needed this patch, 2.2 was a regression.

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

Merge r102320 from trunk:

  If the proxy was enabled, and UseCanonicalHostname was off, then the Via:
  header would report not the proxy hosts's ServerName (or any of its
  configured VHosts's names) as it should, but the *origin hosts*'s name.  Now
  it reports its ServerName.

Author: martin

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

remove the backported proposal

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

Merge r384731, r386790, r386821 from trunk.

    *  Unsure why win32 never noticed this, but the value returned is a const
       char*

    *  Escape from casting purgatory, which the Solaris cc compiler
       will not treat as lvalues.

    * Eliminate last win32-isms, SetLastError becomes apr's set_os_error
      operation.  It unfolds the error code on win32, so we have to pre-fold
      it.  On unix there is no folding.

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

vote and promote

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

Vote early, vote often

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

update version reference

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

  Promote, promote and vote

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

Add a backport proposal, and burn a version number

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

Add a vote

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

Casting votes

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

* Vote and promote

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

vote

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

Expect header issue should be backported

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

* Add proposal to backport PR 39282

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

update for 2.0.57

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

roll on for 2.0.56

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

Nuke the last showstopper, now that 1.2.7 is out there.

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

Fix a change entry to make it consistent with our conventional policies
(no at-symbol, don't wrap names).

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

update transformation

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

Fix typo someone pointed out in IRC

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