You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2005/10/12 22:43:29 UTC
svn commit: r315041 - in /httpd/httpd/trunk: include/util_filter.h
server/util_filter.c
Author: niq
Date: Wed Oct 12 13:43:25 2005
New Revision: 315041
URL: http://svn.apache.org/viewcvs?rev=315041&view=rev
Log:
Make ap_register_output_filter back into a function (*sigh*)
but update its API doc
Modified:
httpd/httpd/trunk/include/util_filter.h
httpd/httpd/trunk/server/util_filter.c
Modified: httpd/httpd/trunk/include/util_filter.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/util_filter.h?rev=315041&r1=315040&r2=315041&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_filter.h (original)
+++ httpd/httpd/trunk/include/util_filter.h Wed Oct 12 13:43:25 2005
@@ -328,30 +328,22 @@
ap_init_filter_func filter_init,
ap_filter_type ftype);
-/**
- * This function is used to register an output filter with the system.
- * After this registration is performed, then a filter may be added
- * into the filter chain by using ap_add_output_filter() and simply
- * specifying the name. It may also be used as a provider under mod_filter.
- * This is (equivalent to) ap_register_output_filter_protocol with
- * proto_flags=0, and is retained for back-compatibility with 2.0 modules.
- *
- * @param name The name to attach to the filter function
- * @param filter_func The filter function to name
- * @param filter_init The function to call before the filter handlers
- * are invoked
- * @param ftype The type of filter function, either ::AP_FTYPE_CONTENT or
- * ::AP_FTYPE_CONNECTION
- * @see ap_add_output_filter()
- */
+/** @deprecated @see ap_register_output_filter_protocol */
+AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter(const char *name,
+ ap_out_filter_func filter_func,
+ ap_init_filter_func filter_init,
+ ap_filter_type ftype);
+
+/* For httpd-?.? I suggest replacing the above with
#define ap_register_output_filter(name,ffunc,init,ftype) \
ap_register_output_filter_protocol(name,ffunc,init,ftype,0)
+*/
/**
* This function is used to register an output filter with the system.
* After this registration is performed, then a filter may be added
- * into the filter chain by using ap_add_output_filter() and simply
- * specifying the name. It may also be used as a provider under mod_filter.
+ * directly to the filter chain by using ap_add_output_filter() and
+ * simply specifying the name, or as a provider under mod_filter.
*
* @param name The name to attach to the filter function
* @param filter_func The filter function to name
@@ -360,6 +352,7 @@
* @param ftype The type of filter function, either ::AP_FTYPE_CONTENT or
* ::AP_FTYPE_CONNECTION
* @param proto_flags Protocol flags: logical OR of AP_FILTER_PROTO_* bits
+ * @return the filter rec
* @see ap_add_output_filter()
*/
AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter_protocol(
Modified: httpd/httpd/trunk/server/util_filter.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/util_filter.c?rev=315041&r1=315040&r2=315041&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_filter.c (original)
+++ httpd/httpd/trunk/server/util_filter.c Wed Oct 12 13:43:25 2005
@@ -248,6 +248,15 @@
®istered_input_filters);
}
+AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter(const char *name,
+ ap_out_filter_func filter_func,
+ ap_init_filter_func filter_init,
+ ap_filter_type ftype)
+{
+ return ap_register_output_filter_protocol(name, filter_func,
+ filter_init, ftype, 0);
+}
+
AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter_protocol(
const char *name,
ap_out_filter_func filter_func,