Merge branch 'release/4.5.1'

GrahamDumpleton · Apr 5, 2016 · ad3f5ed · ad3f5ed
2 parents 85964f0 + 317a3f2
commit ad3f5ed
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.1
    release-notes/version-4.5.0
 
    release-notes/version-4.4.23

diff --git a/docs/release-notes/version-4.5.1.rst b/docs/release-notes/version-4.5.1.rst
@@ -0,0 +1,13 @@
+=============
+Version 4.5.1
+=============
+
+Version 4.5.1 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.1
+
+Bugs Fixed
+----------
+
+1. The CPU user and system time for requests wasn't always being output
+   in request finished event data.
diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c
@@ -3225,7 +3225,7 @@ static int Adapter_run(AdapterObject *self, PyObject *object)
         if (application_time < 0.0)
             application_time = 0.0;
 
-        if (end_usage.user_time != 0.0) {
+        if (start_usage.user_time != 0.0) {
             if (wsgi_thread_cpu_usage(&end_usage)) {
                 double user_seconds;
                 double system_seconds;

diff --git 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 5
-#define MOD_WSGI_MICROVERSION_NUMBER 0
-#define MOD_WSGI_VERSION_STRING "4.5.0"
+#define MOD_WSGI_MICROVERSION_NUMBER 1
+#define MOD_WSGI_VERSION_STRING "4.5.1"
 
 /* ------------------------------------------------------------------------- */