From: foobar <sniper@php.net>
Date: Fri, 28 Feb 2003 07:25:15 +0000 (+0000)
Subject: - No need to include the ssl headers elsewhere but in ext/openssl
X-Git-Tag: RELEASE_0_5~694
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08b5f6b2b90962285d273bf9e896446f43e67784;p=php

- 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 233c832508..8ceb938c7d 100644
--- 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 094b950ba6..b5a5711da3 100644
--- 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 b22d1f0b5e..4e9a0ac11a 100644
--- 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 57dc41f96c..f3870d2aa1 100644
--- 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