iliaa Sat Nov 5 17:02:15 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/ftp ftp.c
Log:
Fixed bug #31971 (ftp_login fails on some SSL servers).
Patch by: frantisek at augusztin dot com
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.176&r2=1.2027.2.177&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.176 php-src/NEWS:1.2027.2.177
--- php-src/NEWS:1.2027.2.176 Thu Nov 3 15:41:12 2005
+++ php-src/NEWS Sat Nov 5 17:02:09 2005
@@ -10,6 +10,8 @@
- Fixed bug #35014 (array_product() always returns 0). (Ilia)
- Fixed bug #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer
parameter on Windows). (Mike)
+- Fixed bug #31971 (ftp_login fails on some SSL servers).
+ (frantisek at augusztin dot com)
28 Oct 2005, PHP 5.1 Release Candidate 4
- Fixed fgetcsv() and fputcsv() inconsistency. (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.112.2.1&r2=1.112.2.2&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.112.2.1 php-src/ext/ftp/ftp.c:1.112.2.2
--- php-src/ext/ftp/ftp.c:1.112.2.1 Thu Aug 18 08:37:35 2005
+++ php-src/ext/ftp/ftp.c Sat Nov 5 17:02:15 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.112.2.1 2005/08/18 12:37:35 sniper Exp $ */
+/* $Id: ftp.c,v 1.112.2.2 2005/11/05 22:02:15 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
