You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by td...@apache.org on 2023/04/25 03:03:10 UTC
svn commit: r1909388 - /httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
Author: tdonovan
Date: Tue Apr 25 03:03:10 2023
New Revision: 1909388
URL: http://svn.apache.org/viewvc?rev=1909388&view=rev
Log:
Definition of core_filter_ctx is still needed with httpd-2.4.x before 2.4.50
(i.e. before r1890245 - mmn 20120211.107)
mod-ftp should build for all 2.4 versions now.
Tested with 2.4.17, 2.4.49, and 2.4.57
Modified:
httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c?rev=1909388&r1=1909387&r2=1909388&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Tue Apr 25 03:03:10 2023
@@ -33,7 +33,16 @@ APLOG_USE_MODULE(ftp);
/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
#define remote_ip client_ip
-#endif
+/* In httpd 2.4, now internal to server/core_filters.c, but we interceed */
+#if AP_MODULE_MAGIC_AT_LEAST(20120211,107)
+/* After 20120211.107 (r1890245) this is already in http_core.h */
+#else
+struct core_filter_ctx {
+ apr_bucket_brigade *b;
+ apr_bucket_brigade *tmpbb;
+};
+#endif /* after 20111130.0 */
+#endif /* before 20120211.107 */
/*
* ftp_reset_dataconn: Close any data channel listen/connect socket and