diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-11-05 22:02:15 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-11-05 22:02:15 +0000 |
| commit | 82814fc852d0a67529796d6f4923cc51a3b2e80c (patch) | |
| tree | be4d453c3200064bbf99c50a3a9a43390e596f58 | |
| parent | 2556b354b39ee31dfe81e4adf07e56eeb7c9a280 (diff) | |
| download | php-git-82814fc852d0a67529796d6f4923cc51a3b2e80c.tar.gz | |
Fixed bug #31971 (ftp_login fails on some SSL servers).
Patch by: frantisek at augusztin dot com
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/ftp/ftp.c | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -10,6 +10,8 @@ PHP NEWS - 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) diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 38d972c48d..563570cda4 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -280,7 +280,9 @@ ftp_login(ftpbuf_t *ftp, const char *user, const char *pass TSRMLS_DC) 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 @@ data_accepted: 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"); |