Bugfix in PEP333 worker when application trigger an exception

src/pyutils.c

@@ -11,15 +11,12 @@ void pyinit()
 		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'",
+		pyfcgi_log(LOG_INFO, "Virtualenv found : '%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();

src/pyworker.c

@@ -92,24 +92,31 @@ int work333(int wrk_id, int semid)
 		libpyfcgi.out = out_stream;
 		args = Py_BuildValue("OO", environ, start_response);
 		entry_ret = PyObject_CallObject(entry_fun, args);
-		Py_INCREF(entry_ret);
+		if(entry_ret && entry_ret != Py_None )
+		{
+			Py_INCREF(entry_ret);
+		}
 
 		if(PyErr_Occurred())
 		{
+			pyfcgi_log(LOG_ERR, "PEP333 entrypoint function triggered an exception");
 			log_expt(LOG_ERR);
 		}
 		// able to process returned value
 		// Simulate python call of libpyfcgi.write_body()
-		_pyfcgi_write_body(entry_ret);
-		if(PyErr_Occurred())
+		if(entry_ret && entry_ret != Py_None)
 		{
-			log_expt(LOG_ERR);
+			_pyfcgi_write_body(entry_ret);
+			if(PyErr_Occurred())
+			{
+				log_expt(LOG_ERR);
+			}
+			Py_DECREF(entry_ret);
 		}
 
 		// clean stuffs
 		Py_DECREF(args);
 		Py_DECREF(environ);
-		Py_DECREF(entry_ret);
 		// flush & logs pystdout & pystderr
 		PyObject_CallObject(pyflush[0], NULL);
 		PyObject_CallObject(pyflush[1], NULL);