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

  backport. This fixes PR 39854. Also remove previous backport proposal for
  fixing PR 39854 and restart voting. The patch for the previous backport
  proposal is contained inside this proposal.


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

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

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

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

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

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

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

My last effort was a little too succinct and not quite precise
enough.  Try being more explicit.

This does leave the danger that people will clip the <Location>
example as the proper way to do things, when they should be
reading on to the <Directory> example.  The <Location> example
is only correct when used in conjunction with Alias.



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

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

Make it clear that url-path is always case-sensitive.
Provide an example of using a regex to make it case-insensitive.
Make it clear that ScriptAlias is only used when you want
BOTH mapping and script-designation.

Partially in response to the disputed vulnerability:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4110


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

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

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

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

Add in the flush settings, which are part of 2.2.x and
reorder params to be in abc order (to make 'em easier
to find)


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

  Sync to httpd/trunk where we've reverted the /d "LONG_NAME=foo bar" syntax,
  which confuses the ability of MS VS 6 to export makefiles.

  Also syncs the fix to some debug/release targets observed by hunter.

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

Vote on the PCRE backport; While it is 3rd party software, we must take responsibility for it when we are distributing it. The choice to not include it should be discussed on dev@httpd, or voted on separately.


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

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

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

  Bump after tag 2.2.3


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

  Prepare to tag


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

  Last quick observation


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

  Wrong project name

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

mod_rewrite: Fix an off-by-one security problem in the ldap scheme
handling.  For some RewriteRules this could lead to a pointer being
written out of bounds.  Reported by Mark Dowd of McAfee.

Ack: trawick, lars, jorton, wrowe, benl



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

  Changes from trunk noted by Mladen, fix %~na typo and activate our
  config rewriting; and copy a NOTICE

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

  Jeff's dead on - a diff is needed


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

* Add a check to make sure that the base provider and the alias names are
  different and also that the alias has not been registered before.

PR: 40051
Submitted by: bnicholes
Reviewed by: bnicholes, rpluem, fielding


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

* Fix a problem with invalid auth error detection for LDAP client SDKs that don't
  support the LDAP_SECURITY_ERROR macro.

PR: 39529
Submitted by: Ray Price <dohrayme yahoo.com>, Josh Fenlason <jfenlason ptc.com>
Reviewed by: bnicholes, wrowe, fielding


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

* Keep the Content-Type for successfully revalidated
  cached objects, by unsetting possible Content-Type headers in
  r->headers_out and r->err_headers_out as they may be different to what
  we have received from the cache.
  Actually they are not needed as r->content_type set by
  ap_set_content_type a few lines above will be used in the store_headers
  functions of the storage providers as a fallback and the HTTP_HEADER filter
  does overwrite the Content-Type header with r->content_type anyway.

PR: 39647
Submitted by: rpluem
Reviewed by: rpluem, pquerna, fielding


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

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

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

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

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

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

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

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

now; fix the docs


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

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

* Add optional 'scheme://' prefix to ServerName directive.  For
  'https', mod_http returns "https" for the ap_hook_http_scheme and
  DEFAULT_HTTPS_PORT for ap_hook_default_port.  This fixes Redirect
  responses to requests for directories without a trailing slash
  when httpd runs behind a proxy or offload device that processes
  SSL.  It also enables support for Subversion in that
  configuration.  This change is completely backwards compatible
  and passes the perl-framework.  Minor mmn bump because I add a
  field to server_rec.

* Document r399947, addition of optional scheme:// to ServerName directive

PR: 33398
Submitted by: sctemme
Reviewed by: sctemme, rpluem, wrowe


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

* Handle the cases "no proxy request" and "reverse proxy request" in the same
  manner, when setting scheme and port_str. This is needed because if a cached
  entry is looked up by mod_cache's quick handler r->proxyreq
  is still unset in the reverse proxy case as it only gets set in the
  translate name hook (either by ProxyPass or mod_rewrite) which is run
  after the quick handler hook. This is different to the forward proxy
  case where it gets set before the quick handler is run (in the
  post_read_request hook).
  If a cache entry is created by the CACHE_SAVE filter we always have
  r->proxyreq set correctly.
  Also set scheme to ap_http_scheme(r) instead of "http" to handle SSL
  correctly.

* Fix const compiler warning introduced by r407357.
Noticed by: Joe Orton

* Cleanup the code by replacing some inline code to lower-case a string with
  ap_str_tolower.
Proposed by: Joe Orton

PR: 39593
Submitted by: rpluem
Reviewed by: rpluem, jim, pquerna


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