CHANGELOG + README

This commit is contained in:
Jakub Roztocil 2020-06-18 23:23:10 +02:00
parent 9500ce136a
commit ecdeffe7c8
2 changed files with 10 additions and 7 deletions

View File

@ -8,6 +8,8 @@ This project adheres to `Semantic Versioning <https://semver.org/>`_.
`2.3.0-dev`_ (unreleased)
-------------------------
* Added support for combining cookies specified on the CLI and in a session file (`#932`_).
`2.2.0`_ (2020-06-18)
-------------------------
@ -455,4 +457,5 @@ This project adheres to `Semantic Versioning <https://semver.org/>`_.
.. _#895: https://github.com/jakubroztocil/httpie/issues/895
.. _#920: https://github.com/jakubroztocil/httpie/issues/920
.. _#925: https://github.com/jakubroztocil/httpie/issues/925
.. _#932: https://github.com/jakubroztocil/httpie/issues/932
.. _#934: https://github.com/jakubroztocil/httpie/issues/934

View File

@ -1751,7 +1751,7 @@ Cookie Storage Behaviour
To set a cookie within a Session there are three options:
1. Get a `Set-Cookie` header in a response from a server
1. Get a ``Set-Cookie`` header in a response from a server
.. code-block:: bash
@ -1790,7 +1790,7 @@ To set a cookie within a Session there are three options:
Cookies will be set in the session file with the priority specified above. For example, a cookie
set through the command line will overwrite a cookie of the same name stored
in the session file. If the server returns a `Set-Cookie` header with a
in the session file. If the server returns a ``Set-Cookie`` header with a
cookie of the same name, the returned cookie will overwrite the preexisting cookie.
Expired cookies are never stored. If a cookie in a session file expires, it will be removed before