]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1546692 from trunk:
authorJim Jagielski <jim@apache.org>
Thu, 23 Jan 2014 14:31:36 +0000 (14:31 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 23 Jan 2014 14:31:36 +0000 (14:31 +0000)
commit7cf971441966ff8e54d4fa3ace3008cea1de74b8
treeea06e8f259c9872a34c83701230012d72072c85b
parentf20f054df08018e8d6969aa0715b456916e3de27
Merge r1546692 from trunk:

Axe dead code: It wouldn't have been needed ever since httpd 2.0.35
was released in April 2002... it was fixed in the [unreleased]
SSLeay 0.9.1b, which was the basis for the initial OpenSSL 0.9.1c
release in December 1998 (specifically, it's this change to ssl_set_pkey():
https://cvs.openssl.org/filediff?f=openssl/ssl/ssl_rsa.c&v1=1.1.1.2&v2=1.1.1.3)

Submitted by: kbrand
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560696 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/ssl/ssl_engine_init.c