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

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

  Worker MPM: On graceless shutdown or restart, send signals to
  each worker thread to wake them up if they're polling on a
  Keep-Alive connection.  PR 38737.  [Chris Darroch]

PR: 38737
Reviewed by: chrisd, trawick, niq



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

  worker and event MPMs: fix excessive forking if fork() or child_init
  take a long time.

PR: 39275
Reviewed by: trawick, gregames, pquerna


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

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

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

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

* configure.in: Add --with-included-apr flag to force use of the
bundled copies of APR and APR-util.

* configure.in: Use common variables for the required APR/APR-util
version.

Reviewed by: jorton, rpluem, pquerna


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

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

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

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

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

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

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

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

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

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