Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit eb268c5

Browse filesBrowse files
committed
Merge branch '2.5'
2 parents 29664fb + b879ad7 commit eb268c5
Copy full SHA for eb268c5

File tree

Expand file treeCollapse file tree

4 files changed

+15
-7
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+15
-7
lines changed

‎book/security.rst

Copy file name to clipboardExpand all lines: book/security.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ authorization from inside a controller::
11051105
The ``createAccessDeniedException`` method was introduced in Symfony 2.5.
11061106

11071107
The :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::createAccessDeniedException`
1108-
method creates a special :class:`Symfony\\Component\\Security\\Core\Exception\\AccessDeniedException`
1108+
method creates a special :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
11091109
object, which ultimately triggers a 403 HTTP response inside Symfony.
11101110

11111111
Thanks to the SensioFrameworkExtraBundle, you can also secure your controller using annotations::

‎components/class_loader/psr4_class_loader.rst

Copy file name to clipboardExpand all lines: components/class_loader/psr4_class_loader.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ first need to configure the ``Psr4ClassLoader``:
5959
6060
First of all, the class loader is loaded manually using a ``require``
6161
statement, since there is no autoload mechanism yet. With the
62-
:method:`Symfony\Component\ClassLoader\Psr4ClassLoader::addPrefix` call, you
62+
:method:`Symfony\\Component\\ClassLoader\\Psr4ClassLoader::addPrefix` call, you
6363
tell the class loader where to look for classes with the
6464
``Symfony\Component\Yaml\`` namespace prefix. After registering the autoloader,
6565
the Yaml component is ready to be used.

‎contributing/documentation/license.rst

Copy file name to clipboardExpand all lines: contributing/documentation/license.rst
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ Attribution-Share Alike 3.0 Unported `License`_.
3232
* *Other Rights* — In no way are any of the following rights affected by the
3333
license:
3434

35-
* Your fair dealing or fair use rights, or other applicable copyright
36-
exceptions and limitations;
35+
* Your fair dealing or fair use rights, or other applicable copyright exceptions
36+
and limitations;
3737

38-
* The author's moral rights;
38+
* The author's moral rights;
3939

40-
* Rights other persons may have either in the work itself or in how
41-
the work is used, such as publicity or privacy rights.
40+
* Rights other persons may have either in the work itself or in how the
41+
work is used, such as publicity or privacy rights.
4242

4343
* *Notice* — For any reuse or distribution, you must make clear to others
4444
the license terms of this work. The best way to do this is with a link

‎cookbook/cache/varnish.rst

Copy file name to clipboardExpand all lines: cookbook/cache/varnish.rst
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ Symfony2 adds automatically:
5757
// For Varnish < 3.0
5858
// esi;
5959
}
60+
/* By default Varnish ignores Cache-Control: nocache
61+
(https://www.varnish-cache.org/docs/3.0/tutorial/increasing_your_hitrate.html#cache-control),
62+
so in order avoid caching it has to be done explicitly */
63+
if (beresp.http.Pragma ~ "no-cache" ||
64+
beresp.http.Cache-Control ~ "no-cache" ||
65+
beresp.http.Cache-Control ~ "private") {
66+
return (hit_for_pass);
67+
}
6068
}
6169
6270
.. caution::

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.