Merge branch 'release/4.6.2'

GrahamDumpleton · Mar 4, 2018 · f0186d7 · f0186d7
2 parents 12bcc05 + 08835df
commit f0186d7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 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.6.2
    release-notes/version-4.6.1
    release-notes/version-4.6.0
 

diff --git a/docs/release-notes/version-4.6.2.rst b/docs/release-notes/version-4.6.2.rst
@@ -0,0 +1,13 @@
+=============
+Version 4.6.2
+=============
+
+Version 4.6.2 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.6.2
+
+Bugs Fixed
+----------
+
+* Full details of error not logged when a Python script file could not be
+  loaded due to a failure when parsing Python code.
diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c
@@ -3703,6 +3703,9 @@ static PyObject *wsgi_load_source(apr_pool_t *pool, request_rec *r,
                          process_group, application_group, filename);
         }
         Py_END_ALLOW_THREADS
+
+        wsgi_log_python_error(r, NULL, filename, 0);
+
         return NULL;
     }
 

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 6
-#define MOD_WSGI_MICROVERSION_NUMBER 1
-#define MOD_WSGI_VERSION_STRING "4.6.1"
+#define MOD_WSGI_MICROVERSION_NUMBER 2
+#define MOD_WSGI_VERSION_STRING "4.6.2"
 
 /* ------------------------------------------------------------------------- */