Merge r1209601:

Fix segfault with Solaris LDAP SDK when enabling ldaps.

Enable SSL by passing secure=1 to apr_ldap_init instead of calling
apr_ldap_set_option(... APR_LDAP_OPT_TLS ...).

This change carefully avoids any change of behavior on non-Solaris LDAP SDKs.

PR: 42682

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

Clarify the crypto notice for mod_session_crypto.

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

Update the crypto notices for apr_crypto. apr_ssl is long gone.

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

Backport:
mod_session_crypto: Fix a pool lifetime problem when reading from
SessionCryptoPassphraseFile.

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

Merge r1209417 from trunk:

* server/listen.c (open_listeners): Fix logic error caught by
  Coverity; possible NULL pointer deref at startup with a
  particular (and unlikely) listener/system config.

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

Merge r1209432 from trunk:

Fix for additional cases of URL rewriting with ProxyPassMatch or
RewriteRule, where particular request-URIs could result in undesired
backend network exposure in some configurations. (CVE-2011-4317)

Thanks to Prutha Parikh from Qualys for reporting this issue.

* modules/proxy/mod_proxy.c (proxy_trans): Decline to handle the "*"
  request-URI.  Fail for cases where r->uri does not begin with a "/".

* modules/mappers/mod_rewrite.c (hook_uri2file): Likewise.

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

Backport r1209330 from trunk
Bring Windows httpd.conf up to date with documented or required modules

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

Update transformations.

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

Changes to v2.4 APIs.

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

Remove some stray @ characters.

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

Update transformations.

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

Backport:
mod_rewrite: Add the AllowNoSlash RewriteOption, which makes it possible
for RewriteRules to be placed in .htaccess files that match the directory
with no trailing slash. PR 48304.

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

Wish came true: CacheEnable works within LocationMatch, giving us mod_cache
regexes for no additional cost.

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

Merge r1208897 from trunk:

Use 2 sep hashing functions to account for collisions...
Safe enough
Reviewed/backported by: jim

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

Merge r1208835:
Remove some getpid() logging, this is now also included in the error log format.

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

Backport:
mod_cache: Apply the API change that allows future mod_cache providers to
invalidate cache entries, which will fix PR15868.

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

Merge r1208816:
Remove some more now redundant log prefixes

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

Backport:
Clarify the peer IP of the connection and the client IP of the request within
the docs.

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

RPM: Make it possible to build mod_socache_dc against distcache.

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

Added missing proxy import to Netware build.

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

Fixed compilation for non-*nix platforms.

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

Backport:
mod_session_crypto: Add a SessionCryptoPassphraseFile directive so that the
administrator can hide the keys from the configuration.

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

Merge r1208411 from trunk:

use a style sheet... ideally we would pull one off the filesystem,
but for now...
Reviewed/backported by: jim

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

mod_cache: Revert http://svn.apache.org/viewvc?view=revision&revision=1070179
as per the following thread:
http://www.gossamer-threads.com/lists/apache/dev/395830?do=post_view_threaded#395830

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

Backport:
Introduce a per request version of the remote IP address, which can be
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).
Introduce a per connection "peer_ip" and a per request "client_ip" to
distinguish between the raw IP address of the connection and the effective
IP address of the request.

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

Remove stray svn:mergeinfo properties, leaving the svn:mergeinfo at the
root of the project as the canonical mergeinfo property. Missed another one.

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

Remove stray svn:mergeinfo properties, leaving the svn:mergeinfo at the
root of the project as the canonical mergeinfo property. Missed one.

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

Remove stray svn:mergeinfo properties, leaving the svn:mergeinfo at the
root of the project as the canonical mergeinfo property.

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

RPM backport:
- Build shared mpms instead of static, reduce the RPM to a simple one
pass build of the server into a single binary and modules.
- Create a dedicated generic RPM layout, ensuring that all example
config files have the correct paths embedded within them.

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

