]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1597349,1598107,1603915,1605827,1605829 from trunk:
authorJeff Trawick <trawick@apache.org>
Sat, 12 Jul 2014 18:08:09 +0000 (18:08 +0000)
committerJeff Trawick <trawick@apache.org>
Sat, 12 Jul 2014 18:08:09 +0000 (18:08 +0000)
commit727153b8fe4ddca848bdda6c83045de3fb38f273
tree5cdaa9049b8e194cf3aadc335cb20e6796296262
parent1512acdde187baca2cbe3a5197105079050f769b
Merge r1597349,1598107,1603915,1605827,1605829 from trunk:

mod_ssl: Fix tmp DH parameter leak, adjust selection to prefer
larger keys and support up to 8192-bit keys.

Submitted by: rpluem, jorton
Reviewed by: ylavic, kbrand

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1610014 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
docs/manual/mod/mod_ssl.xml
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_kernel.c
modules/ssl/ssl_private.h