diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-10-03 06:03:25 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-10-03 06:03:25 +0000 |
| commit | ba24434c96ff4cbd21d189a4912e536cec4f8cdc (patch) | |
| tree | 155e4262c4b72c7d4198195f2566efce41ac8b51 /Python/dynload_next.c | |
| parent | 59357b4b8349f52b2c8c92e2da78270e7af9e121 (diff) | |
| parent | 9a7ccf4627f70e2b26bc9d58d968fecf81d33329 (diff) | |
| download | cpython-ba24434c96ff4cbd21d189a4912e536cec4f8cdc.tar.gz | |
Issues #25232, #24657: Merge two CGI server fixes from 3.4 into 3.5
Diffstat (limited to 'Python/dynload_next.c')
| -rw-r--r-- | Python/dynload_next.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/dynload_next.c b/Python/dynload_next.c index 85c95b41bb..83a8b2bb31 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -27,8 +27,9 @@ const char *_PyImport_DynLoadFiletab[] = {".so", NULL}; #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \ NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE #endif -dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, - const char *pathname, FILE *fp) +dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix, + const char *shortname, + const char *pathname, FILE *fp) { dl_funcptr p = NULL; char funcname[258]; @@ -39,7 +40,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, const char *errString; char errBuf[512]; - PyOS_snprintf(funcname, sizeof(funcname), "_PyInit_%.200s", shortname); + PyOS_snprintf(funcname, sizeof(funcname), "_%.20s_%.200s", prefix, shortname); #ifdef USE_DYLD_GLOBAL_NAMESPACE if (NSIsSymbolNameDefined(funcname)) { |