changeset 3363:3b5cb4f28020

merge with main
author Johannes Berg <johannes AT sipsolutions DOT net>
date Thu, 20 Mar 2008 21:22:27 +0100
parents 97fe3aadef34 (current diff) 8fca4e0c0de5 (diff)
children fee75398b525
files
diffstat 3 files changed, 24 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/diff.py	Thu Mar 20 21:22:00 2008 +0100
+++ b/MoinMoin/action/diff.py	Thu Mar 20 21:22:27 2008 +0100
@@ -137,6 +137,13 @@
  </td>
  <td style="border:0">
   <span class="diff-header">%s</span>
+  <span style="text-align:center">
+   <form action="%s" method="get">
+    <input name="action" value="revert" type="hidden">
+    <input name="rev" value="%d" type="hidden">
+    <input value="%s" type="submit"%s>
+   </form>
+  </span>
  </td>
  <td style="border:0">
   <span style="text-align:right">
@@ -152,6 +159,7 @@
 </table>
 """ % (page_url, oldrev - 1, oldrev, _("Previous change"), disable_prev,
        title,
+       page_url, oldrev, _("Revert to this revision"), u'',
        page_url, newrev, newrev + 1, _("Next change"), disable_next, )
 
     request.write(f.rawHTML(navigation_html))
--- a/MoinMoin/request/request_wsgi.py	Thu Mar 20 21:22:00 2008 +0100
+++ b/MoinMoin/request/request_wsgi.py	Thu Mar 20 21:22:27 2008 +0100
@@ -37,7 +37,20 @@
 
     def read(self, n=None):
         if n is None:
-            return self.stdin.read()
+            # We can't do that, because wsgi 1.0 requires n:
+            #return self.stdin.read()
+            # Thus, if we have no n, we have to simulate the usual behaviour (or
+            # it won't work e.g. with mod_wsgi 1.3 and maybe other wsgi 1.0 servers).
+            # Note: just requesting a extremely large amount (expecting it to never
+            # be reached, but still all data returned) also does not work (mod_wsgi
+            # 1.3 gives a MemoryError when doing that):
+            data = []
+            while True:
+                read_data = self.stdin.read(4000)
+                if not read_data:
+                    break
+                data.append(read_data)
+            return ''.join(data)
         else:
             return self.stdin.read(n)
 
--- a/docs/CHANGES	Thu Mar 20 21:22:00 2008 +0100
+++ b/docs/CHANGES	Thu Mar 20 21:22:27 2008 +0100
@@ -1677,7 +1677,7 @@
 
   International support:    
     * mail_from can be now a unicode name-address 
-      e.g u'Jürgen wiki <noreply@jhwiki.org>'
+      e.g u'Jürgen wiki <noreply@jhwiki.org>'
 
   Theme changes:
     * logo_string is now should be really only the logo (img).
@@ -3543,7 +3543,7 @@
       there before a new version is written to disk
     * Removed the "Reset" button from EditPage
     * Added "Reduce editor size" link
-    * Added Latin-1 WikiNames (JürgenHermann ;)
+    * Added Latin-1 WikiNames (JürgenHermann ;)
     * Speeded up RecentChanges by looking up hostnames ONCE while saving
     * Show at most 14 (distinct) days in RecentChanges
     * Added icons for common functions, at the top of the page