summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/ap_mmn.h6
-rw-r--r--modules/proxy/mod_proxy.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 67f3637448..33cd91e5a7 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -696,15 +696,17 @@
* 20210926.1 (2.5.1-dev) Add ap_unescape_url_ex() and deprecate
* AP_NORMALIZE_DROP_PARAMETERS
* 20210926.2 (2.5.1-dev) Add ap_post_read_request()
+ * 20211221.0 (2.5.1-dev) Bump PROXY_WORKER_MAX_NAME_SIZE from 256 to 384,
+ * add PROXY_WORKER_UDS_PATH_SIZE.
*
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20210926
+#define MODULE_MAGIC_NUMBER_MAJOR 20211221
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 9ba736d01f..2eac740dac 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -369,12 +369,13 @@ PROXY_WORKER_HC_FAIL )
#define PROXY_WORKER_MAX_SCHEME_SIZE 16
#define PROXY_WORKER_MAX_ROUTE_SIZE 96
#define PROXY_BALANCER_MAX_ROUTE_SIZE 64
-#define PROXY_WORKER_MAX_NAME_SIZE 256
+#define PROXY_WORKER_MAX_NAME_SIZE 384
#define PROXY_BALANCER_MAX_NAME_SIZE 64
#define PROXY_WORKER_MAX_HOSTNAME_SIZE 96
#define PROXY_BALANCER_MAX_HOSTNAME_SIZE 64
#define PROXY_BALANCER_MAX_STICKY_SIZE 64
#define PROXY_WORKER_MAX_SECRET_SIZE 64
+#define PROXY_WORKER_UDS_PATH_SIZE 256
#define PROXY_RFC1035_HOSTNAME_SIZE 256
@@ -417,7 +418,7 @@ typedef struct {
char route[PROXY_WORKER_MAX_ROUTE_SIZE]; /* balancing route */
char redirect[PROXY_WORKER_MAX_ROUTE_SIZE]; /* temporary balancing redirection route */
char flusher[PROXY_WORKER_MAX_SCHEME_SIZE]; /* flush provider used by mod_proxy_fdpass */
- char uds_path[PROXY_WORKER_MAX_NAME_SIZE]; /* path to worker's unix domain socket if applicable */
+ char uds_path[PROXY_WORKER_UDS_PATH_SIZE]; /* path to worker's unix domain socket if applicable */
char hcuri[PROXY_WORKER_MAX_ROUTE_SIZE]; /* health check uri */
char hcexpr[PROXY_WORKER_MAX_SCHEME_SIZE]; /* name of condition expr for health check */
char secret[PROXY_WORKER_MAX_SECRET_SIZE]; /* authentication secret (e.g. AJP13) */