Merge r599651, r608508, r611376 from trunk:

Get rid of some compiler warnings.

* Silence a compiler warning by using the correct format.

* Hex pids are bogus anyway and on environments with APR_PID_T_FMT d this
  breaks and print x.

Submitted by: rpluem
Reviewed by: rpluem, covener, trawick

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

++

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

* Add PR number to proposal.

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

vote, promote

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

* Vote

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

fix one of my frequent pastes of unexpected text with Linux

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

logging

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

This need not be said; the current version of testdbm.c
carries the correct license.

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

add two backport proposals

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

* Add a proposal

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

Backport r611134: Don't canonicalise URLs with [P,NE] in mod_rewrite

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

vote, promote

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

* Update proposal

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

* Vote

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

Propose backport

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

Update year to 2008

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

Backport r611035 from trunk (link to SSLOptions for explanation of password example)

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

We are now 2.2.9-dev

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

get ready to tag 2.2.8

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

Adjust for 2008

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

bump

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

Various memory, code cleanup and edge case optimizations for
ap_http_filter (HTTP_INPUT) filter

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

Promote

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

Vote on opt's

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

vote/update/comment

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

Note 2.2.7 was not released

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

Change CHANGES to reflect the main bit in 2.2.8...

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

* Update proposal

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

Merge r609394, r609538, r609540 from trunk:

* Fix cases with non blocking reads from the ap_http_filter input filter where
  chunk size lines or empty lines after a chunk are read incomplete. This can
  lead to a corruption inside the dechunking algorithm.
  This patch has an issue with larger chunk-extensions which need to get thrown
  away since we ignore them anyway.

PR: 19954, 41056
Tested by: niq

* Optimize solution from r609394 and remove chunk-extensions restriction that
  was in r609394.

* Optimize alignment.

Submitted by: rpluem
Reviewed by: rpluem, jim, niq

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

vote&promote

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

Add in r609540 so we don't need to adjust http_ctx_t anymore if/when
we add in other enhancements

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

cast vote - note 2.2.7 tagged but won't be released.

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

* Add CVE number

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

Un-BOM this file

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

winnt_mpm: Resolve modperl issues by redirecting console mode stdout
to /Device/Nul as the server is starting up, mirroring unix MPM's.

PR: 43534

Submitted by: Tom Donovan <Tom.Donovan acm.org> and William Rowe

Backports: r609354, r609366

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

* Add proposals

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

* Update transformation (./build.sh all convmap). Pointed out by Takashi Sato <serai lans-tv.com>

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

winnt_mpm: Restore Win32DisableAcceptEx On directive and Win9x platform
by recreating the bucket allocator each time the trans pool is cleared.

PR: 11427 #16 (follow-on)
Submitted by: Tom Donovan <Tom.Donovan acm.org>
Backport: r609181

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

Merge r607466, r607472, r607838 from trunk:

mod_dav: Fix evaluation of If-Match * and If-None-Match * conditionals.
PR 38034
Patch by Paritosh Shah
Explanation by Werner Baumann

* Style police. No functional changes.

* Avoid SEGFAULT as hooks->set_headers can be NULL. Furthermore do not set the
  ETag header permanently as setting it may not be desired for all responses.

Submitted by: niq, rpluem
Reviewed by: niq, rpluem, chrisd

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

vote for mod_dav fix for PR 38034

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

* Removed obsolete comment and cast a vote.

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

And we are now 2.2.8-dev

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

Remove No BOM reminder, at least right now...

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

Ready for tagging 2.2.7

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

And final patch before tag

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

cast vote and promote

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

Merge r591393 from trunk:

Fix handling of buffered request body for per-location SSL
renegotiation when an internal redirect occurs:

* modules/ssl/ssl_engine_io.c (ssl_io_buffer_fill): Remove
protocol-level filters before inserting the buffering filter.
(ssl_io_filter_buffer): Return an EOS if invoked with an empty
brigade; do not remove the filter after exhausting the buffer.
(ssl_io_filter_buffer): Increase the type of the buffer filter to be
AP_FTYPE_PROTOCOL.

