commit 6effb781410499c4328b12d9b101b0ff7fd1b00d
from: Omar Polo <op@omarpolo.com>
date: Sun Jan 02 16:38:59 2022 UTC

sync changelog

commit - 5df593f3a65f704fa5f8254ff230aa027999cfea
commit + 6effb781410499c4328b12d9b101b0ff7fd1b00d
blob - 3ac09421b54fe1c7d6cdfcb73e04d3c06f961e4f
blob + a4e0bc1bef8e67d7b98e8c8d895dc07d713800b8
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2022-01-02  Omar Polo  <op@omarpolo.com>
+
+	* server.c (matched_proxy): allow to specify multiple proxy blocks and add matching rules
+
+	* parse.y (servbody): relax the strict ordering of options, location and proxy blocks
+
 2022-01-01  Omar Polo  <op@omarpolo.com>
 
 	* proxy.c (proxy_init): add support for client certificate when proxying