diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2017-02-17 18:32:26 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2017-02-17 18:32:26 +0100 |
| commit | 08e986a8aa250a2e2ba42813e58c69deb8e30f51 (patch) | |
| tree | dd27bc408dec11737409397aac3ba3e36c60b8a8 /modules/ssl/ssl_engine_init.c | |
| parent | Revert r1783310 'Preserve OpenSSL 1.0.2 compatibility, following up on r1783305' (diff) | |
| download | apache2-08e986a8aa250a2e2ba42813e58c69deb8e30f51.tar.xz apache2-08e986a8aa250a2e2ba42813e58c69deb8e30f51.zip | |
Revert it part r1783317, 'avoid _free()ing NULL references.'
OpenSSL team is committed to preserving safe _free(NULL) behaviors, and the
overhead of these calls in the context setup path is inconsequential.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783434 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | modules/ssl/ssl_engine_init.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index b4e74c3102..d6248c5b06 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -1334,10 +1334,8 @@ static apr_status_t ssl_init_server_certs(server_rec *s, #endif } #endif - if (eckey) - EC_KEY_free(eckey); - if (ecparams) - EC_GROUP_free(ecparams); + EC_KEY_free(eckey); + EC_GROUP_free(ecparams); #endif return APR_SUCCESS; |