Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/add-cors' into add-cors
Browse files Browse the repository at this point in the history
  • Loading branch information
mshustov committed Dec 3, 2020
2 parents e9aa9ff + bcebb53 commit 9884a2c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ deprecation warning at startup. This setting cannot end in a slash (`/`).
| experimental[] Set to `true` to allow browser code to access response body whenever request performed with user credentials. *Default:* `false`

| `server.cors.origin:`
| experimental[] List of origins permitted to access resources. You must specify `server.cors.origin` when `server.cors.credentials: true`. *Default:* "*"
| experimental[] List of origins permitted to access resources. You must specify explicit hostnames and not use `*` for `server.cors.origin` when `server.cors.credentials: true`. *Default:* "*"

| `server.compression.referrerWhitelist:`
| Specifies an array of trusted hostnames, such as the {kib} host, or a reverse
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/http/http_config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ describe('cors', () => {
).toThrow();
});

it('can be configures as "*" wildcard', () => {
it('can be configured as "*" wildcard', () => {
expect(config.schema.validate({ cors: { origin: '*' } }).cors.origin).toBe('*');
});
});
Expand Down

0 comments on commit 9884a2c

Please sign in to comment.