PR: 43738
Reviewed by: rpluem, wrowe, jorton

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

* Add a proposal

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

Update mime.types with IANA registry

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

Yup, looks right.

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

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.2.x@608218 13f79535-47bb-0310-9956-ffa450edef68

Update docco xforms

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

Add ProxyFtpDirCharset directive:

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

Promote patch

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

Cast votes

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

update transformation

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

* Add proposal

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

* Update transformation.

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

* Security first.

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

Merge r607275, r607403 from trunk:

* Correctly escape the worker route and the worker redirect string in the HTML
  output of the balancer manager.

Reported by SecurityReason.

Submitted by: rpluem
Reviewed by: rpluem, niq, wrowe

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

Merge r607873 from trunk:

Modified default refresh value to 10 secs so that its possible to correct a typo.

Submitted by: fuankg
Reviewed by: fuankg, rpluem, wrowe

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

Merge r607437 from trunk:

* Adjust etag generation to produce identical results on 32-bit and 64-bit
  platforms and avoid a regression with conditional PUT's on lock and etag.

  Add a warning to the documentation of FileETAG that changes of the ETAG
  format can cause conditionals to fail on mod_dav_fs provided backends.

PR: 44152
Submitted by: Michael Clark <michael metaparadigm.com>
eviewed by: rpluem, niq, wrowe

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

* Promote

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

backport r607766, r607841 from trunk for PR 39095

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

third approval of four patches; two showstoppers, two non-showstoppers,
and reflect that one is radical enough to avoid for 2.2.7 release

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

* Vote

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

Added backport proposal.

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

* Vote, add a comment

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

* Backport CVE-2007-6422 fix (r607273, r607402).
* Update proposal for PR 38034 fix (mod_dav negotiation bug)

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

add an additional revision to backport proposal for win32 LDAP retry

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

propose backport for LDAP_UNAVAILABLE returned with MS LDAP SDK

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

fixed comment, added comment, added logic to build mod_ssl by default if USE_STDSOCKETS is defined;
updated manual NetWare OpenSSL build section.

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

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607713 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.2.x@607678 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.2.x@607671 13f79535-47bb-0310-9956-ffa450edef68

To a user, explanation of r607667 is pretty simple.

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

Comment

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

Offer a patch which applies

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

Propose

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

Updated to show "It Works!" as opposed to old, 1.3 style welcome page

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

* Vote.

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

* Add a comment

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

* Promote and comment.

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

Propose, veto.

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

Vote

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

Merge r409942, r607245, r607440 from trunk:

* Remove temporary files if renaming fails, otherwise they may accumulate.

* Make loglevel consistent for similar situations. As this really should not
  happen set it to error.

* Change loglevel from ERROR to WARNING if the renaming of the vary, headers
  or data file fails.

Submitted by: Davi Arnaut <davi haxent.com.br>
Reviewed by: rpluem, niq, wrowe

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

* Promote

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

* Add a proposal, updated proposal and added a comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607441 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, wrowe, jorton

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

* Vote

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

* Promote

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

* Updated proposals to add CVE number.

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

Sander pointed out to me that as we added ENGINE logic support
for 0.9.8, we never touched win32.  Resolve this for all of the
common win32 HAVE SSL related macros building against 0.9.8.

Backport: r607383

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

It turns out copy concat didn't work as I expected,
it does concat to the first named file, but not the
first filepath.

Backport: r607371

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

Avoid build directory pollution

Backport: r607369

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

Believe this or not, not every machine uses "C:\Documents and Settings",
split off the current user's name from USERPROFILE envvar.

Backport: r607367

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

Provide vhosts examples remotely related to the httpd.conf we create?

This patch was leapfrogged by a backport of 515403, if you
are confused by the sequence.

Backport: r410762

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