From ecdeffe7c8c04fa28c1a9300770b4ec341e2275c Mon Sep 17 00:00:00 2001 From: Jakub Roztocil Date: Thu, 18 Jun 2020 23:23:10 +0200 Subject: [PATCH] CHANGELOG + README --- CHANGELOG.rst | 3 +++ README.rst | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5aca82d2..6fcb561b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,8 @@ This project adheres to `Semantic Versioning `_. `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 `_. .. _#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 diff --git a/README.rst b/README.rst index 1041b9e1..69e7ece6 100644 --- a/README.rst +++ b/README.rst @@ -1747,11 +1747,11 @@ exchange after it has been created, specify the session name via Cookie Storage Behaviour ------------------------ -**TL;DR:** Cookie storage priority: Server response > Command line request > Session file +**TL;DR:** Cookie storage priority: Server response > Command line request > Session file -To set a cookie within a Session there are three options: +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 @@ -1766,7 +1766,7 @@ To set a cookie within a Session there are three options: 3. Manually set cookie parameters in the json file of the session .. code-block:: json - + { "__meta__": { "about": "HTTPie session file", @@ -1789,13 +1789,13 @@ 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 +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 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 sending a new request. If the server expires an existing cookie, it will also be removed from the -session file. +session file. Config