Sync with mime.types rev 571614

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

update transformation

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

fix pending httpd version

Submitted by: Takashi Sato <serai lans-tv.com>

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

Backport applied

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

Backport applied

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

Promote those with >= 3

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

Some obvious votes :)

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

Update all docs

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

backported complete

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

Merge r570532, r570535, r570558 from trunk:

IndexOptions ContentType=text/html Charset=UTF-8
magic.

Document new IndexOptions options

Make Bill happy ;)

Submitted by: jim
Reviewed by: root

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

Promote

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

* Cast a vote

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

Vote up another

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

typo

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

Propose IndexOptions Type=... Charset=... backport

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

server/log.c (log_error_core): For APLOG_DEBUG on Unix, if __FILE__
is an absolute path (as in a VPATH build), just log the basename.

Submitted by: jorton
Backport: r105258
Reviewed by: wrowe, trawick, rpluem

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

Reprocess .png's as transparent (w/ GraphicsMagic since my local
copy of ImageMagic creates garbage transparent .png's).

PR: 30190
Backport: r570373

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

Update for the docs-project, and illustrate the icons on both white
and black backgrounds (to point out PR 30190).

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

Documented in the parent directory

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

* Cast some votes.

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

vote early

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

One more tiny beg.  I'm offering to backport since it offends me so much :)

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

Re-proposed.  Sorry bout the messy prior patch.

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

Finish commit r570307, with some play-by-play commentary to
match trunk.

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

main core: Emit errors during the initial apr_app_initialize()
or apr_pool_create() (when apr-based error reporting is not ready).
[William Rowe, Jeff Trawick]

Backport: 568779, 569934

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

log core: Fix issue which could cause piped loggers to be orphaned
and never terminate after a graceful restart. PR 40651. [Joe Orton,
Ruediger Pluem]

log core: fix the new piped logger case where we couldn't connect
the replacement stderr logger's stderr to the NULL stdout stream.
Continue in this case, since the previous alternative of no error
logging at all (/dev/null) is far worse. [William Rowe]

disambiguate an error message to diagnose future error reports

Backport: 452431, 568326, 568322

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

mpm_winnt: Prevent the parent-child pipe from leaking into other
spawned processes, and ensure we have a /Device/null handle for
stdout when running as-a-service.

Backport: 568446

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

* Remove obsolete comment and add a vote

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

backport from trunk (r570206)

Sync with IANA registry.

Update common x-types that have been registered or will never
be registered for compatibility reasons.  Yeah, those x-Idiots.

The extensions recently assigned to application/vnd.apple.installer+xml
(dist distz pkg mpkg) are too numerous and too generic.  We should
always assume that vendors are too lazy to check for conflicts
(we choose .mpkg only, since that is the common one).

The extension recently assigned to ecmascript (.es)
interferes with languages (espanol), so replace with .ecma.
PR: 35550

Assign the .chm extension to the newly registered type based on
the theory that Microsoft will use it eventually.
PR: 37798

Add application/xspf+xml xspf since they are trying to do it right.
PR: 39317

Add svgz to list of image/svg+xml extensions as per W3C.
PR: 31483

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

Some votes for 2.0.x...

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

poor Bill; all the juicy stuff needs to be reviewed/tested and
we give him heck about some code that never runs

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

* Cast vote and add some comments

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

Some final suggestions for 2.0.61

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

Catch up with Jeff's proposal

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

Note status update.

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

s/require/Require/g

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

s/require/Require/g

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

* Cast some votes

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

Second iteration, whoops, thanks for testing rpluem

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

* Cast a vote

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

Things get a little more complicated here, but folks who still
need to run 2.0.x need these same cleanups of leaks and stderr
handling.  Thanks to jorton and rpluem for their pioneering work
in originally diagonising the issue.

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

Merge r536052, r556879, r557188 from trunk:

Add detection for post XP operating systems.
Think this can be safely backported to 2.2 and 2.0 branches

ApacheMonitor valid OS is any WIN32_NT version.

Simplify OS detection. We are only interested in NT
and WIN2K+ (so we can use services.msc)
Submitted by: mturk
Reviewed by: wrowe, jim

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

update transformation

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

Add a description of the env= optional syntax, as per issue #27951

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

And bump up to 2.0.60-dev

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

Get ready to tag 2.0.60

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

No longer "track" older releases (1.3.x) in here. Instead, point
to SVN

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

Might as well note proposed T&R schedule :)

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

backport mod_proxy date parsing buffer over-read (CVE-2007-3847)

Submitted by: Davi Arnaut, Nick Kew
Reviewed by: niq, rpluem, covener

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

* Vote and promote.

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

Vote

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

propose CVE-2007-3847 for backport

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

Fix backward definition.

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

update transformation

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

remove linebreak which caused a bogus anchor

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

PR 41334.  Replaced apache, with httpd as the binary name.

Thanks Brett

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

Merge r559748 (Link to filters page to address PR35102)

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

[PR36917] Document LogLevel debug requirement for mod_dumpio

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

rebuild everything

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

fix eol-style

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

Commit build artifacts left hanging from 533502

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

Language fix submitted by Lucien Gentis to docs@

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

Tweak changes entry for -3304 fix.

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

Update 2.0 backport ApacheMoitor proposal as well.

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

Merged one.

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

Merge r535617 from trunk (fixing CVE-2007-1863):

* Prevent a segmentation fault if one of the Cache-Control headers
  s-maxage, max-age, min-fresh, max-stale has no value assigned.
  In this case ignore s-maxage, max-age, min-fresh. For max-stale
  it is valid to set no value. In this case set max-stale to 1 year
  to signal that the client is accepting a stale response of any age.

Submitted by: Niklas Edmundsson <nikke acc.umu.se>
Reviewed by: mjc, rpluem, jorton

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

Backport of 2.0.x PID table problem fix

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

Backport of mod_so cookie mis-match error message

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

CVE-2006-5752 backport

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

Vote, promote and note

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

* Vote and promote

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

Vote for error message clarity.

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

* Summarize, vote and promote

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

Cast vote for pgrp version of pid fix

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

Also add Mark's backport of the mod_cache; all security fixes now
proposed for 2.2 and 2.0.

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

Propose two.

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

Ignore httxt2dbm.

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

* Cast a vote

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

Propose for backport mod_cache issue

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

mod_ssl: initialize thread locks before initializing the hardware
acceleration library, so the latter can make use of the former.

PR: 20951
Patch: http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
Submitted by: <adunn ncipher.com>
Reviewed by: sctemme, rpluem, wrowe

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

mod_ssl: Support limited buffering of request bodies to allow
per-location renegotiation to proceed.

PR: 12355
Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=16495
Submitted by: jorton
Reviewed by: wrowe, rpluem, sctemme

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

Votes, promotes, and a new suggestion to diagnose mod_so errors

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

Propose a trunk bugfix for ApacheMonitor so it can be run on Windows Vista

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

Merge r442758 from trunk:

PR 31759 (mutated) - reported by Jo Rhett
Don't return apr_status_t error value from input filter chain.

Submitted by: niq
Reviewed by: root

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

* htdbm: Fix crash in 64-bit mode on HP-UX caused by unexpected
      placement of crypt() prototype (unistd.h).
        Trunk version of patch:
          http://svn.apache.org/viewcvs?rev=393364&view=rev

Orig: Jeff Trawick

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

Approved backport. Overlay cookies as we do with 2.2 and later.

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

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