From: Yann Ylavic <ylavic@apache.org>
Date: Sun, 10 May 2020 12:34:53 +0000 (+0000)
Subject: util_filter: export ap_filter_adopt_brigade() since mod_ssl uses it.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1457
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c6b925a2a88b4f286a8980d24ce5a843fa9e8e4;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 1271ce18ed6..7e5a1f902b3 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 5b30995d16a..34264d71da9 100644
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -620,6 +620,17 @@ AP_DECLARE(apr_status_t) ap_filter_reinstate_brigade(ap_filter_t *f,
                                                      apr_bucket_brigade *bb,
                                                      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
diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 91aebb20292..4bcf5e9dec4 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -30,7 +30,6 @@
 #include "ssl_private.h"
 #include "mod_ssl.h"
 #include "mod_ssl_openssl.h"
-#include "core.h"
 #include "apr_date.h"
 
 APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ssl, SSL, int, proxy_post_handshake,
diff --git a/server/core.h b/server/core.h
index 2c4ba6e3c2d..244606ec736 100644
--- a/server/core.h
+++ b/server/core.h
@@ -33,16 +33,6 @@ typedef struct conn_config_t {
     apr_socket_t *socket;
 } conn_config_t;
 
-/**
- * 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.
- */
-void ap_filter_adopt_brigade(ap_filter_t *f, apr_bucket_brigade *bb);
-
 #endif /* CORE_H */
 /** @} */
 
diff --git a/server/util_filter.c b/server/util_filter.c
index 21a3c367d40..b71dcdf1adb 100644
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -26,7 +26,6 @@
 #include "http_log.h"
 #include "http_request.h"
 #include "util_filter.h"
-#include "core.h"
 
 /* NOTE: Apache's current design doesn't allow a pool to be passed thru,
    so we depend on a global to hold the correct pool
@@ -1036,7 +1035,8 @@ AP_DECLARE(apr_status_t) ap_filter_setaside_brigade(ap_filter_t *f,
     return rv;
 }
 
-void ap_filter_adopt_brigade(ap_filter_t *f, apr_bucket_brigade *bb)
+AP_DECLARE(void) ap_filter_adopt_brigade(ap_filter_t *f,
+                                         apr_bucket_brigade *bb)
 {
     struct ap_filter_private *fp = f->priv;