summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2008-01-19 20:47:59 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2008-01-19 20:47:59 (GMT)
commit060e6855a802a9e9bf2e6905342f704f64a3a26d (patch)
tree4e7aacd975ced3b4a7c73c29e985983bc6cda79f /Misc
parente3979f776a3837716aa7e566e388332d85314ceb (diff)
downloadcpython-060e6855a802a9e9bf2e6905342f704f64a3a26d.zip
cpython-060e6855a802a9e9bf2e6905342f704f64a3a26d.tar.gz
cpython-060e6855a802a9e9bf2e6905342f704f64a3a26d.tar.bz2
Patch #1019808 from Federico Schwindt: Return correct socket error when
a default timeout has been set, by using getsockopt() to get the error condition (instead of trying another connect() call, which seems to be a Linuxism). 2.5 bugfix candidate, assuming no one reports any problems with this change.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 35cecee..5c87ed1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -589,6 +589,7 @@ Chad J. Schroeder
Sam Schulenburg
Stefan Schwarzer
Dietmar Schwertberger
+Federico Schwindt
Barry Scott
Steven Scott
Nick Seidenman
diff --git a/Misc/NEWS b/Misc/NEWS
index f7c7aac..b20273d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1120,6 +1120,9 @@ Extension Modules
- Patch #1544279: Improve thread-safety of the socket module by moving
the sock_addr_t storage out of the socket object.
+- Patch #1019808: fix bug that causes an incorrect error to be returned
+ when a socket timeout is set and a connection attempt fails.
+
- Speed up function calls into the math module.
- Bug #1588217: don't parse "= " as a soft line break in binascii's