diff options
| author | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2017-12-15 20:49:11 +1100 |
|---|---|---|
| committer | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2017-12-15 20:49:11 +1100 |
| commit | 538cf8f92004e28d73d07c681718fbd5d67783da (patch) | |
| tree | ad5df7a900c47af71f6f2e3d2f65e201b82c1c53 /src | |
| parent | 84d1c16357db2a20a59dc50a44e22db6e6b010cf (diff) | |
| parent | ba1fc6e89e4cf120a6613fb58670404928530132 (diff) | |
| download | mod_wsgi-4.5.24.tar.gz | |
Merge branch 'release/4.5.24'4.5.24
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/mod_wsgi.c | 10 | ||||
| -rwxr-xr-x | src/server/wsgi_version.h | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c index d876299..99f01b8 100644 --- a/src/server/mod_wsgi.c +++ b/src/server/mod_wsgi.c @@ -10709,7 +10709,7 @@ static apr_status_t wsgi_socket_sendv(apr_socket_t *sock, struct iovec *vec, if (nvec > iov_max) { int offset = 0; - while (nvec > 0) { + while (nvec != 0) { apr_status_t rv; rv = wsgi_socket_sendv_limit(sock, &vec[offset], @@ -10718,8 +10718,12 @@ static apr_status_t wsgi_socket_sendv(apr_socket_t *sock, struct iovec *vec, if (rv != APR_SUCCESS) return rv; - nvec -= iov_max; - offset += iov_max; + if (nvec > iov_max) { + nvec -= iov_max; + offset += iov_max; + } else { + nvec = 0; + } } return APR_SUCCESS; diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h index 2d75fae..1d7e9ee 100755 --- 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 23 -#define MOD_WSGI_VERSION_STRING "4.5.23" +#define MOD_WSGI_MICROVERSION_NUMBER 24 +#define MOD_WSGI_VERSION_STRING "4.5.24" /* ------------------------------------------------------------------------- */ |