Merge branch 'release/4.5.10'

Author: GrahamDumpleton

README.rst

@@ -1,7 +1,3 @@
-========
-MOD_WSGI
-========
-
 Overview
 --------
 

docs/contributing.rst

@@ -2,7 +2,7 @@
 Contributing
 ============
 
-The mod_wsgi package is a solo effort by Graham Dumpletaon.
+The mod_wsgi package is a solo effort by Graham Dumpleton.
 
 The package is developed purely in the author's spare time and is not
 funded in any way by a company, nor is it developed for a specific

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.10
    release-notes/version-4.5.9
    release-notes/version-4.5.8
    release-notes/version-4.5.7

docs/release-notes/version-4.5.10.rst

@@ -0,0 +1,37 @@
+==============
+Version 4.5.10
+==============
+
+Version 4.5.10 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.10
+
+Bugs Fixed
+----------
+
+* In version 4.5.9, the version number 4.5.8 was being incorrectly reported
+  via ``mod_wsgi.version`` in the per request WSGI environ dictionary.
+
+* When using Anaconda Python on MacOS X, the Python shared library wasn't
+  being resolved correctly due to changes in Anaconda Python, meaning it
+  cannot be used in embedded systems which load Python via a dynamically
+  loaded module, such as in Apache. When using ``mod_wsgi-express`` the
+  Python shared library is now forcibly loaded before the mod_wsgi module
+  is loaded in Apache. If doing manual Apache configration, you will need
+  to add before the ``LoadModule`` line for ``wsgi_module``, a ``LoadFile``
+  directive which loads the Ananconda Python shared library by its full
+  path from where it is located in the Anaconda Python ``lib`` directory.
+
+* Startup timeout wasn't being cancelled after succesful load of the WSGI
+  script file and instead was only being done after first request had
+  finished. This meant that if first request took longer than the startup
+  timeout the process would be wrongly restarted.
+
+* Fix parsing of ``Content-Length`` header returned in daemon mode so that
+  responses greater than 2GB in size could be returned.
+
+* Using incorrect header files in workaround to be able to compile mod_wsgi
+  on MacOSX Sierra when using ``pip install``. Was using old MacOS X 10.6
+  SDK which are header files for Apache 2.2. Was running, but should not
+  have worked at all. Possibility this still may not work or might break.
+  No choice until Apple fixes their broken Xcode and Apache installation.

setup.py

@@ -276,9 +276,9 @@ def get_apu_includes():
 # case we manually set the locations of the Apache and APR header files.
 
 if (not os.path.exists(APR_CONFIG) and
-        os.path.exists('/Developer/SDKs/MacOSX10.6.sdk')):
-    INCLUDEDIR = '/Developer/SDKs/MacOSX10.6.sdk/usr/include/apache2'
-    APR_INCLUDES = ['-I/Developer/SDKs/MacOSX10.6.sdk/usr/include/apr-1']
+        os.path.exists('/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdks/MacOSX.sdk')):
+    INCLUDEDIR = '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdks/MacOSX.sdk/usr/include/apache2'
+    APR_INCLUDES = ['-I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdks/MacOSX.sdk/usr/include/apr-1']
     APU_INCLUDES = []
 else:
     APR_INCLUDES = get_apr_includes().split()

src/server/__init__.py

@@ -26,6 +26,7 @@
 _py_version = '%s%s' % sys.version_info[:2]
 _py_soabi = ''
 _py_soext = '.so'
+_py_dylib = ''
 
 try:
     import imp
@@ -35,6 +36,14 @@
     _py_soabi = sysconfig.get_config_var('SOABI')
     _py_soext = sysconfig.get_config_var('SO')
 
+    if (sysconfig.get_config_var('WITH_DYLD') and
+            sysconfig.get_config_var('LIBDIR') and
+            sysconfig.get_config_var('LDLIBRARY')):
+        _py_dylib = os.path.join(sysconfig.get_config_var('LIBDIR'),
+                sysconfig.get_config_var('LDLIBRARY'))
+        if not os.path.exists(_py_dylib):
+            _py_dylib = ''
+
 except ImportError:
     pass
 
@@ -252,6 +261,10 @@ def find_mimetypes():
 </IfDefine>
 </IfModule>
 
+<IfDefine MOD_WSGI_LOAD_PYTHON_DYLIB>
+LoadFile '%(python_dylib)s'
+</IfDefine>
+
 LoadModule wsgi_module '%(mod_wsgi_so)s'
 
 <IfDefine MOD_WSGI_SERVER_METRICS>
@@ -3170,14 +3183,19 @@ def _cmd_setup_server(command, args, options):
             _mpm_module_defines(options['modules_directory'],
             options['server_mpm_variables']))
 
-    options['httpd_arguments'] = '-f %s %s' % (options['httpd_conf'],
-            ' '.join(options['httpd_arguments_list']))
-
     options['python_executable'] = sys.executable
 
     options['shlibpath_var'] = apxs_config.SHLIBPATH_VAR
     options['shlibpath'] = apxs_config.SHLIBPATH
 
+    if _py_dylib:
+        options['httpd_arguments_list'].append('-DMOD_WSGI_LOAD_PYTHON_DYLIB')
+
+    options['python_dylib'] = _py_dylib
+
+    options['httpd_arguments'] = '-f %s %s' % (options['httpd_conf'],
+            ' '.join(options['httpd_arguments_list']))
+
     generate_wsgi_handler_script(options)
 
     if options['with_newrelic_platform']:
