summaryrefslogtreecommitdiff
path: root/ext/openssl/openssl.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/openssl/openssl.c')
-rw-r--r--ext/openssl/openssl.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 3d8665b623..091b14ff77 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -135,7 +135,7 @@ zend_module_entry openssl_module_entry = {
"openssl",
openssl_functions,
PHP_MINIT(openssl),
- NULL,
+ PHP_MSHUTDOWN(openssl),
NULL,
NULL,
PHP_MINFO(openssl),
@@ -1675,6 +1675,12 @@ PHP_FUNCTION(openssl_csr_new)
}
}
}
+ else {
+ if (!we_made_the_key) {
+ /* if we have not made the key we are not supposed to zap it by calling dispose! */
+ req.priv_key = NULL;
+ }
+ }
}
}
}