sniper Fri Feb 28 02:25:14 2003 EDT
Modified files:
/php4/ext/ftp ftp.c php_ftp.c
/php4/ext/openssl xp_ssl.c
/php4/main php_network.h
Log:
- 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.
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.80 php4/ext/ftp/ftp.c:1.81
--- php4/ext/ftp/ftp.c:1.80 Sat Feb 15 22:48:44 2003
+++ php4/ext/ftp/ftp.c Fri Feb 28 02:25:14 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.80 2003/02/16 03:48:44 wez Exp $ */
+/* $Id: ftp.c,v 1.81 2003/02/28 07:25:14 sniper Exp $ */
#include "php.h"
@@ -63,6 +63,10 @@
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
+#endif
+
+#if HAVE_OPENSSL_EXT
+#include <openssl/ssl.h>
#endif
#include "ftp.h"
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.83 php4/ext/ftp/php_ftp.c:1.84
--- php4/ext/ftp/php_ftp.c:1.83 Fri Feb 14 15:15:11 2003
+++ php4/ext/ftp/php_ftp.c Fri Feb 28 02:25:14 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.83 2003/02/14 20:15:11 iliaa Exp $ */
+/* $Id: php_ftp.c,v 1.84 2003/02/28 07:25:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -33,6 +33,10 @@
#include <sys/socket.h>
#endif
#endif
+#endif
+
+#if HAVE_OPENSSL_EXT
+#include <openssl/ssl.h>
#endif
#if HAVE_FTP
Index: php4/ext/openssl/xp_ssl.c
diff -u php4/ext/openssl/xp_ssl.c:1.2 php4/ext/openssl/xp_ssl.c:1.3
--- php4/ext/openssl/xp_ssl.c:1.2 Thu Feb 27 18:50:54 2003
+++ php4/ext/openssl/xp_ssl.c Fri Feb 28 02:25:14 2003
@@ -16,13 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_ssl.c,v 1.2 2003/02/27 23:50:54 iliaa Exp $ */
+/* $Id: xp_ssl.c,v 1.3 2003/02/28 07:25:14 sniper Exp $ */
#include "php.h"
#include "ext/standard/file.h"
#include "streams/php_streams_int.h"
#include "php_network.h"
#include "php_openssl.h"
+#include <openssl/ssl.h>
#include <openssl/err.h>
Index: php4/main/php_network.h
diff -u php4/main/php_network.h:1.40 php4/main/php_network.h:1.41
--- php4/main/php_network.h:1.40 Thu Feb 27 12:43:37 2003
+++ php4/main/php_network.h Fri Feb 28 02:25:14 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_network.h,v 1.40 2003/02/27 17:43:37 wez Exp $ */
+/* $Id: php_network.h,v 1.41 2003/02/28 07:25:14 sniper Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -74,10 +74,6 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#endif
-
-#if HAVE_OPENSSL_EXT
-#include <openssl/ssl.h>
#endif
#ifdef HAVE_STDDEF_H
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
