Merge branch 'PHP-8.2' into PHP-8.3

iluuu1994 · iluuu1994 · commit b4b157edab28 · 2023-12-05T11:56:15.000+01:00
* PHP-8.2:
  Fix compilation of ftp without openssl
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -167,9 +167,11 @@ ftp_close(ftpbuf_t *ftp)
 	if (ftp == NULL) {
 		return NULL;
 	}
+#ifdef HAVE_FTP_SSL
 	if (ftp->last_ssl_session) {
 		SSL_SESSION_free(ftp->last_ssl_session);
 	}
+#endif
 	if (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)
 {
 	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;
 }
+#endif
 
 /* {{{ ftp_login */
 int

Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,11 @@ ftp_close(ftpbuf_t *ftp)`
`167`	`167`	`if (ftp == NULL) {`
`168`	`168`	`return NULL;`
`169`	`169`	`}`
	`170`	`+#ifdef HAVE_FTP_SSL`
`170`	`171`	`if (ftp->last_ssl_session) {`
`171`	`172`	`SSL_SESSION_free(ftp->last_ssl_session);`
`172`	`173`	`}`
	`174`	`+#endif`
`173`	`175`	`if (ftp->data) {`
`174`	`176`	`data_close(ftp, ftp->data);`
`175`	`177`	`}`
`@@ -232,6 +234,7 @@ ftp_quit(ftpbuf_t *ftp)`
`232`	`234`	`}`
`233`	`235`	`/* }}} */`
`234`	`236`
	`237`	`+#ifdef HAVE_FTP_SSL`
`235`	`238`	`static int ftp_ssl_new_session_cb(SSL ssl, SSL_SESSION sess)`
`236`	`239`	`{`
`237`	`240`	`ftpbuf_t *ftp = SSL_get_app_data(ssl);`
`@@ -245,6 +248,7 @@ static int ftp_ssl_new_session_cb(SSL ssl, SSL_SESSION sess)`
`245`	`248`	`/* Return 0 as we are not using OpenSSL's session cache. */`
`246`	`249`	`return 0;`
`247`	`250`	`}`
	`251`	`+#endif`
`248`	`252`
`249`	`253`	`/* {{{ ftp_login */`
`250`	`254`	`int`