Merge branch '4.4' into 5.3

javiereguiluz · javiereguiluz · commit 4afbfd1e6b33 · 2021-11-12T15:48:09.000+01:00
* 4.4:
  [Security] Minor fix
diff --git a/security/access_control.rst b/security/access_control.rst
@@ -330,7 +330,7 @@ key:
             access_control:
                 -
                     path: ^/_internal/secure
-                    # the 'roles' and 'allow-if' options work like an OR expression, so
+                    # the 'roles' and 'allow_if' options work like an OR expression, so
                     # access is granted if the expression is TRUE or the user has ROLE_ADMIN
                     roles: 'ROLE_ADMIN'
                     allow_if: "'127.0.0.1' == request.getClientIp() or request.headers.has('X-Secure-Access')"

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ key:`
`330`	`330`	`access_control:`
`331`	`331`	`-`
`332`	`332`	`path: ^/_internal/secure`
`333`		`- # the 'roles' and 'allow-if' options work like an OR expression, so`
	`333`	`+ # the 'roles' and 'allow_if' options work like an OR expression, so`
`334`	`334`	`# access is granted if the expression is TRUE or the user has ROLE_ADMIN`
`335`	`335`	`roles: 'ROLE_ADMIN'`
`336`	`336`	`allow_if: "'127.0.0.1' == request.getClientIp() or request.headers.has('X-Secure-Access')"`