summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-05-18 04:41:36 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2017-05-18 04:41:36 +0200
commit759b8a88ead6caf294aa45e84578056dc79440df (patch)
treef3f2e5ac94ada0ac51d38b31a94f251b5387ed34
parent5250b63787dec4a4cefbc1c93d84b58ac874405a (diff)
downloadpsutil-759b8a88ead6caf294aa45e84578056dc79440df.tar.gz
update HISTORY with #1079; give CREDITS to @glebius
-rw-r--r--CREDITS2
-rw-r--r--HISTORY.rst4
-rw-r--r--docs/index.rst5
3 files changed, 9 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 515ba38d..5483653a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -477,4 +477,4 @@ I: 1057
N: Gleb Smirnoff
W: https://github.com/glebius
-I: 1042
+I: 1042, 1079
diff --git a/HISTORY.rst b/HISTORY.rst
index 8bf147f6..974af617 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -22,6 +22,8 @@
- 1058_: test suite now enables all warnings by default.
- 1060_: source distribution is dynamically generated so that it only includes
relevant files.
+- 1079_: [FreeBSD] net_connections()'s fd number is now being set for real
+ (instead of -1). (patch by Gleb Smirnoff)
**Bug fixes**
@@ -60,6 +62,8 @@
processes.
- 1074_: [FreeBSD] sensors_battery() raises OSError in case of no battery.
- 1075_: [Windows] net_if_addrs(): inet_ntop() return value is not checked.
+- 1079_: [FreeBSD] net_connections() didn't list locally connected sockets.
+ (patch by Gleb Smirnoff)
**Porting notes**
diff --git a/docs/index.rst b/docs/index.rst
index d6488e34..4e378ea4 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -480,7 +480,7 @@ Network
process this may be passed to
`socket.fromfd() <http://docs.python.org/library/socket.html#socket.fromfd>`__
to obtain a usable socket object.
- On Windows, FreeBSD and SunOS this is always set to ``-1``.
+ On Windows and SunOS this is always set to ``-1``.
- **family**: the address family, either `AF_INET
<http://docs.python.org//library/socket.html#socket.AF_INET>`__,
`AF_INET6 <http://docs.python.org//library/socket.html#socket.AF_INET6>`__
@@ -566,6 +566,9 @@ Network
.. versionadded:: 2.1.0
+ .. versionchanged:: 5.3.0 : socket "fd" is now set for real instead of being
+ ``-1``.
+
.. function:: net_if_addrs()
Return the addresses associated to each NIC (network interface card)