update transformation

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

Merge r434483 from trunk:

* Close connection to backend if reading of request body fails.

PR: 40310
Submitted by: Ian Abel <ianabel mxtelecom.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

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

And remove backported info

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

Merge r417443 from trunk:

* Retry worker chosen by client supplied route / redirect worker if it
  is in error state before sending "Service Temporarily Unavailable".

PR: 38962
Submitted by: Christian Boitel <cboitel lfdj.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

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

And move up those with at least 3 +1s

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

Yeppers. Looks good on 2.2

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

Propose mpm_winnt fix for handling the return
values from wait_for_many_objects.

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

Some votes.

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

Add in the cping/cpong backport... will vote in a bit, but didn't
want to forget this.

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

Some votes

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

Propose load balancer enhancements from trunk for backport.
These are:

   o Hot Standby
   o Cluster set
   o balancer_manager additional info
   o docs updates for above

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

* Fix broken links in proposal

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

* Propose rework of mod_deflate's inflate and deflate output filter for
  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

Backport README change

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

Cast some votes

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

* Add proposal to fix PR: 40310

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

* Cast one vote and add a proposal

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

Fix contributed by  Bjarne D Mathiesen <macintosh@mathiesen.info>

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

Add a backport, approve another, vote and note on others...

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

Backport:
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

Backport case sensitivity note for windows.

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

Backport:
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

update convmap

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

fix messed up paths. How did that happen?

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

Update manual transformations

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

Update the proxy module docs to reflect current reality.
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

2.2.3 was released.

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

Add PKCS#7 backport.

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

SECURITY: CVE-2006-3747 (cve.mitre.org)
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

Merge r425210 from trunk:

* 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

Merge r411306 from trunk:

* 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

Merge r410370 from trunk:

* 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

Cast a baleful eye over proposal to ship hacked third-party package

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

Backport mod_speling enhancement

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

Promote patches with 3 votes (hey, should've done that before backport:-)

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

Backport DBD fixes

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

not a very good vacation

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

* Cast some votes.

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

propose a backport

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

ScriptSock has been global-only for a couple of years
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

Propose a small backport.

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

Merge r399947, r406697 from trunk:

* 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

Merge r407357, r408154, r408729 from trunk:

* 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

Propose backport for DBD configuration segfault fix.

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

merge from trunk:

  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

merge from trunk:

  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

Vote.

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

Reverse PKCS#7 patch.

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

Backported.

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

Merge r395211, r410828 from trunk:

* 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

Add PKCS#7 support.

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

vote for a backport

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

no more forkamatic?

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

update revision references

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

update according to board resolution

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

update collective copyright notice in manual

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

update license header text

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

update license header text

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

update license header text

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

update collective copyright notice in manual

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

update revision reference and transformation

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

update transformation

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

  Update the instructions slightly for openssl and zlib based on 2.2.0
  and later builds of httpd on windows.

Backports: 419635

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

* Add comment

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

  Matt's proposed this be backported, choose the straight-line approach.

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

  Some feedback/votes

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

  Remove an invalid backport proposal.  You must cite source code
  (in the form of a file or patch) which actually compiles and runs
  as submitted.

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

Backport 418360 (per-directory rewrites clarification)

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

Backport 418354 (add vary to prefer-language example).

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

Merge 413217 from trunk (missing WINCH from index of signals).

PR: 38966

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

Fix Typo (PR 39939)

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

Add missing space

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

Change the example code to use the correct directive name and the correct setting for the AuthzAuthoritative directive

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

bump up the English revision.
English revision: 417234

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

Patch submitted by Matt Lewandowsky - fixes name of mod_isapi handler.

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

Merge r416844 from trunk:

Update the LICENSE file since mod_imap was renamed to mod_imagemap.

Noticed by: Albert Chin <apache-dev mlists.thewrittenword.com>

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

Propose backport of bugfix

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

Backporting mod_usertrack updates

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

Move up two accepted patches

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

vote.

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

Backport fix for PR#39672 (Don't try to insert an undefined filter)
and chop outdated blurb.

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

Propose speling thingey; vote&promote worker patch

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

update transformation

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

Submitted by Vincent "noodl" Bray.
Adds link to the other caching doc, where many secrets are revealed and
mysteries uncovered.

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

Referring to stuff added in 1.1, in the 2.2 docs, seems a little
archaic. Rephrase a little.

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

Remove an appendix that hasn't really been useful since the turn of the
century.

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

update transformation

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

Based on report from alex.extreme2@gmail.com (Alex Smith) poked around a
bit, and there were a lot of incorrect paths in this document. Also, the
'apache.exe' file is now named 'httpd.exe' as god intended.
"C:\Program Files\Apache Group" becomes "C:\Program Files\Apache
Software Foundation" and the cooresponding change also made in the
registry paths.

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

Gramatical nitpicking.

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

authnz_ldap backport proposal

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

* Propose fix for PR 39647 for backport.

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

Merge r377291 from trunk:

Make the worker and event MPMs support GracefulShutdownTimeout just like
the prefork MPM does.

Submitted by: Chris Darroch <chrisd pearsoncmg.com>
Ported to event MPM by: rooneg
Issue number: 38621

* server/mpm/worker/worker.c
  (ap_mpm_run): Make the graceful shutdown log message refer to the right
   signal, and respect the graceful shutdown timeout if there is one.

* server/mpm/experimental/event/event.c
  (ap_mpm_run): Ditto.

* CHANGES: Note change.

Submitted by: chrisd, rooneg
Reviewed by: chrisd, rpluem, trawick
PR: 38621

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