Issue #1027206: getnameinfo is now restricted to numeric addresses as input.

This commit is contained in:
Martin v. Löwis 2010-08-25 07:38:15 +00:00
parent 219d1c8ae3
commit 112c0f3411
3 changed files with 7 additions and 1 deletions

View File

@ -637,6 +637,10 @@ class GeneralModuleTests(unittest.TestCase):
flags=socket.AI_PASSIVE)
self.assertEqual(a, b)
def test_getnameinfo(self):
# only IP addresses are allowed
self.assertRaises(socket.error, socket.getnameinfo, ('mail.python.org',0), 0)
def test_idna(self):
# these should all be successful
socket.gethostbyname('испытание.python.org')

View File

@ -70,7 +70,8 @@ Extensions
----------
- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex,
getaddrinfo and gethostbyaddr.
getaddrinfo and gethostbyaddr. getnameinfo is now restricted to numeric
addresses as input.
- Issue #9214: Set operations on a KeysView or ItemsView in collections
now correctly return a set. (Patch by Eli Bendersky.)

View File

@ -3969,6 +3969,7 @@ socket_getnameinfo(PyObject *self, PyObject *args)
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
hints.ai_flags = AI_NUMERICHOST; /* don't do any name resolution */
Py_BEGIN_ALLOW_THREADS
ACQUIRE_GETADDRINFO_LOCK
error = getaddrinfo(hostp, pbuf, &hints, &res);