From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 10 Jun 2013 08:36:28 +0000 (+0200)
Subject: Ensure that the fix for #17269 also works on OSX 10.4
X-Git-Tag: v3.4.0a1~540^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a822d366750ea0817276f35fd3adcd894472a70a;p=python

Ensure that the fix for #17269 also works on OSX 10.4

AI_NUMERICSERV isn't defined on OSX 10.4.
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 546a10d23a..25bf0a189f 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1167,7 +1167,8 @@ class GeneralModuleTests(unittest.TestCase):
         self.assertRaises(UnicodeEncodeError, socket.getaddrinfo, 'localhost', '\uD800')
 
         # Issue 17269
-        socket.getaddrinfo("localhost", None, 0, 0, 0, socket.AI_NUMERICSERV)
+        if hasattr(socket, 'AI_NUMERICSERV'):
+            socket.getaddrinfo("localhost", None, 0, 0, 0, socket.AI_NUMERICSERV)
 
     def test_getnameinfo(self):
         # only IP addresses are allowed
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index b9579283f8..9b58a11bd5 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -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".