- No need to include the ssl headers elsewhere but in ext/openssl

# ext/ftp doesn't use streams yet so it needs to include them.

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 233c832508d3bd9c03e4408eed8de046e5c5677b..8ceb938c7d561a9bd0c6542c9b075b9069fe4242 100644 (file)
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -65,6 +65,10 @@
 #include <sys/select.h>
 #endif
 
+#if HAVE_OPENSSL_EXT
+#include <openssl/ssl.h>
+#endif
+
 #include "ftp.h"
 #include "ext/standard/fsock.h"
 

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 094b950ba6face53e3fbf86427223d72bd500441..b5a5711da3caf27a27a5ce0cd7e4b8b1d586b743 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -35,6 +35,10 @@
 #endif
 #endif
 
+#if HAVE_OPENSSL_EXT
+#include <openssl/ssl.h>
+#endif
+
 #if HAVE_FTP
 
 #include "ext/standard/info.h"

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index b22d1f0b5e6415e9ea52c4f0f3aae6ef2a2073d0..4e9a0ac11a9e60297c166beb91ac619bf490606c 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -23,6 +23,7 @@
 #include "streams/php_streams_int.h"
 #include "php_network.h"
 #include "php_openssl.h"
+#include <openssl/ssl.h>
 #include <openssl/err.h>
 
 

diff --git a/main/php_network.h b/main/php_network.h
index 57dc41f96c884e270276b48b713a9b628b5ef658..f3870d2aa1538b132ce947e80007958e7e99bf99 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -76,10 +76,6 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize);
 #include <sys/time.h>
 #endif
 
-#if HAVE_OPENSSL_EXT
-#include <openssl/ssl.h>
-#endif
-
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
 #endif