Remove CGI block on OPTIONS method so that scripts can
respond to OPTIONS directly rather than via server default.

PR: 15242
Reviewed-by: Paul Querna, Andre Malo, William A. Rowe, Jr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@326253 13f79535-47bb-0310-9956-ffa450edef68

mod_version was merged back. Remove that item.

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

update transformation

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

adjust availability

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

merge mod_version_for_2.0.x branch back to branches/2.0.x
* merge 160788 to 326121 from branches/mod_version_for_2.0.x, but leave out
  generated docs files (will cleanly rebuild later)

Reviewed by: Paul Querna, Bill Rowe, (Justin Erenkrantz), me

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

votes++

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

bump version

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

propse small backport

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

Rpm packaging fix:
- Updated the apr and apr-util dependencies to require at least v0.9.7
- Stop trying to remove *.xml doc files, the httpd build does that already.

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

  Onwards to 2.0.56-dev

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

  Prepare, at last, to tag 2.0.55

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

modules/ssl/ssl_engine_io.c (ssl_io_filter_init): Initialize the
nobuffer flag to zero since the structure is palloc'ed not pcalloc'ed.

PR: 35279
Backport: 189971
Author: jorton
Reviewed by: jerenkrantz, wrowe

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

backport from trunk and 2.2.x:

   SECURITY: CAN-2005-2700 (cve.mitre.org)
   mod_ssl: Fix a security issue where "SSLVerifyClient" was not
   enforced in per-location context if "SSLVerifyClient optional"
   was configured in the vhost configuration.

Submitted by: Joe Orton
Reviewed by: wrowe, trawick

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

Commit Greg's patch to fix worker MPM memory leak.

Approved by: Greg, OtherBill, Jeff

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

  Almost a security hole, but certainly not for mod_echo.  Save other
  protocol modules a significant hole if based purely on mod_echo.

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

Small updates to latex docs build so that I can produce
a new version.

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

  docs/build/ should not exist (docs/manual/build/ already in svn:ignore).

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

  httpd-docs procedures call for checking out build underneath
  the docs/ tree, so add this subdirectory as an svn ignore

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

update transformation

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

swap directive and module

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

vote on backport of CAN-2005-2970 patch

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

did somebody say something?

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

Merge r295104 from trunk:

Refresh the SSL FAQ to bring it a little closer to reality.

Submitted by: Noirin Plunkett <firebird nerdchic.net>
Reviewed by: Joe Orton

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

+1 for CAN-2005-2700

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

Force these cgi thingies to be treated as cgi.

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

vote, note, propose

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

  Undo fat fingers of commit 292397

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

  Small fix to remove unused 'rv' variable from the excluded code path

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

fix svn:keywords properties

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

mod_ldap: Fix PR 36563. Keep track of the number of attributes retrieved from LDAP so that all of the values can be properly cached even if the value is NULL.

Reviewed by: bnicholes, minfrin, jim

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

Vote in PR 36563 patch. Tested on Sol8 and OS X/darwin

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

Add vote.

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

Backport the use of apr_procattr_addrspace_set() to specify whether the new process should be started in the current address space or a new address space.  This should have no effect on most platforms other than NetWare.

Reviewed By: jjclar, bnicholes, trawick

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

update transformation

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

update German translation

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

  The more I consider this, the less that it seems possible to truly
  handle bodies in subrequests, ever.

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

  Reformat some long-lines >80 and delete a number of truly dead (voted
  down) suggestions.

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

  Very important to point out exactly where this is available and where
  it is not, since TraceEnable extended is likely to be used to confirm
  behavior between differing types of servers, including 1.3/2.0/2.2

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

Merge r233493 from trunk:

* srclib/pcre/pcre.c (read_repeat_counts): Check for integer overflow.

Obtained from: pcre 6.2 upstream
Reviewed by: jorton, nd, wrowe

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

update transformation

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

  Quiet a second error, bodyread is always set alongside bodylen,
  and we would never use the bodyread unless bodylen is set.

  However gcc4 doesn't like our style, so quiet the compiler.

Reported by: jorton

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

update German translation

Reviewed by: Kess

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

  We never call this function with 'nothing to do', however we aught to quiet
  gcc 4's assumption that we can 'return status;' without having performed
  any operation that sets status.

Reported by: jorton

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

fix TraceEnable docs

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

`build all`

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

  Backport trunk changes as recorded in branches/proxy-reqbody-2.0.x,
  refactoring http_proxy.c request body handling.  This correction
  satisfies the vetoed issues in the originally backported proxy
  request body handling from trunk/ in 171205.

