diff options
| author | Yann Ylavic <ylavic@apache.org> | 2021-09-24 10:27:16 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2021-09-24 10:27:16 +0000 |
| commit | 074d55133a2a57346af689b63deba206fbf9040e (patch) | |
| tree | 99afc9513e9ff0fe58c97628a357577a9163debf /include | |
| parent | 63da5b997fcb9b8c56d9b52851b254252105f3b6 (diff) | |
| download | httpd-074d55133a2a57346af689b63deba206fbf9040e.tar.gz | |
mod_proxy: Restore ap_proxy_transfer_between_connections().
* modules/proxy/mod_proxy.h:
Restore the interface of ap_proxy_transfer_between_connections() back to
before MMN 20210506.0.
Add ap_proxy_tunnel_conn_bytes_in() and ap_proxy_tunnel_conn_bytes_out().
New proxy_tunnel_conn_t typedef'ed from opaque struct proxy_tunnel_conn.
* modules/proxy/mod_proxy.h(ap_proxy_tunnel_conn_get_read,
ap_proxy_tunnel_conn_get_transferred):
Axed/replaced by ap_proxy_tunnel_conn_bytes_in() and
ap_proxy_tunnel_conn_bytes_out().
* modules/proxy/proxy_util.c(struct proxy_tunnel_conn):
Replace "exchanged" by "bytes_in" and "bytes_out".
* modules/proxy/proxy_util.c(proxy_transfer):
New helper implementing ap_proxy_transfer_between_connections() and
returning both &bytes_in and &bytes_out.
* modules/proxy/proxy_util.c(ap_proxy_transfer_between_connections):
Now calls proxy_transfer().
* modules/proxy/proxy_util.c(ap_proxy_tunnel_conn_bytes_in,
ap_proxy_tunnel_conn_bytes_out):
Return tc->bytes_in and tc->bytes_out respectively.
* modules/proxy/proxy_util.c(proxy_tunnel_forward):
Use proxy_transfer() which updates in->bytes_in, &out->bytes_out.
tunnel->replied will be updated in proxy_tunnel_run().
* modules/proxy/proxy_util.c(proxy_tunnel_forward):
Fall through the "done" label in any case to set tunnel->replied based
on tunnel->client->bytes_out > 0.
* modules/proxy/mod_proxy_http.c(ap_proxy_http_process_response):
Use ap_proxy_tunnel_conn_bytes_{in,out}() for worker->s->{read,transferred}
accounting.
* modules/proxy/mod_proxy_http.c(proxy_http_async_finish):
Update worker->s->{read,transferred} when async too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1893594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 0d88c3f5e5..7cc2bcb812 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -682,14 +682,23 @@ * 20210531.4 (2.5.1-dev) Add ap_create_connection * 20210531.5 (2.5.1-dev) Add ap_pre_connection * 20210531.6 (2.5.1-dev) Add proxy_tunnel_conn_t + * 20210924.0 (2.5.1-dev) Restore ap_proxy_transfer_between_connections() + * interface back to before 20210506.0 (that MAJOR bump + * cancelled), axe ap_proxy_tunnel_conn_get_read() + * and ap_proxy_tunnel_conn_get_transferred() and add + * ap_proxy_tunnel_conn_bytes_in() and + * ap_proxy_tunnel_conn_bytes_out() as replacement + * (this MAJOR bump). Overall there is no MAJOR bumb + * for 20210506.0 + 20210924.0, MINOR bump only for + * adding ap_proxy_tunnel_conn_bytes_{in,out}(). */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20210531 +#define MODULE_MAGIC_NUMBER_MAJOR 20210924 #endif -#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |