Docs fixes backports from trunk:

r1206940: fix typo.  Submitted by: OKANO Takayoshi <kano@na.rim.or.jp>
r1206978: fix typo

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

Backports from trunk:

- r1200955: Patch from Luke Meyer, clarifies usage of ProxyPassReverseCookiePath directive. As per bug #51126
- r1200968: A little clarification about variable interpolation, as requested in bug #51125
- r1202453: Fix xml

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

Typos

Backport of r1212872 from trunk.

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

Document configure change

Backport of r1200496 from trunk.

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

Update mergeinfo.

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

Updates.

Partial backport of r1231510 from trunk.

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

Update.

Backport of r1215514 from trunk.

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

xforms

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

c/p error

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

* modules/filters/mod_proxy_html.c: Fix various code style issues.
* Use apr_is* ctype macro wrappers.

Backport of r1200556 from trunk.

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

Merge r1229021 from trunk:

Core configuration: add AllowOverride option to treat syntax
errors in .htaccess as non-fatal.
PR 52439

Submitted by: niq
Reviewed/backported by: jim

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

Update CHANGES.

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

Fix copy&paste error in comment.

Backport of r1238545 from trunk.

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

Make doxygen generate (useful) graphs

Backport of r1201032 from trunk.

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

Formatting, no functional change.

Backport of r1200702 from trunk.

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

Line ordering. Partial backport of 1221216
from trunk to keep deltas small.

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

Fixed NetWare install.

Backport of r1201956 from trunk.

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

Simple edit, when 'saved' this will always alphasort anyways

Backport of r1227910 from trunk.

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

Reduce code drift: replace r1205569 with
exact merge of 1205568 from trunk.

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

* include/util_varbuf.h: Doxygen tweaks.

Backport of r1211351 from trunk.

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

* modules/: More doxy group fixes.

Partial backport of ir1211495.

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

