Skip to content

Commit de9bc87

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: [Frontend] Use Webpack disableHostCheck option in example #42229 update phpdoc to recommend createIndex over ensureIndex
2 parents 8c0c35c + 309d754 commit de9bc87

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

frontend/encore/dev-server.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CORS Issues
9090
-----------
9191

9292
If you experience issues related to CORS (Cross Origin Resource Sharing), set
93-
the ``firewall`` option:
93+
the following option:
9494

9595
.. code-block:: javascript
9696
@@ -101,11 +101,13 @@ the ``firewall`` option:
101101
// ...
102102
103103
.configureDevServerOptions(options => {
104-
options.firewall = false;
104+
options.allowedHosts = 'all';
105+
// in older Webpack Dev Server versions, use this option instead:
106+
// options.firewall = false;
105107
})
106108
107-
Beware that `it's not recommended to disable the firewall`_ in general, but
108-
here it's required to solve the CORS issue.
109+
Beware that this is not a recommended security practice in general, but here
110+
it's required to solve the CORS issue.
109111

110112
Hot Module Replacement HMR
111113
--------------------------
@@ -123,5 +125,4 @@ your page. HMR works automatically with CSS (as long as you're using the
123125
CSS. That is no longer needed.
124126

125127
.. _`webpack-dev-server`: https://webpack.js.org/configuration/dev-server/
126-
.. _`it's not recommended to disable the firewall`: https://webpack.js.org/configuration/dev-server/#devserverdisablehostcheck
127128
.. _`4.0 CHANGELOG`: https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md#400-beta0-2020-11-27

session/database.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ performance. Run this from the `MongoDB shell`_:
559559
.. code-block:: javascript
560560
561561
use session_db
562-
db.session.ensureIndex( { "expires_at": 1 }, { expireAfterSeconds: 0 } )
562+
db.session.createIndex( { "expires_at": 1 }, { expireAfterSeconds: 0 } )
563563
564564
Configuring the Session Field Names
565565
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)