summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Phrasing.security-naggingAndrey Petrov2014-10-291-1/+2
* CHANGES for #496Andrey Petrov2014-10-291-0/+2
* Nag about SecurityWarning every time.Andrey Petrov2014-10-293-4/+2
* CHANGES for #473Andrey Petrov2014-10-291-1/+5
* Merge pull request #473 from sigmavirus24/use-create_default_contextAndrey Petrov2014-10-293-50/+200
|\
| * Remove poorly designed testIan Cordasco2014-10-291-6/+0
| * Reduce scope of exception handling in ssl_wrap_socketIan Cordasco2014-10-292-4/+15
| * Replace and update ssl_wrap_socket's docstringIan Cordasco2014-10-241-0/+13
| * Update exception messageIan Cordasco2014-10-241-1/+1
| * Update ssl_wrap_socket to accept ciphersIan Cordasco2014-10-241-3/+4
| * Pass ciphers on any version which actually allows for themIan Cordasco2014-10-241-10/+23
| * Address further feedbackIan Cordasco2014-10-231-9/+12
| * Use correct set of ciphersIan Cordasco2014-10-231-5/+5
| * Last bit of test coverage and hopefully a fix for some testsIan Cordasco2014-10-232-5/+15
| * Fix up test coverageIan Cordasco2014-10-232-3/+20
| * Call out platform-specific branchesIan Cordasco2014-10-221-48/+3
| * First working stub contextIan Cordasco2014-10-201-5/+59
| * Add create_urllib3_context and use it internallyIan Cordasco2014-10-181-13/+84
| * Try using check_hostname = False if CERT_NONEIan Cordasco2014-09-191-5/+2
| * Fix usage of CERT_NONE with an SSLContextIan Cordasco2014-09-191-3/+5
| * Use 3.4's ssl.create_default_context when availableIan Cordasco2014-09-191-9/+18
* | CHANGES for #492Andrey Petrov2014-10-271-0/+2
* | Merge pull request #493 from kevinburke/raise-timeoutAndrey Petrov2014-10-272-23/+43
|\ \
| * | Rephrased comment.Andrey Petrov2014-10-271-2/+1
| * | cool it with the new linesKevin Burke2014-10-271-8/+4
| * | Catch socket timeout as wellKevin Burke2014-10-271-1/+3
| * | no newlinesKevin Burke2014-10-271-1/+1
| * | fix the behaviourKevin Burke2014-10-271-23/+28
| * | Add failing HTTPS handshake timeout testKevin Burke2014-10-271-0/+18
|/ /
* | Merge pull request #489 from tyewang/masterAndrey Petrov2014-10-231-0/+1
|\ \
| * | Change how ssl_wrap_socket handles certfiles and keyfiles to match the regula...Tye Wang2014-10-231-0/+1
|/ /
* | Merge pull request #485 from abacabadabacaba/masterAndrey Petrov2014-10-102-4/+6
|\ \
| * | Made RecentlyUsedContainer.keys() thread-safe on Python 3, removed unnecessar...Evgeny Kapun2014-10-102-4/+6
|/ /
* | Merge pull request #484 from kevinburke/message-updateAndrey Petrov2014-10-063-6/+8
|\ \
| * | go hard or go homeKevin Burke2014-10-063-5/+8
| * | Make it a constant member on the classKevin Burke2014-10-063-8/+3
| * | Use a constant stringKevin Burke2014-10-063-4/+8
| * | Merge branch 'message-update' of github.com:kevinburke/urllib3 into message-u...Kevin Burke2014-10-041-2/+2
| |\ \
| | * | Simplify error wording more?Andrey Petrov2014-10-041-2/+2
| * | | change error message'Kevin Burke2014-10-041-1/+1
| |/ /
| * | Make the language a little more friendly.Kevin Burke2014-10-041-1/+1
|/ /
* | CHANGES for #481Andrey Petrov2014-10-031-0/+3
* | Merge pull request #481 from kevinburke/response-errorAndrey Petrov2014-10-033-5/+15
|\ \
| * | Update error text for ResponseErrorKevin Burke2014-10-031-1/+1
| * | Add ResponseError exception classKevin Burke2014-10-023-5/+15
|/ /
* | Merge pull request #464 from kevinburke/not-caused-by-redirectAndrey Petrov2014-10-015-15/+53
|\ \ | |/ |/|
| * ReformatKevin Burke2014-10-011-2/+2
| * Rewrite it to not try/catch badlyKevin Burke2014-10-011-3/+2
| * fix syntax errorKevin Burke2014-09-301-2/+0
| * Add failing test with bad messageKevin Burke2014-09-305-15/+56
|/