iliaa Sat Nov 5 17:03:31 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/ftp ftp.c
/php-src NEWS
Log:
MFH: Fixed bug #31971 (ftp_login fails on some SSL servers).
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.68.2.22&r2=1.68.2.22.2.1&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.22 php-src/ext/ftp/ftp.c:1.68.2.22.2.1
--- php-src/ext/ftp/ftp.c:1.68.2.22 Thu Mar 17 12:16:53 2005
+++ php-src/ext/ftp/ftp.c Sat Nov 5 17:03:27 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.68.2.22 2005/03/17 17:16:53 iliaa Exp $ */
+/* $Id: ftp.c,v 1.68.2.22.2.1 2005/11/05 22:03:27 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -262,7 +262,9 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"ftp_login: 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,
"ftp_login: failed to create the SSL handle");
@@ -1402,7 +1404,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");
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.71&r2=1.1247.2.920.2.72&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.71 php-src/NEWS:1.1247.2.920.2.72
--- php-src/NEWS:1.1247.2.920.2.71 Thu Nov 3 15:41:54 2005
+++ php-src/NEWS Sat Nov 5 17:03:28 2005
@@ -13,6 +13,8 @@
parameter on Windows). (Mike)
- Fixed bug #33760 (cURL needs CRYPTO_callback functions to prevent locking).
(Mike)
+- Fixed bug #31971 (ftp_login fails on some SSL servers).
+ (frantisek at augusztin dot com)
31 Oct 2005, Version 4.4.1
- Added missing safe_mode checks for image* functions and cURL. (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
