diff options
| author | R David Murray <rdmurray@bitdance.com> | 2016-08-24 01:12:40 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2016-08-24 01:12:40 (GMT) |
| commit | bdfa0ebff797b0a93eabe253f8a77a5e9d5f8dc1 (patch) | |
| tree | c5a68de9ba1aee4ee15d197c1d0e785101f2afc4 | |
| parent | d44500cc291930cdda9f1b0636e85df2162c4bfd (diff) | |
| download | cpython-bdfa0ebff797b0a93eabe253f8a77a5e9d5f8dc1.zip cpython-bdfa0ebff797b0a93eabe253f8a77a5e9d5f8dc1.tar.gz cpython-bdfa0ebff797b0a93eabe253f8a77a5e9d5f8dc1.tar.bz2 | |
#26907: add some missing getsockopt constants.
Patch by Christian Heimes, reviewed by Martin Panter.
| -rw-r--r-- | Doc/library/socket.rst | 4 | ||||
| -rw-r--r-- | Doc/whatsnew/3.6.rst | 4 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 12 |
3 files changed, 20 insertions, 0 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index d0a3c5e..52c8f7f 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -281,6 +281,10 @@ Constants in the Unix header files are defined; for a few symbols, default values are provided. + .. versionchanged:: 3.6 + ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC`` + were added. + .. data:: AF_CAN PF_CAN SOL_CAN_* diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index 28f9d9f..8b85b22 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -406,6 +406,10 @@ The :func:`~socket.socket.ioctl` function now supports the :data:`~socket.SIO_LO control code. (Contributed by Daniel Stokes in :issue:`26536`.) +The :meth:`~socket.socket.getsockopt` constants ``SO_DOMAIN``, +``SO_PROTOCOL``, ``SO_PEERSEC``, and ``SO_PASSSEC`` are now supported. +(Contributed by Christian Heimes in :issue:`26907`.) + socketserver ------------ diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index d21509e..d896cc0 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -6582,6 +6582,12 @@ PyInit__socket(void) #ifdef LOCAL_PEERCRED PyModule_AddIntMacro(m, LOCAL_PEERCRED); #endif +#ifdef SO_PASSSEC + PyModule_AddIntMacro(m, SO_PASSSEC); +#endif +#ifdef SO_PEERSEC + PyModule_AddIntMacro(m, SO_PEERSEC); +#endif #ifdef SO_BINDTODEVICE PyModule_AddIntMacro(m, SO_BINDTODEVICE); #endif @@ -6591,6 +6597,12 @@ PyInit__socket(void) #ifdef SO_MARK PyModule_AddIntMacro(m, SO_MARK); #endif +#ifdef SO_DOMAIN + PyModule_AddIntMacro(m, SO_DOMAIN); +#endif +#ifdef SO_PROTOCOL + PyModule_AddIntMacro(m, SO_PROTOCOL); +#endif /* Maximum number of connections for "listen" */ #ifdef SOMAXCONN |