svn commit: r1877548 - in /httpd/httpd/trunk: include/ap_mmn.h include/util_filter.h modules/ssl/ssl_engine_io.c server/core.h server/util_filter.c

[yl...@apache.org]

Author: ylavic
Date: Sun May 10 12:34:53 2020
New Revision: 1877548

URL: http://svn.apache.org/viewvc?rev=1877548&view=rev
Log:
util_filter: export ap_filter_adopt_brigade() since mod_ssl uses it.

Modified:
    httpd/httpd/trunk/include/ap_mmn.h
    httpd/httpd/trunk/include/util_filter.h
    httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
    httpd/httpd/trunk/server/core.h
    httpd/httpd/trunk/server/util_filter.c

Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1877548&r1=1877547&r2=1877548&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Sun May 10 12:34:53 2020
@@ -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

Modified: httpd/httpd/trunk/include/util_filter.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_filter.h?rev=1877548&r1=1877547&r2=1877548&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_filter.h (original)
+++ httpd/httpd/trunk/include/util_filter.h Sun May 10 12:34:53 2020
@@ -621,6 +621,17 @@ AP_DECLARE(apr_status_t) ap_filter_reins
                                                      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.

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=1877548&r1=1877547&r2=1877548&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Sun May 10 12:34:53 2020
@@ -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,

Modified: httpd/httpd/trunk/server/core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.h?rev=1877548&r1=1877547&r2=1877548&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.h (original)
+++ httpd/httpd/trunk/server/core.h Sun May 10 12:34:53 2020
@@ -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 */
 /** @} */
 

Modified: httpd/httpd/trunk/server/util_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_filter.c?rev=1877548&r1=1877547&r2=1877548&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_filter.c (original)
+++ httpd/httpd/trunk/server/util_filter.c Sun May 10 12:34:53 2020
@@ -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_setas
     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;