changeset 5680:8604ed2e370c

Merge.
author Eugene Syromyatnikov <evgsyr@gmail.com>
date Fri, 04 Jun 2010 02:05:33 +0400
parents e50b087c4572 (current diff) 0103720137bd (diff)
children 60fde500cbc2
files
diffstat 3 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/support/flup/server/threadpool.py	Fri Jun 04 02:04:00 2010 +0400
+++ b/MoinMoin/support/flup/server/threadpool.py	Fri Jun 04 02:05:33 2010 +0400
@@ -28,6 +28,7 @@
 __version__ = '$Revision$'
 
 import sys
+import thread
 import threading
 
 class ThreadPool(object):
--- a/docs/CHANGES	Fri Jun 04 02:04:00 2010 +0400
+++ b/docs/CHANGES	Fri Jun 04 02:05:33 2010 +0400
@@ -19,11 +19,17 @@
 Version 1.9.current:
   Fixes:
   * Fix XSS in Despam action (CVE-2010-0828).
+  * Fix XSS issues (see MoinMoinBugs/1.9.2UnescapedInputForThemeAddMsg):
+    * by escaping template name in messages
+  * Make moin compatible to werkzeug 0.5 .. 0.6.2 (1.9.2 had issues
+    with xmlrpc when used with werkzeug 0.6.x).
   * MoinMoin.util.filesys: disable usage of dircache, deprecate dc* functions,
     because the dircache stdlib module can't work correctly for fast updates of
     directories.
   * rss_rc and sisterpages actions: fix Content-Type header (mimetype)
+  * Fix associating OpenID identity with user, wasn't adapted to werkzeug yet.
   * openidrp auth: fix undefined _ (gettext)
+  * Fix auth.cas and userprefs.oidserv request object usage.
   * highlight parser: fixed MoinMoinBugs/LineNumberSpansForProcessInstructionsMissed
   * Pygments syntax highlighting: add missing code files
   * Notifications: use same email subject format for every notification
@@ -35,8 +41,12 @@
   * script.maint.cleancache: clean also i18n cache files
   * Improved formatter.text_plain, see FeatureRequests/TextPlainFormatterRewrite
     (fixes many issues of this formatter).
-  * Make moin compatible to werkzeug 0.5 .. 0.6.2 (1.9.2 had issues
-    with xmlrpc when used with werkzeug 0.6.x).
+  * text_html_text_moin_wiki: fixed index error for width="", see also:
+    MoinMoinBugs/GUI_convertor_list_index_out_of_range
+  * xmlrpc: disable editor backup for putPage, renamePage and revertPage
+    because if pages get uploaded by xmlrpc then the draft cache file can
+    rapidly increase in size, causing high memory usage because it needs to
+    get loaded into memory for updating/processing.
 
   New features:
   * RenamePage action: added ability to create redirect pages when renaming
@@ -52,6 +62,7 @@
   * Scrolling the text editor to the double clicked line.
   * Enable double-click-editing by default.
   * WikiConfigHelp macro: make heading and description display optional, heading level as a parameter (default 2)
+  * If edit ticket check fails, send the editor with the current content.
 
   Other changes:
   * upgraded pygments from 1.2.2 to 1.3.1
--- a/docs/REQUIREMENTS	Fri Jun 04 02:04:00 2010 +0400
+++ b/docs/REQUIREMENTS	Fri Jun 04 02:05:33 2010 +0400
@@ -86,7 +86,7 @@
 
 flup (cgi/fastcgi/scgi/ajp to WSGI adapter)
 ===========================================
-shipped: 1.0.2+, from repo: hg clone -r 3b07cc2b0c76 http://hg.saddi.com/flup-server
+shipped: 1.0.2+, from repo: hg clone -r 72496e17674f http://hg.saddi.com/flup-server
 minimum: 1.0.2
 
 
@@ -105,7 +105,7 @@
 werkzeug (WSGI toolkit)
 =======================
 shipped: 0.5.1
-minimum: 0.5.1 will work, maybe 0.5 also
+minimum: 0.5.1 will work, maybe 0.5 and 0.6.x also
 
 
 xappy (High-Level Python library for Xapian)