Merge branch 'release/4.1.3'

GrahamDumpleton · Jun 4, 2014 · 190c9e9 · 190c9e9
2 parents 9a49a0c + 747e810
commit 190c9e9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 11 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -2,6 +2,12 @@
    :width: 250 px
    :align: right
 
+.. toctree::
+   :maxdepth: 1
+   :hidden:
+
+   release-notes/index
+
 mod_wsgi
 ========
 
@@ -29,11 +35,3 @@ If you need help in using mod_wsgi, then use the mod_wsgi mailing list to
 ask your questions:
 
     http://groups.google.com/group/modwsgi
-
-Contents
-========
-
-.. toctree::
-   :maxdepth: 1
-
-   release-notes/index
diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   version-4.1.3.rst
    version-4.1.2.rst
    version-4.1.1.rst
    version-4.1.0.rst

diff --git a/docs/release-notes/version-4.1.3.rst b/docs/release-notes/version-4.1.3.rst
@@ -0,0 +1,24 @@
+=============
+Version 4.1.3
+=============
+
+Version 4.1.3 of mod_wsgi can be obtained from:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/archive/4.1.3.tar.gz
+
+Known Issues
+------------
+
+1. The makefiles for building mod_wsgi on Windows are currently broken and
+need updating. As most new changes relate to mod_wsgi daemon mode, which is
+not supported under Windows, you should keep using the last available
+binary for version 3.X on Windows instead.
+
+Bugs Fixed
+----------
+
+1. The ``setup.py`` file wasn't always detecting the Python library version
+suffix properly when setting it up to be linked into the resulting
+``mod_wsgi.so``. This would cause an error message at link time of::
+
+    /usr/bin/ld: cannot find -lpython
diff --git a/setup.py b/setup.py
@@ -88,7 +88,7 @@ def get_apxs_config(query):
 # Work out location of Python library and how to link it.
 
 PYTHON_VERSION = get_python_config('VERSION')
-PYTHON_LDVERSION = get_python_config('LDVERSION') or ''
+PYTHON_LDVERSION = get_python_config('LDVERSION') or PYTHON_VERSION
 
 PYTHON_LIBDIR = get_python_config('LIBDIR')
 PYTHON_CFGDIR =  get_python_lib(plat_specific=1, standard_lib=1) + '/config'

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 1
-#define MOD_WSGI_MICROVERSION_NUMBER 2
-#define MOD_WSGI_VERSION_STRING "4.1.2"
+#define MOD_WSGI_MICROVERSION_NUMBER 3
+#define MOD_WSGI_VERSION_STRING "4.1.3"
 
 /* ------------------------------------------------------------------------- */