Commitbeb3665

committed

Merge branch '2.0' into 2.1

Conflicts:reference/configuration/framework.rst

2 parents0d0434b +d75d7f4 commitbeb3665Copy full SHA for beb3665

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ your proxy::`
`18`	`18`
`19`	`19`	`$request = Request::createFromGlobals();`
`20`	`20`	`// only trust proxy headers coming from this IP address`
`21`		`- $request->setTrustedProxies(array(192.0.0.1));`
	`21`	`+ $request->setTrustedProxies(array('192.0.0.1'));`
`22`	`22`
`23`	`23`	`Configuring Header Names`
`24`	`24`	`------------------------`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ Configuration`
`26`	`26`	`* enabled`
`27`	`27`	`* field_name`
`28`	`28`	* `session`_
	`29`	+ * `name`_
`29`	`30`	* `cookie_lifetime`_
`30`	`31`	* `cookie_path`_
`31`	`32`	* `cookie_domain`_
`@@ -146,6 +147,14 @@ csrf_protection`
`146`	`147`	`session`
`147`	`148`	`~~~~~~~`
`148`	`149`
	`150`	`+name`
	`151`	`+....`
	`152`	`+`
	`153`	+type: ``string`` default: ``null``
	`154`	`+`
	`155`	`+This specifies the name of the session cookie. By default it will use the cookie`
	`156`	+name which is defined in the ``php.ini`` with the ``session.name`` directive.
	`157`	`+`
`149`	`158`	`cookie_lifetime`
`150`	`159`	`...............`
`151`	`160`

Comments

(0)