Add a little detail about merging of .htaccess with httpd.conf,
and provide an example to enforce certain settings.

PR: 31782
Submitted by: Ray Ferguson <ferguson berbee.com>, Joshua Slive


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

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

ErrorDocument updates.


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

%t has logged request time for a very long time.
From mod_log_config.c:
    /* ###  I think getting the time again at the end of the request
     * just for logging is dumb.  i know it's "required" for CLF.
     * folks writing log parsing tools don't realise that out of order
     * times have always been possible (consider what happens if one
     * process calculates the time to log, but then there's a context
     * switch before it writes and before that process is run again the
     * log rotation occurs) and they should just fix their tools rather
     * than force the server to pay extra cpu cycles.  if you've got
     * a problem with this, you can set the define.  -djg
     */


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

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

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

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

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

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

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

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

  docs/manual/mod/quickreference.html.ru.koi8-r
  docs/manual/mod/quickreference.html.de
  docs/manual/mod/quickreference.html.en
  docs/manual/mod/quickreference.html.es
  docs/manual/mod/directives.html.de
  docs/manual/mod/directives.html.en
  docs/manual/mod/directives.html.es
  docs/manual/mod/mod_log_config.html.en
  docs/manual/mod/mod_log_config.xml.ja
  docs/manual/mod/mod_log_config.xml.ko
  docs/manual/mod/directives.html.ru.koi8-r

  update transformation


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

  Fix XML validation error


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

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

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

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

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

* manual/sitemap.xml.de

  Bring translation up to date

* manual/sitemap.xml.meta
  manual/sitemap.html.de

  Update transformation


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

  manual/mod/index.html.es
  manual/mod/core.html.de
  manual/mod/core.html.en
  manual/mod/core.html.es
  manual/mod/core.html
  manual/mod/quickreference.html.es
  manual/mod/allmodules.xml.es
  manual/mod/core.html.ja.euc-jp

  Update transformation


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

Translated by: Jesús Blanco <blanco bitrock.com>
Reviewed by: Daniel López

* docs/manual/mod/core.xml.es

  New file


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

Translated by: Jesús Blanco <blanco bitrock.com>
Reviewed by: Daniel López

* docs/manual/mpm.xml.es

  Bring translation up to date
  
* manual/mpm.xml.meta
* manual/mpm.html.es

  Update transformation


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

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

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

Matt Brubeck <mbrubeck@cs.hmc.edu>.  Add manpage, update
transformations, add props.


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

  bump pending httpd version


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

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

* STATUS

  Add 2.0.55, update 2.0.54.


* CHANGES

  Add section for 2.0.55


* include/ap_release.h
  
  (AP_SERVER_PATCHLEVEL): Bump to 55-dev.


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

* include/ap_release.h

  (AP_SERVER_PATCHLEVEL): Remove dev designator.


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

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

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

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

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

mod_version -- it turns out the changes are larger than expected.


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

* STATUS

  Remove vote.

* CHANGES
* docs/manual/mod/mod_cache.xml
* modules/experimental/cache_util.c
* modules/experimental/mod_cache.c
* modules/experimental/mod_cache.h
* modules/experimental/mod_mem_cache.c
* modules/experimental/mod_disk_cache.c

  Add CacheIgnoreHeaders directive.
  PR: 30399
    docs/manual/mod/mod_cache.xml: r1.18
    modules/experimental/cache_util.c: 1.36
    modules/experimental/mod_cache.c: 1.95
    modules/experimental/mod_cache.h: 1.52
    modules/experimental/mod_disk_cache.c: 1.67
    modules/experimental/mod_mem_cache.c: 1.119
      +1: jerenkrantz, stoddard, striker
      +0: sounds like a nice 'feature' v.s. rfc-required behavior, great for 2.2


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

* STATUS

  Remove backport vote.

* modules/dav/main/mod_dav.c

  (dav_finish_multistatus, dav_send_multistatus, dav_method_propfind):
   Send an EOS at the end of the multistatus brigade.
     http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.105&r2=1.106
     +1: jorton, jerenkrantz, pquerna
     nd asks: Sure, you want to drop the return code of ap_pass_brigade?
     jerenkrantz: They already did drop it.  Note that this really isn't
                  a correctness fix; just a perf. fix.  We'd send the EOS
                  later without it.


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

Added a new LDAPConnectionTimeout directive to util_ldap so that the socket connection timeout value is configurable.

Reviewed by: bnicholes, trawick, jim

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

  Commit some votes before this gets out of hand.
  Re-promote a patch (not voted down) to 'under consideration',
  Eliminate a patch I 1) don't know how to write, and 2) would
  only apply to non-OpenSSL solutions, which I no longer hack at.
  Add some notes on our recent dev@httpd discussions.

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

* STATUS

  Remove vote.


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

* STATUS

  Remove vote.

* modules/http/http_request.c
  
  (ap_internal_fast_redirect): Take over important members of the subrequest. 
   Especially the proxyreq copying is interesting for proxying DirectoryIndex'd
   resources:
     http://svn.apache.org/viewcvs.cgi?rev=102330&view=rev
     +1: nd, jerenkrantz, pquerna, striker


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

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