summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-11-28 11:37:43 +0000
committerfoobar <sniper@php.net>2005-11-28 11:37:43 +0000
commitd69ab24f69447fbba2cf81b5142169b40ac8811e (patch)
treedaab4757de4710643881b4bb9f6a952c206a84fd
parent13af4c9a09387c314ef3e15e7b54b139ca5c7300 (diff)
downloadphp-git-d69ab24f69447fbba2cf81b5142169b40ac8811e.tar.gz
MFH: - Fixed bug #35381 (ssl library is not initialized properly)
-rw-r--r--NEWS1
-rw-r--r--ext/openssl/openssl.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 78eaa598d2..17d3c2544b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP NEWS
- Fixed bug #35430 (PDO crashes on incorrect FETCH_FUNC use). (Tony)
- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails). (Dmitry)
+- Fixed bug #35381 (ssl library is not initialized properly). (Alan)
28 Nov 2005, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index d25ed7f5ee..2d13072082 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -584,6 +584,7 @@ PHP_MINIT_FUNCTION(openssl)
le_x509 = zend_register_list_destructors_ex(php_x509_free, NULL, "OpenSSL X.509", module_number);
le_csr = zend_register_list_destructors_ex(php_csr_free, NULL, "OpenSSL X.509 CSR", module_number);
+ SSL_library_init();
OpenSSL_add_all_ciphers();
OpenSSL_add_all_digests();
OpenSSL_add_all_algorithms();