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

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

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

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

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

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

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

PR: 38966


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

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

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

English revision: 417234

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

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

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

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

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

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

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

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

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

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

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

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

century.


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

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

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

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

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

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

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

* Add Content-Type to headers_out if not already set. This ensures that
  the Content-Type of the cached entity gets restored correctly.

PR: 39266

Submitted by: rpluem
Reviewed by: rpluem, trawick, jim


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

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

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