summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #904 from haikuginger/approved-session-managersessionmanagerCory Benfield2016-09-0516-59/+639
|\
| * Removing merge cruftJesse Shapiro2016-09-021-2/+1
| * Switching to easier method of creating ProxySessionManagerJesse Shapiro2016-09-023-16/+45
| * Fixing flake8 nitJesse Shapiro2016-09-021-0/+1
| * Continue fixing review itemsJesse Shapiro2016-09-021-1/+1
| * Addressing review commentsJesse Shapiro2016-09-027-14/+97
| * Flake8 nitJesse Shapiro2016-09-021-1/+1
| * Implementing SessionManager; documenting; testing; moving redirect logic to R...Jesse Shapiro2016-09-0216-57/+525
|/
* Merge pull request #949 from nateprewitt/723_strict_content_lengthCory Benfield2016-08-287-4/+241
|\
| * enforce_content_length for incrementally read responsesNate Prewitt2016-08-285-2/+100
| * adding length_remaining functionality to HTTPResponseNate Prewitt2016-08-286-4/+143
|/
* Merge pull request #958 from Lukasa/update-cipher-suites-again-seriouslyCory Benfield2016-08-252-7/+4
|\
| * More CHANGESCory Benfield2016-08-241-0/+2
| * Remove HIGH cipher suites as well.Cory Benfield2016-08-241-3/+0
| * Remove 3DES support.Cory Benfield2016-08-242-4/+2
|/
* Merge pull request #946 from scop/sixmoreCory Benfield2016-08-157-35/+9
|\
| * Import more from sixVille Skyttä2016-08-157-35/+9
|/
* Merge pull request #947 from Lukasa/update-cipher-suitesJesse Shapiro2016-08-152-6/+27
|\
| * Changelog update for #947.Cory Benfield2016-08-151-0/+3
| * Split ciphers up to individual lines.Cory Benfield2016-08-151-5/+21
| * Improve the cipher suite commentCory Benfield2016-08-151-1/+3
| * Add support for ChaCha20.Cory Benfield2016-08-151-3/+3
|/
* Merge pull request #935 from scop/sixmoreCory Benfield2016-08-063-14/+10
|\
| * Add include=urllib3/* to prevent core module coverage through six.movesVille Skyttä2016-08-051-0/+3
| * Use HTTPException, LifoQueue, Empty, and Full from sixVille Skyttä2016-08-052-14/+7
|/
* Add release note about #941 (#943)Ian Cordasco2016-08-031-0/+3
* Merge pull request #941 from krrr/masterIan Cordasco2016-08-031-1/+3
|\
| * Use OS default certs when possiblekrrr2016-08-021-1/+3
|/
* Merge pull request #942 from sigmavirus24/allow-pypy-5.3-to-failJesse Shapiro2016-08-011-0/+2
|\
| * Allow PyPy 5.3 to failIan Cordasco2016-08-011-0/+2
|/
* Merge pull request #940 from jonparrott/docs-patchesCory Benfield2016-07-304-125/+155
|\
| * Update README.rst to better reflect new documentation.Jon Wayne Parrott2016-07-293-125/+78
| * Add more advanced usage docsJon Wayne Parrott2016-07-291-0/+77
|/
* Merge pull request #939 from jayvdb/use-travis-pypy-5.xCory Benfield2016-07-294-36/+14
|\
| * Use Travis supplied PyPy 5.3John Vandenberg2016-07-294-36/+14
|/
* Merge pull request #937 from kalefranz/url-slotsCory Benfield2016-07-261-1/+1
|\
| * use dunder slots for Url class slots variableKale Franz2016-07-261-1/+1
|/
* Merge pull request #932 from scop/spellingIan Cordasco2016-07-262-2/+2
|\
| * Spelling fixesVille Skyttä2016-07-262-2/+2
|/
* Merge pull request #933 from sigmavirus24/bug/use-new-noqaCory Benfield2016-07-262-3/+3
|\
| * Ignore only the unused import errorIan Cordasco2016-07-262-3/+3
|/
* Merge pull request #929 from nateprewitt/3421_fp_not_closedCory Benfield2016-07-194-0/+41
|\
| * CHANGES for #928Nate Prewitt2016-07-192-0/+3
| * fixing infinite loop when stream(None) calledNate Prewitt2016-07-192-0/+38
|/
* Merge pull request #930 from shazow/remove-extra-dependenciesJesse Shapiro2016-07-195-67/+95
|\
| * CHANGES for #930remove-extra-dependenciesCory Benfield2016-07-191-1/+5
| * We actually require cryptography-based PyOpenSSL now.Cory Benfield2016-07-192-2/+2
| * Update setup.cfgCory Benfield2016-07-191-2/+2
| * Clean up some bugs.Cory Benfield2016-07-191-4/+4
| * Bow before our fruit overlords.Cory Benfield2016-07-191-1/+1