Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit98d118b

Browse files
committed
Merge remote-tracking branch 'origin/2.0' into 2.0
2 parentsd340877 +ca17d9d commit98d118b

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

‎contributing/code/bugs.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ If your problem definitely looks like a bug, report it using the official bug
2525
* Describe the steps needed to reproduce the bug with short code examples
2626
(providing a unit test that illustrates the bug is best);
2727

28-
* Give as muchdetails as possible about your environment (OS, PHP version,
28+
* Give as muchdetail as possible about your environment (OS, PHP version,
2929
Symfony version, enabled extensions, ...);
3030

3131
* *(optional)* Attach a:doc:`patch<patches>`.

‎contributing/code/patches.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Get the Symfony2 source code:
7171

7272
* Fork the `Symfony2 repository`_ (click on the "Fork" button);
7373

74-
* After the "hardcoreforking action" has completed, clone your fork locally
74+
* After the "forking action" has completed, clone your fork locally
7575
(this will create a `symfony` directory):
7676

7777
..code-block::bash

‎contributing/code/security.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ This section indexes security vulnerabilities that were fixed in Symfony
5353
releases, starting from Symfony 1.0.0:
5454

5555
* November 29, 2012: `Security release: Symfony 2.0.19 and 2.1.4<http://symfony.com/blog/security-release-symfony-2-0-19-and-2-1-4>`_
56-
* November 25, 2012: `Security release: symfony 1.4.20 released<http://symfony.com/blog/security-release-symfony-1-4-20-released>`_
56+
* November 25, 2012: `Security release: symfony 1.4.20 released<http://symfony.com/blog/security-release-symfony-1-4-20-released>`_ (`CVE-2012-5574<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5574>`_)
5757
* August 28, 2012: `Security Release: Symfony 2.0.17 released<http://symfony.com/blog/security-release-symfony-2-0-17-released>`_
58-
* May 30, 2012: `Security Release: symfony 1.4.18 released<http://symfony.com/blog/security-release-symfony-1-4-18-released>`_
58+
* May 30, 2012: `Security Release: symfony 1.4.18 released<http://symfony.com/blog/security-release-symfony-1-4-18-released>`_ (`CVE-2012-2667<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2667>`_)
5959
* February 24, 2012: `Security Release: Symfony 2.0.11 released<http://symfony.com/blog/security-release-symfony-2-0-11-released>`_
6060
* November 16, 2011: `Security Release: Symfony 2.0.6<http://symfony.com/blog/security-release-symfony-2-0-6>`_
6161
* March 21, 2011: `symfony 1.3.10 and 1.4.10: security releases<http://symfony.com/blog/symfony-1-3-10-and-1-4-10-security-releases>`_

‎cookbook/configuration/pdo_session_storage.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,22 +131,22 @@ parameter.ini by referencing the database-related parameters defined there:
131131
pdo:
132132
class:PDO
133133
arguments:
134-
-"mysql:dbname=%database_name%"
134+
-"mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
135135
- %database_user%
136136
- %database_password%
137137
138138
..code-block::xml
139139
140140
<serviceid="pdo"class="PDO">
141-
<argument>mysql:dbname=%database_name%</argument>
141+
<argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</argument>
142142
<argument>%database_user%</argument>
143143
<argument>%database_password%</argument>
144144
</service>
145145
146146
..code-block::php
147147
148148
$pdoDefinition = new Definition('PDO', array(
149-
'mysql:dbname=%database_name%',
149+
'mysql:host=%database_host%;port=%database_port%;dbname=%database_name%',
150150
'%database_user%',
151151
'%database_password%',
152152
));

‎reference/configuration/framework.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ trust_proxy_headers
9797
**type**: ``Boolean``
9898

9999
Configures if HTTP headers (like ``HTTP_X_FORWARDED_FOR``, ``X_FORWARDED_PROTO``, and
100-
``X_FORWARDED_HOST``) are trusted as indication for an SSL connection. By default, it is
100+
``X_FORWARDED_HOST``) are trusted asanindication for an SSL connection. By default, it is
101101
set to ``false`` and only SSL_HTTPS connections are indicated as secure.
102102

103103
You should enable this setting if your application is behind a reverse proxy.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp