revert move to image/vnd.microsoft.icon because everyone uses image/x-icon

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

 http://svn.apache.org/viewvc?rev=606693&view=rev
     http://svn.apache.org/viewvc?rev=607276&view=rev

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

Cast vote

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

* Update transformation.

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

Merge r607282 from trunk:

* Ensure refresh parameter is numeric to prevent a possible XSS attack caused
  by redirecting to other URLs. Reported by SecurityReason.

Submitted by: Mark Cox, Joe Orton
Reviewed by: rpluem, fuankg, wrowe

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

* Promote

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

promoting 2.0 version patches.

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

Added backport proposal.

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

Cast a vote.

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

Yup - looks healthier, sorry my patch was rushed.

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

* Comment

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

Close the child_exit_event which lives only for the scope
of master_main and was orphaned on each soft or fatal restart.

PR: 40932
Submitted by: Jeff Robbins <jeffr livedata.com>

Backport: r607677

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

A spelling rule I don't understand to this day.

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

To a user, explanation of r607668 is pretty simple.

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

On win32, we must never, never close the parent's copy of the
child's read end for a reliable piped logger.  The child runs
and manages it's own logs, and even if the parent did instead,
the mpm would be adjusted to pass down the child write ends
without read ends to the pipes, so this forever makes no sense.

Backport: r607666

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

Offer the *particular* patch which applies to *this* branch - heh

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

Offer a patch which applies

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

Propose

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

Fix winnt bucket_alloc to borrow memory from the transaction
pool, instead of exhausting pchild memory over a number of
connections.

PR: 11427
Submitted by: Alex Varju <alex varju.ca>
Backport: r607393

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

Backport a patch similar to r580433, but similar to the apr-1.2
specific server/log.c r602467, take into account the fact that
apr's flags could not be adjusted.

Backports: 2.2.x branch r607311

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

Refactor releasing the child processes by eliminating the
time lookup, eliminating the bogus/misimplemented function,
and introducing fairness to release any dead threads before
getting hung up on releasing longer lived threads.

Also pick up the time-to-wait from the server global timeout.

And finally, axe a completely bogus internal helper function.

Backports: r573103, r573105

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

Correct the approach to std file handles by simplifying the approach
and taking better advantage of apr's now-proper support.

Already verified by Randy Kobes and Tom Donovan

Sync to trunk r580433

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

* This is 2.0.x and not 2.2.x.

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

* Add two proposals.

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

  * Backport 102870; PR 17217; stop linking OpenSSL .so's to support/*
      binaries (especially when compiled --with-static-support (!)) and
          fix mod_ssl.so to compile against .a openssl archives.
                http://svn.apache.org/viewcvs.cgi?rev=102870&view=rev
                    adjusted patch without distcache complexity and accomodating the
                        changes for pkgconfig info from ssl
                              http://people.apache.org/~wrowe/httpd-2.0-limit-ssl-binding.patch
                                  +1: wrowe, colm, rpluem

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

  * Initialize all algorithms in OpenSSL; PRs 35469, 42035
    Trunk:
      http://svn.apache.org/viewvc?view=rev&revision=226777
    2.0.x:
      Patch submitted via PR 42035 by Dominique Quatravaux
      http://issues.apache.org/bugzilla/attachment.cgi?id=19901
    +1: trawick, rpluem, wrowe

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

Remove existing showstopper

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

Vote and intent

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

fixed type mismatch between OpenSSL 0.9.7 <-> 0.9.8 and later.

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

Rolled back as part of PR 43890

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

* Remove obsolete comment, vote, promote

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

Solve service status handle leak on multi-service ApacheMonitor
instances, and disconnect computer function on multi-system
applications of ApacheMonitor.

PR: 33803
Reported by: K.W.Schick <drax sawebs.com>
Backport: 606481

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

vote and promote

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

If compiled for WinNT, CommandLineToArgvW must resolve.

Backports r605397

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

Correct statements in OPENSSL-README when building the
httpd+openssl binary.

Backport: r604940

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

update transformation

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

* Wrong order, Security changes first.

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

merge r603346 from trunk:

  http_protocol: Escape request method in 405 error reporting.
  This has no security impact since the browser cannot be tricked
  into sending arbitrary method strings.

