#
#
# patch "INSTALL"
#  from [e6b186c3fbe5e1843af38b941f284add5e3ceaa6]
#    to [0733df65c4055cb30a766df4fdbc82ea1a1df412]
# 
# patch "viewmtn.py"
#  from [ccec787218e77fe287094c19b8830a51981f5532]
#    to [c38b232b6c6ae6dd6cac8ea5b57935c18bdccaef]
#
============================================================
--- INSTALL	e6b186c3fbe5e1843af38b941f284add5e3ceaa6
+++ INSTALL	0733df65c4055cb30a766df4fdbc82ea1a1df412
@@ -14,7 +14,7 @@ A version which is descended from [62961
 
 Monotone: http://www.venge.net/monotone/
 A version which is descended from [62961c1dc..] is required.
-This is post-0.30
+This is post-0.30.
 
 Python: http://www.python.org/
 A version >= 2.4 is required.
@@ -22,6 +22,9 @@ Version 0.9.16-1 from Debian is known to
 Cheetah templates: http://www.cheetahtemplate.org/
 Version 0.9.16-1 from Debian is known to work.
 
+Flup: http://www.saddi.com/software/flup/dist/
+Version: flup-r2311.tar.gz is know to work.
+
 Optional
 --------
 
============================================================
--- viewmtn.py	ccec787218e77fe287094c19b8830a51981f5532
+++ viewmtn.py	c38b232b6c6ae6dd6cac8ea5b57935c18bdccaef
@@ -1098,7 +1098,6 @@ urls = (
     r'/branch/(head)/([A-Za-z]+)/([^/]+)(.*)', 'BranchHead', 
     r'/branch/(anyhead)/([A-Za-z]+)/([^/]+)(.*)', 'BranchHead', 
 
-    r'/static/(.*)', 'Static', 
     r'/robots.txt', 'RobotsTxt', 
     r'/mimeicon/([A-Za-z0-9][a-z0-9\-\+\.]*)/([A-Za-z0-9][a-z0-9\-\+\.]*)', 'MimeIcon',
 )
@@ -1106,8 +1105,14 @@ def runfcgi_apache(func):
 def runfcgi_apache(func):
     web.wsgi.runfcgi(func, None)
 
+def per_request_wrapper(func, *args, **kwargs):
+    ops.per_request()
+    return func(*args, **kwargs)
+    
 if __name__ == '__main__':
-    web.wsgi.runwsgi = runfcgi_apache
+# NB: if you're running Apache, uncomment the following line. Otherwise, don't.
+#    web.wsgi.runwsgi = runfcgi_apache
     web.webapi.internalerror = web.debugerror
-    web.run(urls, globals(), web.reloader)
+    func = lambda : per_request_wrapper(web.webpyfunc(urls, fvars=globals()))
+    web.run(func, globals(), web.reloader)