summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate Prewitt <Nate.Prewitt@gmail.com>2016-07-19 08:19:43 -0600
committerNate Prewitt <Nate.Prewitt@gmail.com>2016-07-19 08:19:43 -0600
commit1cdfdf14bd1971ffe9ef719441f90e271eaf78b1 (patch)
treebe63ffc0a3d2b80d303eb363d404802e8bc3c29f
parentab3dd36049d2a1aa17e8204584675bb44075e48f (diff)
downloadurllib3-1cdfdf14bd1971ffe9ef719441f90e271eaf78b1.tar.gz
CHANGES for #928
-rw-r--r--CHANGES.rst2
-rw-r--r--CONTRIBUTORS.txt1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 26414f33..ac2179f5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -25,6 +25,8 @@ dev (master)
now use cryptography and idna, both of which are already dependencies of
PyOpenSSL. (PR #930)
+* Fixed infinite loop in ``stream`` when amt=None. (Issue #928)
+
* ... [Short description of non-trivial change.] (Issue #)
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 0486ad55..cc4368c8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -208,6 +208,7 @@ In chronological order:
* Nate Prewitt <nate.prewitt@gmail.com>
* Ensure timeouts are not booleans and greater than zero.
+ * Fixed infinite loop in ``stream`` when amt=None.
* [Your name or handle] <[email or website]>
* [Brief summary of your changes]