maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch '3.0.x'

Browse source
This commit is contained in:
David Lord 2023-12-13 15:13:41 -08:00
commit 12a1c4940d
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -4,6 +4,7 @@ Version 3.0.1
Unreleased Unreleased
- Correct type for ``path`` argument to ``send_file``. :issue:`5230` - Correct type for ``path`` argument to ``send_file``. :issue:`5230`
- Fix a typo in an error message for the ``flask run --key`` option. :pr:`5344`
Version 3.0.0 Version 3.0.0

4
docs/server.rst
View file

@ -76,8 +76,8 @@ following example shows that process id 6847 is using port 5000.
TCP 127.0.0.1:5000 0.0.0.0:0 LISTENING 6847 TCP 127.0.0.1:5000 0.0.0.0:0 LISTENING 6847
macOS Monterey and later automatically starts a service that uses port macOS Monterey and later automatically starts a service that uses port
5000. To disable the service, go to System Preferences, Sharing, and 5000. You can choose to disable this service instead of using a different port by
disable "AirPlay Receiver". searching for "AirPlay Receiver" in System Preferences and toggling it off.
Deferred Errors on Reload Deferred Errors on Reload

4
src/flask/cli.py
View file

@ -795,7 +795,9 @@ def _validate_key(ctx, param, value):
if is_context: if is_context:
raise click.BadParameter( raise click.BadParameter(
'When "--cert" is an SSLContext object, "--key is not used.', ctx, param 'When "--cert" is an SSLContext object, "--key" is not used.',
ctx,
param,
) )
if not cert: if not cert: