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

Migrating from httpd-win.conf to httpd.conf.in we need to add
winnt's mpm to extra/httpd-mpm.conf.in

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

Vote.

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

Vote and opine.

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

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

* Add new proposals.

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

Note T&R intent

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

* Update proposal and add a comment

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

Propose, comment

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

Add backport proposal.

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

Add backport proposal.

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

Copy all missing modules/foo/xxx.h headers.

Backports: r606394

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

Solve two ssl issues; always install both ab.exe and abs.exe
because it's easier to move around ab.exe when that's all
someone needs (and this is precisely how the binary installer
works, too), and also kindly ignore missing openssl tree files
because TIMTOWTDI (although this one is preferred :)

Backport: r606382, r606383

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

Let the installer lead on the origin sourceroot conf path

Backport: r606293

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

Quoting this made it worse on us, not easier.
Resolve SSLMutex default on win32.

Backports: r606274

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

Kill proxy\ dir, a horrible name with no corresponding example

Backports: r606265

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

The installer will now create a temp-extras directory

Backports: r606251

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

However, we still won't want to load charset_lite by default

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

Add charset lite missing from old config

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

Unplug win32 specific config, plug in build/installwinconf.awk

Backports: r606158

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

Prepare for win32 to share the common config file.

Note the quotes for "logs/access_log" which let us
toggle this to access.log, while leaving the custom
log format specifier pretty_log alone.

Also, prefer the user specified port for example
ServerName directive.

Backports: r606135

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

Copy with module list changes for 2.2 v.s. 2.x trunk module names.

Borrowing the msi installer script as a starting point, ensure
we use the same configuration rewrite engine for the msi and the
local build.  Prepares us to share httpd.conf.in with all platforms.

Backport: r606136, 606156, 606157

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

Revert the senseless half of r605396, whitespace only change.

Noted by Ruediger, thanks for this catch.

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

* Add a proposal

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

Catch up to APR 1.2.12, which politely names the static
library pdb's the same as their correponding .lib's.

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

When building to WinNT, CommandLineToArgvW must resolve.

Backports r605397

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

Handle args appropriately for an apr app.

Backports r605395

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

Sort

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

Two type mismatch fixes previously committed to trunk\
and forgotten from backports

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

update convmap

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

activate LastChangedRevision keyword substitution

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

Update transformations

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

'segement' typo and link to correct directive for lbmethod explanation

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

* Rebuild documentation.

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

* Correctly terminate string in SSL client certificate extensions
  parsing by ensuring that it always has a \0 at the end.

PR: PR 44073
Submitted by: yl <yl bee-ware.net>
Reviewed by: rpluem, jorton, trawick

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

simple mod_ssl fix (too bad about the pSTRNdup)

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

(words from jorton)

Submitted by: trawick
Reviewed by: jim

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

Vote.

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