Merge r1208110:
Remove more log message prefixes that are now redundant as the
the error log format includes the module name.

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

Backport:
mod_dbd: The dbd_prepared_init() function reported the result of the last
prepared statement, obscuring earlier errors. Fixed.

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

Merge r1208067, r1208068, r1208069 from trunk:

whitespace

Some optimization... we have a hash, use it. Quicker than all
these string comparisons.

Ensure casing doesn't matter... (we know balancer->s->name is
lc)
Reviewed/backported by: jim

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

Merge r1207926 from trunk:

Logic which makes the balancer "active" or not... so we can turn them
off and on as needed.
Reviewed/backported by: jim

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

Merge r1207863 from trunk:

Instead of running thru all kinds of logic paths, just add in
a on/off bit... No need for other balancer statuses(sp)?
Reviewed/backported by: jim

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

RPM: The default httpd mpm is now worker instead of prefork.

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

Merge r1207582 from trunk:

Expose the path that the balancer handles...
Reviewed/backported by: jim

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

Merge r1207562 from trunk:

Pull this out as a sep function to allow for full vhosting
adjustment between get and define balancers...
Reviewed/backported by: jim

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

Merge r1207467 from trunk:

"Final" (I hope) proxy struct/API changes in order to support
dynamic balancer allocation AND dynamic vhost-balancers
Reviewed/backported by: jim

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

Merge r1207282 from trunk:

Error-check.
Reviewed/backported by: jim

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

Merge r1206827:
Fix some warn_unused_result compiler warnings by checking the return code of
chown and logging an error if the error was not ENOENT.

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

Made PR 52252 out of the luajit problem

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

Merge r1206787 from trunk:

thx sf
Reviewed/backported by: jim

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

Merge r1206680, r1206681, r1206682 from trunk:

Replace unusable/fringe absolute path example for AddDescription and list
some weird AddDescription semantics related to directories.

mention IndexIgnore limitation in DirectoryMatch and friends as currently
documented only in bugzilla (PR51471)

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

Backport from trunk:
Remove unused variables.

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

Backport from trunk:
Remove unused variable.

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

Merge r1206286 from trunk:

Move useful and shared balancer stuff to the shm slot...
Provide hooks for post-config/runtime addition of
balancers.
Reviewed/backported by: jim

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

Merge r1206268 from trunk:

Allow compile time changes of field sizes and be more
"clear" regarding the diff between balancer and worker slots...
Reviewed/backported by: jim

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

Merge r1206159 from trunk:

Comment reason for NULL parameter
Reviewed/backported by: jim

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

Merge r1205894 from trunk:

Use varargs...
Reviewed/backported by: jim

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

update xforms

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

backport r1205885
Pr#52239: clarify Event MPM's behaviour with strictly
synchronous libraries.

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

userland change

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

Merge r1203634, r1204614, r1205564:
Pass ap_errorlog_info to error_log hook

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

Merge r1205568 from trunk, add util_regex.c to MPM

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

Merge r1205560 from trunk:

mod_ratelimit has an output filter, not a handler.  Also took a quick
pass through the other text.

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

xforms

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

Merge r1205550:

The expression parser is not only a developer change.
Mention reduced memory usage.

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

Merge r1205542:

Make it more explicit that mod_lua may change in 2.4.x

And another blocker is gone.

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

By consensous on the list, mod_request will stay at least for 2.4.x

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

Merge r1205468 from trunk:

specify limited context list for ModemStandard

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

Merge r1205423 from trunk:

Use ap_pass_brigade_fchk()
Reviewed/backported by: jim

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

Merge r1205419 from trunk:

Add ap_pass_brigade_fchk() which does a Filter CHecK on the
brigade pass.
Reviewed/backported by: jim

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

rebuild transforms

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

backport r1205379.
mod_session: document overrides.

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

Merge r1205274 from trunk:

