Merged revisions 74962 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74962 | ronald.oussoren | 2009-09-20 12:31:22 +0200 (Sun, 20 Sep 2009) | 2 lines

  Fix for issue 6851: urllib.urlopen crashes in a thread on OSX 10.6
........

Misc/NEWS

@@ -82,6 +82,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #6851: Fix urllib.urlopen crash on secondairy threads on OSX 10.6
+
 - Issue #6947: Fix distutils test on windows. Patch by Hirokazu Yamamoto.
 
 - Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)

setup.py

@@ -1402,6 +1402,17 @@ class PyBuildExt(build_ext):
             addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
             addMacExtension('autoGIL', core_kwds)
 
+            # _scproxy
+            sc_kwds = {
+                'extra_compile_args': carbon_extra_compile_args,
+                'extra_link_args': [
+                    '-framework', 'SystemConfiguration',
+                    '-framework', 'CoreFoundation'
+                ],
+            }
+            addMacExtension("_scproxy", sc_kwds)
+
+
             # Carbon
             carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
                            'extra_link_args': ['-framework', 'Carbon'],