MFH: Show the library version currently loaded as well as the version the extension...

diff --git a/NEWS b/NEWS
index 2b8a3267a3e6fa508a8a1f4363ac043650a9d802..fe5401fffbc2d79c5568abe850bdf35382c918c3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Changed error level E_ERROR into E_WARNING in Soap extension methods 
   parameter validation. (Felipe)
 
+- Changed openssl info to show the shared library version number. (Scott)
+
 - Fixed bug causing the algorithm parameter of mhash() to be modified. (Scott)
 
 - Fixed bug #46106 (Memory leaks when using global statement). (Dmitry)

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index fff19cee5d04be5e28d978d396b79cd6c13763ec..2dc2be7748b12efe9f75940c03955f7aaa4bff8c 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1092,7 +1092,8 @@ PHP_MINFO_FUNCTION(openssl)
 {
        php_info_print_table_start();
        php_info_print_table_row(2, "OpenSSL support", "enabled");
-       php_info_print_table_row(2, "OpenSSL Version", OPENSSL_VERSION_TEXT);
+       php_info_print_table_row(2, "OpenSSL Library Version", SSLeay_version(SSLEAY_VERSION));
+       php_info_print_table_row(2, "OpenSSL Header Version", OPENSSL_VERSION_TEXT);
        php_info_print_table_end();
 }
 /* }}} */