Skip to content

Commit

Permalink
Merge branch 'release/4.4.20'
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamDumpleton committed Oct 20, 2015
2 parents e716679 + b8aa91d commit 736b0cb
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
1 change: 1 addition & 0 deletions docs/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Release Notes
.. toctree::
:maxdepth: 2

release-notes/version-4.4.20
release-notes/version-4.4.19
release-notes/version-4.4.18
release-notes/version-4.4.17
Expand Down
18 changes: 18 additions & 0 deletions docs/release-notes/version-4.4.20.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
==============
Version 4.4.20
==============

Version 4.4.20 of mod_wsgi can be obtained from:

https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.4.20

For details on the availability of Windows binaries see:

https://github.com/GrahamDumpleton/mod_wsgi/tree/master/win32

Bugs Fixed
----------

1. Post mortem debugger would fail if the exception was raised during
yielding of items from a WSGI application, or inside of any ``close()``
callable of an iterator returned from the WSGI application.
4 changes: 2 additions & 2 deletions src/server/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1117,15 +1117,15 @@ def __iter__(self):
for item in self.generator:
yield item
except Exception:
self.debug_exception()
self.run_post_mortem()
raise

def close(self):
try:
if hasattr(self.generator, 'close'):
return self.generator.close()
except Exception:
self.debug_exception()
self.run_post_mortem()
raise

class RequestRecorder(object):
Expand Down
4 changes: 2 additions & 2 deletions src/server/wsgi_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#define MOD_WSGI_MAJORVERSION_NUMBER 4
#define MOD_WSGI_MINORVERSION_NUMBER 4
#define MOD_WSGI_MICROVERSION_NUMBER 19
#define MOD_WSGI_VERSION_STRING "4.4.19"
#define MOD_WSGI_MICROVERSION_NUMBER 20
#define MOD_WSGI_VERSION_STRING "4.4.20"

/* ------------------------------------------------------------------------- */

Expand Down

0 comments on commit 736b0cb

Please sign in to comment.