You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by wr...@apache.org on 2014/10/01 23:44:14 UTC

svn commit: r1628843 - /httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c

Author: wrowe
Date: Wed Oct  1 21:44:13 2014
New Revision: 1628843

URL: http://svn.apache.org/r1628843
Log:
Catch up with 2.2.29 for r->trailers[in|out] with mod_ftp

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c?rev=1628843&r1=1628842&r2=1628843&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Wed Oct  1 21:44:13 2014
@@ -456,6 +456,14 @@ request_rec *ftp_read_request(ftp_connec
     r->output_filters = r->proto_output_filters;
     r->proto_input_filters = c->input_filters;
     r->input_filters = r->proto_input_filters;
+
+#if ((MODULE_MAGIC_NUMBER_MAJOR == 20051115) \
+              && (MODULE_MAGIC_NUMBER_MINOR >= 36)) \
+       || AP_MODULE_MAGIC_AT_LEAST(20120211,37)
+    r->trailers_in = apr_table_make(r->pool, 5);
+    r->trailers_out = apr_table_make(r->pool, 5);
+#endif
+
     ap_run_create_request(r);
 
     /*