From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 19 Jul 2016 04:47:39 +0000 (-0700)
Subject: expose EPOLLRDHUP (closes #27567)
X-Git-Tag: v3.6.0a4~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96e97169ccf5b2cdd4eea267205f96535e037ec6;p=thirdparty%2FPython%2Fcpython.git

expose EPOLLRDHUP (closes #27567)
---

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 6cec9f764bf6..93f01a3c118f 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -285,6 +285,9 @@ Edge and Level Trigger Polling (epoll) Objects
    | :const:`EPOLLONESHOT` | Set one-shot behavior. After one event is     |
    |                       | pulled out, the fd is internally disabled     |
    +-----------------------+-----------------------------------------------+
+   | :const:`EPOLLRDHUP`   | Stream socket peer closed connection or shut  |
+   |                       | down writing half of connection.              |
+   +-----------------------+-----------------------------------------------+
    | :const:`EPOLLRDNORM`  | Equivalent to :const:`EPOLLIN`                |
    +-----------------------+-----------------------------------------------+
    | :const:`EPOLLRDBAND`  | Priority data band can be read.               |
diff --git a/Misc/NEWS b/Misc/NEWS
index 911a29ead209..55b6800928ea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #27567: Expose the EPOLLRDHUP constant in the select module.
+
 - Issue #1621: Avoid signed int negation overflow in the "audioop" module.
 
 - Issue #27533: Release GIL in nt._isdir
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index a6b63d22e5a3..fa71d6e7f491 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -2473,12 +2473,12 @@ PyInit_select(void)
     PyModule_AddIntMacro(m, EPOLLPRI);
     PyModule_AddIntMacro(m, EPOLLERR);
     PyModule_AddIntMacro(m, EPOLLHUP);
+    PyModule_AddIntMacro(m, EPOLLRDHUP);
     PyModule_AddIntMacro(m, EPOLLET);
 #ifdef EPOLLONESHOT
     /* Kernel 2.6.2+ */
     PyModule_AddIntMacro(m, EPOLLONESHOT);
 #endif
-    /* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */
 
 #ifdef EPOLLRDNORM
     PyModule_AddIntMacro(m, EPOLLRDNORM);