Reviewed by: jim, minfrin

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

  Remove to readd with full history from proxy-reqbody-2.0.x branch.
  (turns out you cannot rm and cp to a local copy, removing and adding
  in the same commit, so this is a two-step process.)

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

  TraceEnable docs, backported

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

  Backport TraceEnable option, correcting RFC violation by mod_proxy as this
  now drops any proxied TRACE request which tries to pass a body, unless
  the user explicitly forces 'TraceEnable extended'.

  Per colm; removed \n's from error_notes, docs coming next.

Reviewed by: jimj, colm

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

mod_ldap backport

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

Add a vote.

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

Vote on "Vary: *" handling, since I've been running this for weeks.

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

Confirmed issue on Solaris 10, and tested the configure changes on
Solaris 10.

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

Vote on the TRACE patch. Testing done on Ubuntu. Add some notes (more reminders
for myself than anything else) that have been discussed.

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

  Fix VPATH build breakage introduced by rev 159475

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

Add a rev to the proposed backport (discussed with proposer), add a minus 0,
but only because I've felt the pain of filtered ICMP, window scaling and broken
firewalls.

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

Added a comment on a backport

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

move my proposal to the end of the list, thanks colmmacc

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

let's backport ReceiveBufferSize to 2.0

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

  Notes/votes

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

backport from trunk:
  mod_auth_digest: Fix hostinfo validation for CONNECT requests.

Submitted by: jorton
Reviewed by: nd, jerenkrantz

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

from trunk, backport ap_log_cerror(), along with some helpful uses
of it

Reviewed by: stoddard, wrowe

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

backport from trunk:

   Correct mod_cgid's argv[0] so that the full path can be delved by the
   invoked cgi application, to conform to the behavior of mod_cgi.
   [Pradeep Kumar S <pradeep.smani gmail.com>]

Reviewed by: wrowe, colm, trawick

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

add a couple of votes; update mod_mime_magic proposal
based on suggestion from wrowe

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

update German translation

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

update transformation

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

Backport changes to LimitRequestFieldSize docs to reflect
the lifting of a related restriction in 2.0.53.  This
was a missed portion of that backport.

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

commit transformation of xml which was committed previously

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

CAN-2004-1834 was created in March 2004 when it was reported
that mod_disk_cache would store these headers -- leading to a
small potential risk that you'd end up with authentication headers
on disk and visible to users (or cgi scripts or whatever).  Make
a note which commit actually ended up closing this low impact issue.

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

vote on the other mod_cgid change. Agree in principle, tested with and without
suexec.

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

propose a backport

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

blah, blah, blah.

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

Propose CAN-2005-2700 fix.

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

Merge r179763 from trunk:

* modules/filters/mod_include.c (handle_include): Fix possible
variable corruption with nested includes.

PR: 12655
Reviewed by: jorton, nd, jerenkrantz

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

Go through the list of allocated CVE names for httpd related issues and
fix up CHANGES to match.  Still got four older issues in my queue to
add in here.

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

  Anyone object to sharing the same indentation?  :)

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

  Propose the cgid argv[0] backport

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

  Accepted, lingering swaps

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

  Whitespace/instructions

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

Backport from trunk:

  *) Support the suppress-error-charset setting, as with Apache 1.3.x.
     PR 31274.

Reviewed by: jorton, nd

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

Backport from trunk:

 EBCDIC: Handle chunked input from client or, with proxy, origin
         server.

Reviewed by: wrowe, nd

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

Vote.

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

update transformation

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

update German translation

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

Document PR 34512 closed for this branch.

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

Fold in other's patch. Had enough votes and closes PR 34512
for 2.0 tree.

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

Fold in approved, 2.1/2.2-like behavior which prevents core
dump when doing LDAP auth even if the check_user_id didn't
succeed.

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

add a couple of votes

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

Merge r233493 from trunk:

* modules/http/http_protocol.c (ap_byterange_filter): Refuse to
byterange any response which may require the consumption of arbitrary
amounts of memory.

PR: 29962
Reviewed by: jorton, trawick, niq

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

Propose backport of pcre fix.

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

update transformation

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

some language changes and fixes

committed by Noirin Plunkett

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

update transformation

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

Vote on byterange patch; put reverse proxy patch vote in right place

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

votes
move previously-accepted patch to appropriate section

let me plug a single-line patch:
  http://svn.apache.org/viewcvs?rev=178262&view=rev

(the surrounding function is the same in 2.0.x but that
function is in a different file between branches, so the
patch won't apply directly)

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

Vote.

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

Propose.

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

Add a PR reference.

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

Propose backport of reverse proxy fixes

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

vote

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