diff options
| author | Yann Ylavic <ylavic@apache.org> | 2020-05-10 12:34:53 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2020-05-10 12:34:53 +0000 |
| commit | 3c6b925a2a88b4f286a8980d24ce5a843fa9e8e4 (patch) | |
| tree | 1ce922df49656b1bef1ca1698210fcca7ce97d3d /include | |
| parent | d3e1e9a3cf937afbb9140f9a86dcc82925299fcc (diff) | |
| download | httpd-3c6b925a2a88b4f286a8980d24ce5a843fa9e8e4.tar.gz | |
util_filter: export ap_filter_adopt_brigade() since mod_ssl uses it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877548 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/util_filter.h | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 1271ce18ed..7e5a1f902b 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -629,6 +629,7 @@ * 20200331.3 (2.5.1-dev) Add ap_parse_request_line() and * ap_check_request_header() * 20200420.0 (2.5.1-dev) Add flags to listen_rec in place of use_specific_errors + * 20200420.1 (2.5.1-dev) Add ap_filter_adopt_brigade() */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -636,7 +637,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20200420 #endif -#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/util_filter.h b/include/util_filter.h index 5b30995d16..34264d71da 100644 --- a/include/util_filter.h +++ b/include/util_filter.h @@ -621,6 +621,17 @@ AP_DECLARE(apr_status_t) ap_filter_reinstate_brigade(ap_filter_t *f, apr_bucket **flush_upto); /** + * Adopt a bucket brigade as is (no setaside nor copy). + * @param f The current filter + * @param bb The bucket brigade adopted. This brigade is always empty + * on return + * @remark All buckets in bb should be allocated on f->c->pool and + * f->c->bucket_alloc. + */ +AP_DECLARE(void) ap_filter_adopt_brigade(ap_filter_t *f, + apr_bucket_brigade *bb); + +/** * This function calculates whether there are any as yet unsent * buffered brigades in downstream filters, and returns non zero * if so. |