@@ -3320,6 +3338,8 @@ def cmd_module_config(params):
         prefix = sys.prefix
         prefix = os.path.normpath(prefix)
 
+        if _py_dylib:
+            print('LoadFile "%s"' % _py_dylib)
         print('LoadModule wsgi_module "%s"' % module_path)
         print('WSGIPythonHome "%s"' % prefix)
 
@@ -3343,6 +3363,8 @@ def cmd_install_module(params):
 
     shutil.copyfile(where(), target)
 
+    if _py_dylib:
+        print('LoadFile "%s"' % _py_dylib)
     print('LoadModule wsgi_module "%s"' % target)
     print('WSGIPythonHome "%s"' % os.path.normpath(sys.prefix))
 

src/server/mod_wsgi.c

@@ -969,9 +969,9 @@ typedef struct {
         int init;
         int done;
         char *buffer;
-        apr_size_t size;
-        apr_size_t offset;
-        apr_size_t length;
+        apr_off_t size;
+        apr_off_t offset;
+        apr_off_t length;
         apr_bucket_brigade *bb;
         int seen_eos;
         int seen_error;
@@ -1233,11 +1233,11 @@ static apr_int64_t Input_read_from_input(InputObject *self, char *buffer,
 
 static PyObject *Input_read(InputObject *self, PyObject *args)
 {
-    long size = -1;
+    apr_off_t size = -1;
 
     PyObject *result = NULL;
     char *buffer = NULL;
-    apr_size_t length = 0;
+    apr_off_t length = 0;
     int init = 0;
 
     apr_int64_t n;
@@ -1510,11 +1510,11 @@ static PyObject *Input_read(InputObject *self, PyObject *args)
 
 static PyObject *Input_readline(InputObject *self, PyObject *args)
 {
-    long size = -1;
+    apr_off_t size = -1;
 
     PyObject *result = NULL;
     char *buffer = NULL;
-    apr_size_t length = 0;
+    apr_off_t length = 0;
 
     apr_int64_t n;
 
@@ -2251,12 +2251,12 @@ static int Adapter_output(AdapterObject *self, const char *data,
                     ap_set_content_type(r, apr_pstrdup(r->pool, value));
             }
             else if (!strcasecmp(name, "Content-Length")) {
-                char *v = value;
-                long l = 0;
+                char *endstr;
+                apr_off_t length;
+
+                if (wsgi_strtoff(&length, value, &endstr, 10)
+                    || *endstr || length < 0) {
 
-                errno = 0;
-                l = strtol(v, &v, 10);
-                if (*v || errno == ERANGE || l < 0) {
                     PyErr_SetString(PyExc_ValueError,
                                     "invalid content length");
 
@@ -2268,10 +2268,10 @@ static int Adapter_output(AdapterObject *self, const char *data,
                     return 0;
                 }
 
-                ap_set_content_length(r, l);
+                ap_set_content_length(r, length);
 
                 self->content_length_set = 1;
-                self->content_length = l;
+                self->content_length = length;
             }
             else if (!strcasecmp(name, "WWW-Authenticate")) {
                 apr_table_add(r->err_headers_out, name, value);
@@ -2971,7 +2971,7 @@ static int Adapter_run(AdapterObject *self, PyObject *object)
     PyObject *event = NULL;
 
     const char *msg = NULL;
-    long length = 0;
+    apr_off_t length = 0;
 
     WSGIThreadInfo *thread_handle = NULL;
 
@@ -4034,6 +4034,12 @@ static int wsgi_execute_script(request_rec *r)
     apr_thread_mutex_unlock(wsgi_module_lock);
 #endif
 
+    /* Clear startup timeout and prevent from running again. */
+
+#if defined(MOD_WSGI_WITH_DAEMONS)
+    wsgi_startup_shutdown_time = -1;
+#endif
+
     /* Assume an internal server error unless everything okay. */
 
     status = HTTP_INTERNAL_SERVER_ERROR;
@@ -4098,12 +4104,6 @@ static int wsgi_execute_script(request_rec *r)
             }
 
             Py_XDECREF((PyObject *)adapter);
-
-            /* Clear startup timeout and prevent from running again. */
-
-#if defined(MOD_WSGI_WITH_DAEMONS)
-            wsgi_startup_shutdown_time = -1;
-#endif
         }
         else {
             Py_BEGIN_ALLOW_THREADS
@@ -10491,12 +10491,12 @@ static apr_status_t wsgi_socket_send(apr_socket_t *sock, const char *buf,
 }
 
 static apr_status_t wsgi_socket_sendv_limit(apr_socket_t *sock,
-        struct iovec *vec, int nvec)
+        struct iovec *vec, size_t nvec)
 {
     apr_status_t rv;
     apr_size_t written = 0;
     apr_size_t to_write = 0;
-    int i, offset;
+    size_t i, offset;
 
     /* Calculate how much has to be sent. */
 
@@ -10547,7 +10547,7 @@ static apr_status_t wsgi_socket_sendv_limit(apr_socket_t *sock,
 }
 
 static apr_status_t wsgi_socket_sendv(apr_socket_t *sock, struct iovec *vec,
-                                      int nvec)
+                                      size_t nvec)
 {
 #if defined(_SC_IOV_MAX)
     static size_t iov_max = 0;

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 8
-#define MOD_WSGI_VERSION_STRING "4.5.9"
+#define MOD_WSGI_MICROVERSION_NUMBER 10
+#define MOD_WSGI_VERSION_STRING "4.5.10"
 
 /* ------------------------------------------------------------------------- */