Commit Graph

594 Commits

Author SHA1 Message Date
R David Murray d44500cc29 Merge: #25916: fix a few 'string of bytes' references. 2016-08-23 20:44:31 -04:00
R David Murray 48de28290c #25916: fix a few 'string of bytes' references.
Patch by SilengGhost.
2016-08-23 20:43:56 -04:00
Zachary Ware 48e4bd6a02 Merge with 3.5 2016-08-17 09:52:32 -05:00
Zachary Ware 54005afeee Use sys.version_info, not sys.version.
sys.version[0] gives a string, which fails > comparison with 2.
Reported by Arne Maximilian Richter on docs@
2016-08-17 09:51:20 -05:00
Martin Panter 98cf1e79a1 Issue #27745: Merge typo fixes from 3.5 2016-08-12 12:05:48 +00:00
Martin Panter b4a2b36c99 Issue #27745: Fix some typos in Argument Clinic howto, by Lele Gaifax 2016-08-12 12:02:03 +00:00
Zachary Ware f03f7c75d8 Closes #27204: Merge with 3.5 2016-08-09 17:05:23 -05:00
Zachary Ware 378a1d77d9 Issue #27204: Fix doctests in Doc/howto
Patch by Jelle Zijlstra.
2016-08-09 16:47:04 -05:00
Senthil Kumaran cde03fa038 [merge from 3.5] - Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:51:13 -07:00
Senthil Kumaran 17742f2d45 [merge from 3.4] - Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:39:06 -07:00
Senthil Kumaran 436fe5a447 [merge from 3.3] Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:34:34 -07:00
Senthil Kumaran 4cbb23f8f2 Prevent HTTPoxy attack (CVE-2016-1000110)
Ignore the HTTP_PROXY variable when REQUEST_METHOD environment is set, which
indicates that the script is in CGI mode.

Issue #27568 Reported and patch contributed by Rémi Rampin.
2016-07-30 23:24:16 -07:00
Martin Panter 6a09315ff0 Issue #26462: Merge code block fixes from 3.5 2016-07-29 01:49:37 +00:00
Martin Panter 8bde911115 Issue #27626: Merge spelling fixes from 3.5 2016-07-28 01:30:58 +00:00
Martin Panter eb9957065a Issue #27626: Spelling fixes in docs, comments and internal names
Based on patch by Ville Skyttä.
2016-07-28 01:11:04 +00:00
Martin Panter 1050d2d0c7 Issue #26462: Doc: reduce literal_block warnings, fix syntax highlighting.
Patch by Julien Palard.
2016-07-26 11:18:21 +02:00
Martin Panter 525a949251 Issue #27130: Merge zlib 64-bit fixes from 3.5 2016-07-23 03:39:49 +00:00
Martin Panter 84544c1020 Issue #27130: Fix handling of buffers exceeding UINT_MAX in “zlib” module
Patch by Xiang Zhang.
2016-07-23 03:02:07 +00:00
Berker Peksag 7577ad32d1 Issue #27378: Merge from 3.5 2016-06-24 08:55:06 +03:00
Berker Peksag 79af27ef2e Issue #27378: Remove an outdated reference from regex HOWTO
Patch by Matt Morrison.
2016-06-24 08:54:43 +03:00
Martin Panter e514093a2f Issue #27125: Merge typo fixes from 3.5 2016-05-30 05:24:49 +00:00
Martin Panter a90a4a9651 Issue #27125: Remove duplicated words from documentation and comments 2016-05-30 04:04:50 +00:00
Serhiy Storchaka c499f30286 Issue #23921: Standardized documentation whitespace formatting.
Original patch by James Edwards.
2016-05-10 12:01:56 +03:00
Serhiy Storchaka dba903993a Issue #23921: Standardized documentation whitespace formatting.
Original patch by James Edwards.
2016-05-10 12:01:23 +03:00
Martin Panter 1ce738e08f Merge typo fixes from 3.5 2016-05-08 14:02:35 +00:00
Martin Panter f0564164ba Fix typos in comments, documentation and test method names 2016-05-08 13:48:10 +00:00
Serhiy Storchaka 1acbf853c8 Issue #26736: Used HTTPS for external links in the documentation if possible. 2016-05-07 10:49:58 +03:00
Serhiy Storchaka 6dff0205b7 Issue #26736: Used HTTPS for external links in the documentation if possible. 2016-05-07 10:49:07 +03:00
Raymond Hettinger c5c43b8374 merge 2016-04-26 01:11:28 -07:00
Raymond Hettinger b9531bcdcc Issue #24715: Improve sort stability example 2016-04-26 01:11:10 -07:00
Benjamin Peterson 9046df0659 merge 3.5 (#26827) 2016-04-22 23:43:24 -07:00
Benjamin Peterson 95b5f0ad7e fix python 3 mod init function declaration (closes #26827) 2016-04-22 23:43:10 -07:00
Martin Panter cda80940ed Issue #15984: Merge PyUnicode doc from 3.5 2016-04-15 02:27:11 +00:00
Martin Panter 6245cb3c01 Correct “an” → “a” with “Unicode”, “user”, “UTF”, etc
This affects documentation, code comments, and a debugging messages.
2016-04-15 02:14:19 +00:00
Serhiy Storchaka 336fc5bbb0 Issue #25910: Fixed dead links in the docs. 2016-04-11 12:34:07 +03:00
Serhiy Storchaka 90be7333ea Issue #25910: Fixed dead links in the docs. 2016-04-11 12:18:56 +03:00
Vinay Sajip c334202f41 Merged documentation update from 3.5. 2016-04-01 23:13:48 +01:00
Vinay Sajip d93a60149c Added a cookbook recipe for a logging context manager. 2016-04-01 23:13:01 +01:00
Berker Peksag 5d7286c05d Issue #26593: Fix typo in logging HOWTO
Patch by Andrew Szeto.
2016-03-20 12:51:16 +02:00
Berker Peksag 563c949b11 Issue #26593: Fix typo in logging HOWTO
Patch by Andrew Szeto.
2016-03-20 12:50:56 +02:00
Brett Cannon 81ae89b611 Merge for issue #26095 2016-03-18 13:24:15 -07:00
Brett Cannon adcb654519 Suggest people use feature detection in porting guide 2016-03-18 13:23:58 -07:00
Berker Peksag f1fc8f953e Issue #24852: Remove outdated "HOWTO Use Python in the web" document 2016-03-07 19:01:05 +02:00
Berker Peksag b4f2f453e7 Issue #24852: Remove outdated "HOWTO Use Python in the web" document 2016-03-07 19:00:47 +02:00
Georg Brandl a7f7232838 merge with 3.5 2016-02-28 21:09:45 +01:00
Georg Brandl 76b2ee03c3 Fix typo. 2016-02-28 21:09:36 +01:00
Georg Brandl 3902d62c4e merge with 3.5 2016-02-26 19:37:52 +01:00
Georg Brandl 5d94134040 Closes #25910: fix dead and permanently redirected links in the docs. Thanks to SilentGhost for the patch. 2016-02-26 19:37:12 +01:00
Vinay Sajip d9dc53021e Merged cookbook update from 3.5. 2016-02-20 19:03:29 +00:00
Vinay Sajip e10d370a92 Added simple threading example to logging cookbook. 2016-02-20 19:02:46 +00:00