Fixed bug: #18295. e_os.h is not supposed to be included..

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 61565f60c744ac320942fca0b203228f9b74cb7a..fb42a3ce32c4e20d9afac77c710670433d485b26 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -39,7 +39,6 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/conf.h>
-#include <openssl/e_os.h>
 #include <openssl/rand.h>
 
 #define DEFAULT_KEY_LENGTH     512
@@ -576,10 +575,12 @@ PHP_MINIT_FUNCTION(openssl)
        config_filename = getenv("OPENSSL_CONF");
        if (config_filename == NULL)
                config_filename = getenv("SSLEAY_CONF");
-       if (config_filename == NULL)    {
+
+       /* default to 'openssl.cnf' if no environment variable is set */
+       if (config_filename == NULL) {
                snprintf(default_ssl_conf_filename, sizeof(default_ssl_conf_filename), "%s/%s",
                                X509_get_default_cert_area(),
-                               OPENSSL_CONF);
+                               "openssl.cnf");
        }
        else
                strncpy(default_ssl_conf_filename, config_filename, sizeof(default_ssl_conf_filename));