Add support for virtualenv & site packages

Note : segfault on virtualenv tests...

include/conf.h

@@ -28,6 +28,7 @@
 
 #include <unistd.h>
 #include <getopt.h>
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -123,6 +124,9 @@ struct pyfcgi_context_s {
 	pid_t **wrk_pids;
 	/**@brief workers count */
 	unsigned int n_wrk;
+
+	wchar_t python_path[PATH_MAX];
+	wchar_t venv_path[PATH_MAX];
 };
 
 /**@brief Structure containing configuration

include/pyutils.h

@@ -40,6 +40,7 @@ extern PyObject* libpyfcgi_self;
 void pyinit();
 
 /**@brief Add . to the embed pythonpath
+ * @deprecated Py_SetPath breaks Py_GetPrefix()...
  */
 void update_python_path();
 

src/pyutils.c

@@ -2,8 +2,34 @@
 
 void pyinit()
 {
-	update_python_path();
+	char *venv_path;
+	PyObject *sitemod, *mainfun;
+
+	if( (venv_path = getenv("VIRTUAL_ENV")) )
+	{
+		setenv("PYTHONHOME", venv_path, 1);
+		swprintf(PyFCGI_conf.context.venv_path, PATH_MAX, L"%s",
+			venv_path);
+		Py_SetPythonHome(PyFCGI_conf.context.venv_path);
+		pyfcgi_log(LOG_INFO, "Virtualenv found : setting PYTHONHOME : '%s'",
+			venv_path);
+
+		swprintf(PyFCGI_conf.context.python_path, PATH_MAX,
+			L"%s/bin/python3", venv_path);
+		Py_SetProgramName(PyFCGI_conf.context.python_path);
+
+		pyfcgi_log(LOG_INFO, "Setting programm name : '%ls'",
+			PyFCGI_conf.context.python_path);
+	}
+
 	Py_Initialize();
+	sitemod = PyImport_ImportModule("site");
+	mainfun = PyObject_GetAttrString(sitemod, "main");
+	PyObject_CallObject(mainfun, NULL);
+	
+	//Append "." to sys.path
+	sitemod = PySys_GetObject("path");
+	PyList_Append(sitemod, PyUnicode_FromString("."));
 }
 
 void update_python_path()
@@ -73,6 +99,7 @@ void update_python_path()
 		goto update_python_path_err_wcwd;
 	}
 	ppath = wcsdup(ppath);
+dprintf(2, "%ls\n", ppath);
 	if(!wcwd)
 	{
 		err = errno;
@@ -90,6 +117,7 @@ void update_python_path()
 	}
 	ppath = wtmp;
 	wcsncpy(ppath+ppath_sz, wcwd, wcwd_sz);
+dprintf(2, "%ls\n", ppath);
 	Py_SetPath(ppath);
 
 	free(ppath);