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

merge r1222921 from trunk:

SSLProtocol: allow explicit control of TLSv1.1 and TLSv1.2 flavors when
compiled against OpenSSL 1.0.1 or later. Update documentation.

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

merge r1222917 from trunk:

Set OPENSSL_NO_SSL_INTERN when compiling against OpenSSL 1.0.1
or later, so that mod_ssl retains binary compatibility with future
versions when internal structures are changed. Use API functions
where available, and fall back to direct access for OpenSSL up
to 1.0.0, where needed.

Remove SSL_make_ciphersuite() from ssl_util_ssl.[ch], as it was
never used by any released version of mod_ssl.

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

merge r1222915 from trunk:

REMOTE_ADDR is now r->useragent_ip, which is not/never available at
SSL_CB_HANDSHAKE_DONE time. ap_log_cerror() already logs c->client_ip
for us, however, so we can simply drop REMOTE_ADDR from the message.

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

Backport:
mod_mime: Don't arbitrarily bypass AddOutputFilter during a ProxyPass,
but then allow AddOutputFilter during a RewriteRule [P]. Make mod_mime
behave identically in both cases. PR52342.

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

Update transformations.

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

Backport:
Clarify how the filters are merged when defined using the AddOuputFilter
directive.

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

Update transformations.

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

Build the man page for httxt2dbm.

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

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

Backport:
Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
corresponding man pages.

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

Some cosmetic NetWare makefile tweaks.

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

Backport:
Distinguish properly between the bindir and sbindir directories when
installing binaries. Previously all binaries were silently installed to
sbindir, whether they were system administration commands or not.

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

Backport:
Fix warning: variable 'rv' set but not used.

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

Backport:
RPM: Remove fiddling with installbuilddir, this is correct by default
through the use of config.layout.

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

Update transformations.

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

Clarify which tarballs we are talking about.

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

Backport.
Add further explanation on RPM packaging.

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

Add further explanation on RPM packaging.

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

Update transformations.

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

Backport:
Document the RPM platform.

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

Various code cleanup to avoid compiler, cppcheck, or clang warnings:

modules/filters/mod_charset_lite.c: Remove dead assignments

modules/filters/mod_include.c: likewise

modules/metadata/mod_usertrack.c: likewise

modules/proxy/mod_proxy_ftp.c: likewise

modules/ssl/ssl_engine_pphrase.c: likewise

modules/proxy/mod_proxy_balancer.c: likewise;
                                    Remove NULL check that can never happen

modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it
                            would, it would just mask another bug

os/unix/unixd.c: likewise

modules/http/http_filters.c: Remove sub-condition that is always true

modules/lua/mod_lua.c: Add default cases to switch statements

modules/generators/mod_autoindex.c: Unsigned value can never be < 0

server/util_expr_eval.c: Fix compiler warnings with VC and on OS2

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

Merge r1220467:
Avoid segfault if url->hostname is NULL and filter->hostname is "*" or ".".
Found by clang.

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

Merge r1220462:
remove some dead code
found by clang statical analyzer

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

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

update transformations.

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

New Turkish translation

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan berent <berent belgeler.org>

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

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

update translation

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

And we are back to 2.4.0-dev

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

Get ready to tag 2.3.16-beta

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

Backport r1214296...
Allow AP_SERVER_ADD_STRING to be more "easily" changed

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

Update transformations.

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

Backport:
Further clarify the naming of the entity that originates the request by
calling that entity a useragent instead of a client.
Further clarify the naming of the entity that directly connects to us by
calling that entity a client instead of a peer.

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

Merge r1213567:
Explicitly cast function pointer, to remove 'const'.
Hopefully this makes the NetWare compiler happy.

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

update xforms

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

remove unused var

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

Merge r1210261 from trunk:

mod_slotmem_shm: Remove the colon syntax to indicate a relative path, and
make the relative path default behaviour. Remove the word "anonymous" as
a filename for special treatment, what used to be "anonymous" is now "none".

Submitted by: minfrin
Reviewed/backported by: jim

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

backport r1213399 from trunk:

logging adjustments:
- consistently call ssl_log_ssl_error after ap_log_error etc.
- ssl_init_ConfigureServer: add vhost_id to log message

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

backport r1213380 from trunk:

Streamline TLS session ticket key handling (added in r1200040):
- drop the SSLTicketKeyDefault directive, and only support a single
  ticket key per server/vhost
- rename the SSLTicketKeyFile directive to SSLSessionTicketKeyFile,
  remove the keyname parameter
- move ticket key parameters from SSLSrvConfigRec to modssl_ctx_t
- configure the tlsext_ticket_key_cb only when in server mode
- add documentation for SSLSessionTicketKeyFile

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

Merge r1213338:
Limit length of lines in .htaccess to 8K again, to reduce DoS potential.
Make ap_varbuf_cfg_getline() strictly enforce the max_len parameter.

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

Merge r1212883:
Fix names of unary operators like '-s' being compared case insensitively.
Improve error message if op or function is not found. Document '-s' operator.

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

Typo correction.

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

RPM: Update the spec file to require at least apr-util v1.4.x.

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

Merge r1211680:

Various fixes for log message tags:

- Remove tags in ssl_log_ssl_error() and ssl_log_cert_error()
- Instead add tags to various ssl_log_xerror, ssl_log_cxerror
  calls (ssl_log_rxerror is unused).
- likewise for modssl_proxy_info_log()

- Fix spelling of APLOG_NOERRNO in coccinelle script
- add support for ssl_log_*error and ap_log_cserror

- add some more tags missing due to APLOG_NOERRNO spelling error

- Remove tags from example modules (we don't want people to blindly copy
  those)

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

Merge r1211663:
Remove usage of APLOG_NOERRNO. It has been a no-op since at least 2.0.x

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