clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-09-07 06:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uwsgi-2.0' of github.com:unbit/uwsgi into uwsgi-2.0

Browse Source
This commit is contained in:
Roberto De Ioris
2014-11-22 13:19:28 +01:00
parent acc270ad81 b0c3ee02f9
commit 2e378dfc29
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/psgi/psgi_plugin.c
+3
View File
@@ -670,6 +670,9 @@ void uwsgi_perl_after_request(struct wsgi_request *wsgi_req) {
// Before we call exit(0) we'll run the
// uwsgi_perl_atexit() hook which'll properly tear
// down the interpreter.
// mark the request as ended (otherwise the atexit hook will be skipped)
uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].in_request = 0;
goodbye_cruel_world();
}
plugins/pypy/pypy_plugin.c
+22 -5
View File
@@ -66,17 +66,34 @@ static int uwsgi_pypy_init() {
}
else {
if (upypy.home) {
// first try with /bin way:
#ifdef __CYGWIN__
char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dll");
char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy-c.dll");
#elif defined(__APPLE__)
char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dylib");
char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy-c.dylib");
#else
char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.so");
char *libpath = uwsgi_concat2(upypy.home, "/bin/libpypy-c.so");
#endif
if (uwsgi_file_exists(libpath)) {
upypy.handler = dlopen(libpath, RTLD_NOW | RTLD_GLOBAL);
upypy.handler = dlopen(libpath, RTLD_NOW | RTLD_GLOBAL);
}
free(libpath);
// fallback to old-style way
if (!upypy.handler) {
#ifdef __CYGWIN__
char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dll");
#elif defined(__APPLE__)
char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.dylib");
#else
char *libpath = uwsgi_concat2(upypy.home, "/libpypy-c.so");
#endif
if (uwsgi_file_exists(libpath)) {
upypy.handler = dlopen(libpath, RTLD_NOW | RTLD_GLOBAL);
}
free(libpath);
}
free(libpath);
}
// fallback to standard library search path
if (!upypy.handler) {