Reviewed by: wrowe, rpluem

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

merge r600645 from trunk:

 http_protocol: Escape request method in 413 error reporting.
 Determined to be not generally exploitable, but a flaw in any case.
 PR 44014

Submitted by: Victor Stinner <victor.stinner inl.fr>
Reviewed by: wrowe, rpluem, trawick

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

* Vote and promote

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

Accomodate Jim's objection

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

Yes please, that too.

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

vote/promote/propose

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

Merge r580437 from trunk:

Share a single write-pipe handle for piped stderr logging, this
prevents an extra logging process from hanging around after the
initial config-phase.

Reviewed by: rpluem, wrowe
Submitted by: wrowe
Reviewed by: jim

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

cast it

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

Revert r603712 which was prematurely committed (leave the STATUS
mop-up in place)

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

Hmmm.  Once patched, silly that this would hang around :)

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

Merge r603282 from trunk:

Fix CVE-2007-5000:

* modules/mappers/mod_imap.c (menu_header): Fix cross-site-scripting
  issue by escaping the URI, and ensure that a charset parameter is
  sent in the content-type to prevent autodetection by broken browsers.

Reported by: JPCERT
Reviewed by: jorton, rpluem, trawick

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

+1, promote

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

* Cast a vote.

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

Propose 2.0.x rediff of CVE-2007-5000.

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

Make the recipe match the statement of the problem.

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

Make the recipe match the problem description.

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

* Cast some votes.

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

Four different indentions?  Normalize this, and add PR 44014 to the list.

It makes it so much easier to bounce entries from 2.2 to 2.0 status

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

Update transformations

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

Backport 600245 (AuthDigestQueryStringHack for MSIE7)

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

update transformation

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

another typo found by Lucien GENTIS

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

update transformation

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

typos
found by Lucien GENTIS

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

Update transformations

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

'youare' typo (submitted by Luciene Gentis)

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

update transformation

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

fix external reference to perldoc

PR: 43856

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

update transformation

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

one-line fix to initialize all algorithms in OpenSSL

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

Fixed as per PR#28112
This was already fixed in 2.2, so just back-porting.

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

Transformations.

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

* Fix typo: 'on' vs. 'or'
* Fix versioning information where it makes sense
* Clarify DNS lookups: 'double reverse lookup' vs. 'two lookups'

Submitted, in parts, by <lucien.gentis lorraine.iufm.fr>.

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

Transformations.

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

Backport reference to starting docs.

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

like r586770 (trunk)

s/the the/the/

pointed out by <lucien.gentis lorraine.iufm.fr>

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

More transformations, note translation diffs.

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

Transformations.

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

Backport of r586433/r586434.

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

Backport of r583991/r584015.

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

propose a 2.0.x backport for AddOutputFilterByType vs. proxy PR31226

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

* Add a comment

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

Work around ineffectual tlp

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

We are back to the original scenario as apr has chosen not
to maintain portability between win32 and unix.

Win32 will require duplicating the child_out and child_err
handles explicitly to apr_proc_create() of the child worker
process, revised patch will be forthcoming shortly.

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

Add footnotes

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

Clean up 2nd typo of the same line, backports 580535

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

Fix typo, backports r580532

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

Better patch

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

Patches, we've got patches

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

Change to Experimental module to avoid an ever-expanding brigade,
absorb the buckets we've consumed.  Better ways to do this lurk here.

Backport: r580206

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

document the mod_userdir-like tilde expansion sometimes performed by mod_rewrite

A tilde can sneak into a rule via a backreference and cause some surprising behavior

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

buildfluff

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

Backport r576690 (PR38644 mod_status no longer needs to be recompiled to show extended status items)

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

Done n gone

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

Merge r574884 from trunk:

Resolve storage of process-lifespan version strings for OpenSSL,
while using request-lifespan copies for manipulation.

Reviewed by RPleum, ZHar'El

Submitted by: wrowe
Reviewed by: jim

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

Vote and promote

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

* Cast a vote.

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

Consider the same only different

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

sync CHANGES entry for mod_autoindex CVE-2007-4465
work-around with the 2.2.x entry

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

Bump after tagging 2.0.61

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

Get ready to tag 2.0.61

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

Cast a vote, and demote one proposal (but it can always
be un-demoted :) )

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