iliaa Sat Nov 5 17:02:41 2005 EDT
Modified files:
/php-src/ext/ftp ftp.c
Log:
MFB51: Fixed bug #31971 (ftp_login fails on some SSL servers)
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.113&r2=1.114&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.113 php-src/ext/ftp/ftp.c:1.114
--- php-src/ext/ftp/ftp.c:1.113 Thu Aug 18 08:37:24 2005
+++ php-src/ext/ftp/ftp.c Sat Nov 5 17:02:40 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.113 2005/08/18 12:37:24 sniper Exp $ */
+/* $Id: ftp.c,v 1.114 2005/11/05 22:02:40 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -280,7 +280,9 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"failed to create the SSL context");
return 0;
}
-
+
+ SSL_CTX_set_options(ctx, SSL_OP_ALL);
+
ftp->ssl_handle = SSL_new(ctx);
if (ftp->ssl_handle == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"failed to create the SSL handle");
@@ -1513,7 +1515,9 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"data_accept: failed to create the SSL context");
return 0;
}
-
+
+ SSL_CTX_set_options(ctx, SSL_OP_ALL);
+
data->ssl_handle = SSL_new(ctx);
if (data->ssl_handle == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"data_accept: failed to create the SSL handle");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
