jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix fromfd on solaris

Browse Source 
This patches the fromfd code in socketfromfd by grabbing the correct symbol under SmartOS (SunOS).

The patch is pretty straightforward, basically switching on the OS to determine what the symbol is likely to be. If need be, I could put a try block around the original libc.getsockopt and then fall back to looking for _so_getsockopt, if that's preferred in this codebase

fix #2184
This commit is contained in:
Gaige B Paulsen 2019-11-20 01:09:43 -05:00 committed by Benoit Chesneau
parent 19cb68f4c3
commit 4264e09c6f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gunicorn/socketfromfd.py
View File

@ -10,6 +10,8 @@ import ctypes
import os import os
import socket import socket
import sys import sys
import platform
from ctypes.util import find_library from ctypes.util import find_library
__all__ = ('fromfd',) __all__ = ('fromfd',)
@ -34,8 +36,10 @@ def _errcheck_errno(result, func, arguments):
raise OSError(errno, os.strerror(errno)) raise OSError(errno, os.strerror(errno))
return arguments return arguments
if platform.system() == 'SunOS':
_libc_getsockopt = libc.getsockopt _libc_getsockopt = libc._so_getsockopt
else:
_libc_getsockopt = libc.getsockopt
_libc_getsockopt.argtypes = [ _libc_getsockopt.argtypes = [
ctypes.c_int, # int sockfd ctypes.c_int, # int sockfd
ctypes.c_int, # int level ctypes.c_int, # int level