Commit 655bee2c authored Sep 08, 2017 by Yann Ylavic

Merge r1802845 from trunk:

Make sure updatelbstatus() is NULL

Submitted by: jim
Reviewed by: jim, covener, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807763 13f79535-47bb-0310-9956-ffa450edef68

parent bb483a59

STATUS

+0 −5

Original line number	Diff line number	Diff line
		@@ -119,11 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
		2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk .
		+1: jfclere, jim, covener

		*) proxy: Ensure updatelbstatus() is NULL if not-implemented
		trunk patch: http://svn.apache.org/r1802845
		2.4.x patch: trunk patch works
		+1: jim, covener, ylavic

		*) mod_http2: fix for stalling when more than 32KB are written to a suspended stream
		2.4.x patch: svn merge -c 1803420,1803454,1804090 ^/httpd/httpd/trunk .
		+1: icing, steffenal, ylavic

modules/proxy/balancers/mod_lbmethod_bybusyness.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,8 @@ static const proxy_balancer_method bybusyness =
		&find_best_bybusyness,
		NULL,
		&reset,
		&age
		&age,
		NULL
		};

		static void register_hook(apr_pool_t *p)

modules/proxy/balancers/mod_lbmethod_byrequests.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,8 @@ static const proxy_balancer_method byrequests =
		&find_best_byrequests,
		NULL,
		&reset,
		&age
		&age,
		NULL
		};

		static void register_hook(apr_pool_t *p)

modules/proxy/balancers/mod_lbmethod_bytraffic.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,8 @@ static const proxy_balancer_method bytraffic =
		&find_best_bytraffic,
		NULL,
		&reset,
		&age
		&age,
		NULL
		};

		static void register_hook(apr_pool_t *p)

modules/proxy/balancers/mod_lbmethod_heartbeat.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -358,7 +358,8 @@ static const proxy_balancer_method heartbeat =
		&find_best_hb,
		NULL,
		&reset,
		&age
		&age,
		NULL
		};

		static int lb_hb_init(apr_pool_t p, apr_pool_t plog,