mod_negotiation: don't return non-AP_FILTER_ERROR filter return values
to ap_run_handler() when sending a body directly from a type-map.

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

Add some known issues / maybe-blockers

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

Clarify why it matters.

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

Further thoughts.

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

garbage C's in server-status and extra processes with async lingering close.
backport r1203708 from trunk.

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

Clarify my thoughts on mod_remoteip.

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

Merge r1204998 from trunk:

Hello. Let's compile again.
Reviewed/backported by: jim

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

Cleanup and fix STATUS for 2.4.x, add some
generic comments mostly taken over from 2.2.x.

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

Merge r1204104, 1204180:

Remove MPM-private stuff from conn_state_t.

This should make it easier to improve the event MPM in 2.4 without breaking
the API.

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

Merge r1204087, 1204090:

Limit recursion in ap_expr evaluation to avoid unbounded stack usage
* evaluate chains of ||, &&, and string concatenation non-recursively
* limit other types of recursion to 20 levels
* avoid some string copies if concatenating more than 2 strings

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

backport r1204630:
Downgrade some more error messages about broken client behavior to level
info.

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

Backport:
mod_cache_disk: Make sure we check return codes on all writes and attempts
to close, and clean up after ourselves in these cases. PR43589.

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

Backport r1204595:
Fix logic when to call error_log hook

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

Merge r1204555 from trunk:

value never used: dead assignment
Reviewed/backported by: jim

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

Merge r1204556 from trunk:

check return status
Reviewed/backported by: jim

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

Merge r1204553 from trunk:

Never used.
Reviewed/backported by: jim

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

rollback recent autoindex changes (1204355:1204306)

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

Merge r1204341 from trunk:

PR51471: IndexIgnore doesn't work in DirectoryMatch.

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

missed in 1204319

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

Merge r1204317 from trunk:

upgrading/compat notes on some unexpected AddDescription behavior

also: mention in CHANGES

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

Merge r1204307 from trunk:

PR39923: Allow AddDescription to work with absolute filesystem paths,
by not adding "*/" to their prefix (intended for relative paths)

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

Backport:
mod_include: The SSIAccessEnable directive existed to ensure the addition
of the "-A" syntax would not break existing configurations in v2.2. Remove
the directive for v2.4, defaulting the behaviour to enabled.

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

Backport:
mod_cache_disk: Remove the unnecessary intermediate brigade while
writing to disk. Fixes a problem where mod_disk_cache was leaving
buckets in the intermediate brigade and not passing them to out on
exit.

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

backport r1203924 from trunk

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

Backport r1203878:
More ap_log_rerror() usage and axe some more AJP: prefixes

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

Backport r1203868:

Log fatal errors at level CRIT, not at some random level from DEBUG to EMERG

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

Style fixes, no functional change.

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

Backport r1203859:
great proxy logging cleanup:

  * remove "proxy:", "FCGI", etc. prefixes and pid which are now
    included in the error log format

  * propagate frontend request's logconfig to backend request

  * use ap_log_rerror where possible

  * remove obsolete APLOG_NOERRNO

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

update transformations

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

merge r1203752 from trunk:

Change the SSLCipherSuite default to a shorter, whitelist
oriented definition, and add an example for a speed-optimized
configuration (commented out by default).

In the SSL How-To, streamline the SSLCipherSuite examples where
applicable (explicitly banning EXP and NULL is not needed when
only HIGH is specified).

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

r1203331 from trunk:

 s/WATCHODG/WATCHDOG/

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

r1203632 from trunk:

remove lingering reslist cruft

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

merge r1203491 from trunk:

drop SSLv2 support (set SSL_OP_NO_SSLv2 for any new SSL_CTX)

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

Backport r1202886:
Avoid one apr_time_now() call in the fast path

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

Add mod_data project ffile missing in r1202055

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

Merge r1202456:
add new ldap features, make ap_expr entry more verbose

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