diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/__init__.py | 23 | ||||
| -rw-r--r-- | src/server/mod_wsgi.c | 4 | ||||
| -rw-r--r-- | src/server/wsgi_version.h | 4 |
3 files changed, 27 insertions, 4 deletions
diff --git a/src/server/__init__.py b/src/server/__init__.py index a633dd6..1a2ba89 100644 --- a/src/server/__init__.py +++ b/src/server/__init__.py @@ -1335,6 +1335,13 @@ WSGI_CONTROL_SCRIPT = """ HTTPD="%(httpd_executable)s %(httpd_arguments)s" +SHLIBPATH="%(shlibpath)s" + +if [ "x$SHLIBPATH" != "x" ]; then + %(shlibpath_var)s="$SHLIBPATH:$%(shlibpath_var)s" + export %(shlibpath_var)s +fi + WSGI_RUN_USER="${WSGI_RUN_USER:-%(user)s}" WSGI_RUN_GROUP="${WSGI_RUN_GROUP:-%(group)s}" @@ -2474,6 +2481,16 @@ def _cmd_setup_server(command, args, options): options['python_executable'] = sys.executable + options['shlibpath_var'] = apxs_config.SHLIBPATH_VAR + + if apxs_config.WITH_PACKAGES: + shlibpath = [] + shlibpath.append(os.path.join(apxs_config.PACKAGES, 'apr-util', 'lib')) + shlibpath.append(os.path.join(apxs_config.PACKAGES, 'apr', 'lib')) + options['shlibpath'] = ':'.join(shlibpath) + else: + options['shlibpath'] = '' + generate_wsgi_handler_script(options) if options['with_newrelic_platform']: @@ -2521,6 +2538,9 @@ def _cmd_setup_server(command, args, options): print('Locale Setting :', options['locale']) + print('Daemon Processes :', options['processes']) + print('Daemon Threads :', options['threads']) + return options def cmd_start_server(params): @@ -2611,5 +2631,8 @@ def main(): else: parser.error('Invalid command was specified.') +def start(*args): + cmd_start_server(list(args)) + if __name__ == '__main__': main() diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c index 4e2734b..5aa526e 100644 --- a/src/server/mod_wsgi.c +++ b/src/server/mod_wsgi.c @@ -5797,7 +5797,7 @@ static PyObject *Dispatch_ssl_var_lookup(DispatchObject *self, PyObject *args) if (ssl_var_lookup == 0) { - Py_XINCREF(Py_None); + Py_INCREF(Py_None); return Py_None; } @@ -5806,7 +5806,7 @@ static PyObject *Dispatch_ssl_var_lookup(DispatchObject *self, PyObject *args) self->r->connection, self->r, name); if (!value) { - Py_XINCREF(Py_None); + Py_INCREF(Py_None); return Py_None; } diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h index 5843e51..6205b2f 100644 --- a/src/server/wsgi_version.h +++ b/src/server/wsgi_version.h @@ -25,8 +25,8 @@ #define MOD_WSGI_MAJORVERSION_NUMBER 4 #define MOD_WSGI_MINORVERSION_NUMBER 4 -#define MOD_WSGI_MICROVERSION_NUMBER 3 -#define MOD_WSGI_VERSION_STRING "4.4.3" +#define MOD_WSGI_MICROVERSION_NUMBER 4 +#define MOD_WSGI_VERSION_STRING "4.4.4" /* ------------------------------------------------------------------------- */ |