Skip to content

Commit ef6a0b7

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Adding `reset()` Merging two paragraphs
2 parents 4469526 + 137125a commit ef6a0b7

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

rate_limiter.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,11 @@ the number of requests to the API::
245245
// RateLimitExceededException if the limit has been reached
246246
// $limiter->consume(1)->ensureAccepted();
247247

248+
// to reset the counter
249+
// $limiter->reset();
250+
248251
// ...
249252
}
250-
251-
// ...
252253
}
253254

254255
.. note::

security.rst

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2686,18 +2686,11 @@ Frequently Asked Questions
26862686
--------------------------
26872687

26882688
**Can I have Multiple Firewalls?**
2689-
Yes! But it's usually not necessary. Each firewall is like a separate security
2690-
system, being authenticated in one firewall doesn't make you authenticated in
2691-
another one. One firewall can have multiple diverse ways of allowing
2692-
authentication (e.g. form login, API key authentication and LDAP).
2693-
2694-
**Can I Share Authentication Between Firewalls?**
2695-
Yes, but only with some configuration. If you're using multiple firewalls and
2696-
you authenticate against one firewall, you will *not* be authenticated against
2697-
any other firewalls automatically. Different firewalls are like different security
2698-
systems. To do this you have to explicitly specify the same
2699-
:ref:`reference-security-firewall-context` for different firewalls. However,
2700-
one main firewall is usually sufficient for the needs of most applications.
2689+
Yes! However, each firewall is like a separate security system: being authenticated
2690+
in one firewall doesn't make you authenticated in another one. Each firewall can have
2691+
multiple ways of allowing authentication (e.g. form login, and API key authentication).
2692+
If you want to share authentication between firewalls, you have to explicitly
2693+
specify the same :ref:`reference-security-firewall-context` for different firewalls.
27012694

27022695
**Security doesn't seem to work on my Error Pages**
27032696
As routing is done *before* security, 404 error pages are not covered by

0 commit comments

Comments
 (0)