archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Fix compilation of ftp without openssl
This commit is contained in:
Ilija Tovilo 2023-12-05 11:56:15 +01:00
commit b4b157edab
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/ftp/ftp.c
View file

@ -167,9 +167,11 @@ ftp_close(ftpbuf_t *ftp)
if (ftp == NULL) { if (ftp == NULL) {
return NULL; return NULL;
} }
#ifdef HAVE_FTP_SSL
if (ftp->last_ssl_session) { if (ftp->last_ssl_session) {
SSL_SESSION_free(ftp->last_ssl_session); SSL_SESSION_free(ftp->last_ssl_session);
} }
#endif
if (ftp->data) { if (ftp->data) {
data_close(ftp, ftp->data); data_close(ftp, ftp->data);
} }
@ -232,6 +234,7 @@ ftp_quit(ftpbuf_t *ftp)
} }
/* }}} */ /* }}} */
#ifdef HAVE_FTP_SSL
static int ftp_ssl_new_session_cb(SSL *ssl, SSL_SESSION *sess) static int ftp_ssl_new_session_cb(SSL *ssl, SSL_SESSION *sess)
{ {
ftpbuf_t *ftp = SSL_get_app_data(ssl); ftpbuf_t *ftp = SSL_get_app_data(ssl);
@ -245,6 +248,7 @@ static int ftp_ssl_new_session_cb(SSL *ssl, SSL_SESSION *sess)
/* Return 0 as we are not using OpenSSL's session cache. */ /* Return 0 as we are not using OpenSSL's session cache. */
return 0; return 0;
} }
#endif
/* {{{ ftp_login */ /* {{{ ftp_login */
int int