* include/httpd.h, server/mpm/*/*.h: Tidy up doxygen tree view by moving
  private interfaces into a separate group.

Backport of r1211490 from trunk.

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

include/: Various doxy markup tweaks.

Backport of r1211364 from trunk.

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

definAtely

Backport of r1213381 from trunk.

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

silly indentation fix

Backport of r1203400 from trunk.

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

s/insure/ensure/

Backport of r1237407 from trunk.

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

configure: Move the --with-included-apr check so that srcdir!=builddir builds
aren't broken by it.

Backport of r1232838 from trunk.

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

Merge r1236350 from trunk:

https also needs QS

Reviewed/backported by: jim

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

Restore attribution

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

Add reference to CVE-2012-0021, quoting the 2.3.x version in which
the problem was introduced.

(following r1235875 which DidTRT for 2.2.x/CHANGES)

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

Update xforms

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

Some doc updates

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

Merge r1234876:
Document how Include should behave. The present inconsistencies are now subject
of PR 52505 instead.

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

Merge r1234848 from trunk:

* server/core_filters.c (ap_core_output_filter): Don't read the entire
  output of a morphing bucket into RAM.

Submitted by: jorton, sf

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

SECURITY: CVE-2012-0053 (cve.mitre.org) Fix an issue in error responses that
could expose "httpOnly" cookies when no custom ErrorDocument is specified
for status code 400.

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

remove mistakenly commited patches...

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

update xforms

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

Merge r1234643:
Fix docs for Include, add docs for IncludeOptional

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

Merge r1234642:
Add a validate-xml target

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

Merge r1234574:

ctx->bytes_in is never used. Remove a useless iteration through the brigade

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

Merge r1234479:
Document the rather surprising code path on Windows

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

Merge r1234180, r1234297, r1234565:

Make APACHE_MODULE() accept an optional prerequisite module for configure.

Introduce the following configure time dependencies:
  mod_proxy_* (except proxy_html) require mod_proxy
  mod_dav_* require mod_dav
  mod_session_* require mod_session
  mod_cache_disk requires mod_cache
  mod_heartbeat requires mod_watchdog

PR: 52487

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

One more issue

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

Update copyrights for externally visible and changed code

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

These deserve their place in httpd.conf on Windows

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

- Note new issues
- Module documentation is acceptable now

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

doc change

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

Merge r1233604 from trunk:

Adjust CVE-2011-3368/CVE-2011-4317 fixes to rely solely on
core's translate-name to fail unsupported URIs.

Rewrite and proxy now decline what they don't support rather
than fail the request.

Suggested by: trawick
Implemented by: jorton
Tweaked by: wrowe

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

add entry for r1179239 (CVE-2011-3368)

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

add entry for r1209436 (CVE-2011-4317)

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

Anticipate win32+win64

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

Further win32 edits anticipating 1.0.1-final is soon

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

Merge r1232594:
Reword the paragraph about --with-included-apr to mention the -deps
tarball.

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

This is 2.4, not 2.3. And it's not a development version anymore.

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

Backport:
configure: Improve the error message when --with-included-apr is specified
but either APR or APR-Util is not included.

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

reformat CVE-2012-0031 to make consistent with other CVEs

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

Backport:
RPM: Add mod_bucketeer, mod_case_filter and mod_case_filter_in to the RPM
spec file.

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

And we are at 2.4.1-dev

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

Get ready to tag 2.4.0

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

Update xforms, add missing mod_watchdog generated files

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

Merge r1229930:

More registered media types

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

generated html and revision numbers

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

merge r1231607 from trunk

Submitted by: Daniel Shahaf

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

Merge r1231446from trunk:

Fix the request/response header error

Submitted by: INOUE Seiichiro <inoue ariel-networks.com>

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

Merge r1229099 and r1231442 from trunk:

Fix XML validation error.
Add svn:keywords LastChangedRevision

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

add compat info to CacheQuickHandler

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

connect some the dots to 'CacheQuickHandler' in the CHANGES entry.

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

Merge r1230065 from trunk (adapted to avoid MMN change):

SECURITY (CVE-2012-0031): Fix possible crash on shutdown if a child
changes the sb_type field in the scoreboard.  Since unprivileged
children should not be able to affect the parent in this way, this is
treated as a Low severity security issue.

Thanks to "halfdog" <me halfdog.net> for reporting this issue.

* server/scoreboard.c (ap_cleanup_scoreboard, ap_create_scoreboard):
  Use a static global to store an authoritative copy of the scoreboard
  type.

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

xforms

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

Backport documentation updates for mod_heartbeat, mod_heartmonitor and mod_watchdog

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

Merge r1229116 from trunk:

Add <glossary> to nroff.xsl and revert r1222335(r1222355) partially.

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

Fix English Revisions.

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

Merge r1229134, r1229136:

Rename ap_func_attr_* macros to AP_FN_ATTR_*
Add macro for attribute alloc_size on newer gcc's

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

Merge r1229059 from trunk:

Sync with 2.2 branch

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

Merge r1228894 from trunk:

rewrite guesses URL or Filesystem in server context, but treats everything
as a URL in per-dir context.

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

merge r1228816 from trunk:

fix signedness issue with SSL_X509_NAME_to_string()'s maxlen argument

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

Merge r1228766 from trunk:

optimize this... Do strlen() ONLY if we need to check
for overflow.
Reviewed/backported by: jim

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

Clean up size_t abuse, part 2.  ap_malloc/calloc/realloc are explicitly
excluded from this cleanup as they must be signature identical to the
clib functions, and although the definition of size_t has been flakey,
the definition of those functions appears to be generally clean since
ANSI C.

Backports: r1228323

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

Revert a premature bit of r1228262, part of size_t corrections part 2

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

Cure size_t abuse; Backport r1227856

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

Merge r1227637, r1227642 from trunk:

restore the generic proxy workers to not being address-reusable.

The guts of mod_proxy is not really ready for the addr and host on a
proxy_conn_rec to change over time and differ from the 1 cached in the worker.

* proxy_worker->cp->addr needs to know what host/port it cached
* conn->addr and conn->hostname need to be allocated from their own subpool
  so they can be cleared as they change
* ap_proxy_determine_connection needs to be more careful about which
  addr is the TCP endpoint and what we have in either cache.
* may need to avoid updating the proxy_worker addr cache if we know
  the value is flipping.

Update the comment and checks around address/connection reusability
in mod_proxy.

The checks and comment are a vestige of 2.0.x
mod_proxy_http where the backend proxy conn was stored in
the frontend r->conn_config, but ap_proxy_determine_connection()
doesn't associate the frontend and backend conns like this.

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

xforms

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

Merge r1226603, r1226775 from trunk:

fill in the heartbeat modules' documentation.

add heartbeat to list of lb methods living in other modules.

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

s/2011/2012/g

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

Merge r1226477 from trunk:

add/enhance some hints about configuration section merging (or lack of it in
the case of mod_access_compat)
PR52406

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

Merge r1226375:
Add a bit of debug logging

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

Merge r1226339:
Avoid using C++ reserved word 'new' in arg name in header
Doc tweaks

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

merge r1225796:
Sort list of modules

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

Merge r1225795:
Display all those shiny new hooks that we have in 2.4

Add new section "Other Hooks" for those that don't fit into "Startup Hooks"
or "Request Hooks"

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

merge r1225791 from trunk:

Fix another case of #ifdef-within-a-macro (which was inadvertently
introduced a few days ago).

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

Add changes entry for r1225477

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

Merge r1225478:

Document the unfortunate side effect of converting ap_log_*error into macros
with respect to #ifdef.

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

Merge r1225476:

Don't use #ifdef inside macro calls

The behavior is undefined according to C99 6.10.3.11 and it breaks with
xlc on AIX

PR: 52394

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

Merge r1225380:

Fix segfault when trying to log a nameless valueless cookie

PR: 52256
Submitted by: Rainer Canavan <rainer-apache 7val com>

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

Merge r1225198:

Fix -DDUMP_RUN_CFG output for piped and syslog loggers

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

Merge r1225197:

Adapt loglevel of config errors during second pass

Don't use APLOG_STARTUP since at that point, the error log is already
available. This gives us timestamps if these errors happen during graceful
restart.

Use level 'emerg' as these errors are fatal.

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

merge r1225060 from trunk:

Adjust the translations to  r1223050 (Apache Tomcat link)

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

merge r1223048 from trunk:

Fix link to Apache Tomcat.

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

merge r1222930 from trunk:

add missing #ifdef in ssl_cmd_protocol_parse (should have been in r1222921)

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

update transformation

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