svn commit: r1629954 - in /httpd/mod_ftp/trunk: CHANGES-FTP modules/ftp/ftp_data_connection.c

[wr...@apache.org]

Author: wrowe
Date: Tue Oct  7 18:57:12 2014
New Revision: 1629954

URL: http://svn.apache.org/r1629954
Log:
Our input filter is a core filter, need to restore this 'hidden' declaration

Modified:
    httpd/mod_ftp/trunk/CHANGES-FTP
    httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c

Modified: httpd/mod_ftp/trunk/CHANGES-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/CHANGES-FTP?rev=1629954&r1=1629953&r2=1629954&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/CHANGES-FTP (original)
+++ httpd/mod_ftp/trunk/CHANGES-FTP Tue Oct  7 18:57:12 2014
@@ -1,5 +1,7 @@
 Changes in 1.0.1:
 
+  *) Pick up httpd 2.4 required changes for compilation. [William Rowe]
+ 
   *) Resolve a crash-bug when built against 2.2.29 and later, due to
      the addition of r->trailers_[in|out] fields.  Note the module is not
      binary compatible between 2.2.27 or earlier and 2.2.29 and later.

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=1629954&r1=1629953&r2=1629954&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Tue Oct  7 18:57:12 2014
@@ -31,9 +31,17 @@
 #include <netinet/ip.h>
 #endif
 
-/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
 #if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+
+/* In httpd 2.4, remote_ip became client_ip in the conn_rec */
 #define remote_ip client_ip
+
+/* In httpd 2.4, now internal to server/core_filters.c, but we interceed */
+struct core_filter_ctx {
+    apr_bucket_brigade *b;
+    apr_bucket_brigade *tmpbb;
+};
+
 #endif
 
 /*