mirror of https://github.com/python/cpython
Ensure that the fix for #17269 also works on OSX 10.4
AI_NUMERICSERV isn't defined on OSX 10.4.
This commit is contained in:
parent
6f50b810b7
commit
a822d36675
|
@ -1167,6 +1167,7 @@ class GeneralModuleTests(unittest.TestCase):
|
|||
self.assertRaises(UnicodeEncodeError, socket.getaddrinfo, 'localhost', '\uD800')
|
||||
|
||||
# Issue 17269
|
||||
if hasattr(socket, 'AI_NUMERICSERV'):
|
||||
socket.getaddrinfo("localhost", None, 0, 0, 0, socket.AI_NUMERICSERV)
|
||||
|
||||
def test_getnameinfo(self):
|
||||
|
|
|
@ -5041,7 +5041,7 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs)
|
|||
PyErr_SetString(PyExc_OSError, "Int or String expected");
|
||||
goto err;
|
||||
}
|
||||
#ifdef __APPLE__
|
||||
#if defined(__APPLE__) && defined(AI_NUMERICSERV)
|
||||
if ((flags & AI_NUMERICSERV) && (pptr == NULL || (pptr[0] == '0' && pptr[1] == 0))) {
|
||||
/* On OSX upto at least OSX 10.8 getaddrinfo crashes
|
||||
* if AI_NUMERICSERV is set and the servname is NULL or "0".
|
||||
|
|
Loading…
Reference in New Issue