summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-08 21:01:54 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-08 21:01:54 -0500
commitdc16e386819da912a5fa37214a0d1335cc4d97f5 (patch)
tree843146a6f445accef977459868a313d06f17e7c0
parent13cf99822d6f89ed181de468c180e7ee5c723f5c (diff)
parentd21467601cf37d99911350e2dffb0f80388be92d (diff)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
-rw-r--r--doc/bugs/rst_plugin_hangs_on_utf-8.mdwn14
-rw-r--r--doc/todo/enable-htaccess-files.mdwn8
-rw-r--r--doc/users/Stefano_Zacchiroli.mdwn1
3 files changed, 23 insertions, 0 deletions
diff --git a/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
new file mode 100644
index 000000000..2fa8e28a5
--- /dev/null
+++ b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
@@ -0,0 +1,14 @@
+When rendering an rst page with utf-8 characters in (specifically "£"), ikiwiki seems to hang.
+
+Killing with Control-C gives the following traceback:
+
+ Traceback (most recent call last):
+ File "/usr/lib/ikiwiki/plugins/rst", line 97, in ?
+ handler.handle_request()
+ File "/usr/lib/ikiwiki/plugins/rst", line 74, in handle_request
+ ret = rpc_read(processor)
+ File "/usr/lib/ikiwiki/plugins/rst", line 42, in rpc_read
+ line = sys.stdin.readline()
+ KeyboardInterrupt
+
+rst2html on the same file has no problem rendering the file as expected.
diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index 68f0b9be2..4d377d3f6 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -39,4 +39,12 @@ access and such .htaccess files should not be accessible through wiki cgi. Of co
> See [[debbug 447267]] for a patch for this.
+---
+
+bump! I would like to see some form of this functionality included in ikiwiki. I use a patched version, but
+its a bit of a PITA to constantly apply it (and to forget sometimes!). I know that security concern is important to consider,
+but I use ikiwiki with a very small group of people collaborating so svn/web access is under control
+and htaccess is for limiting access to some areas of wiki.
+It should be off by default of course. --Max
+
[[tag patch]]
diff --git a/doc/users/Stefano_Zacchiroli.mdwn b/doc/users/Stefano_Zacchiroli.mdwn
new file mode 100644
index 000000000..b874df9a3
--- /dev/null
+++ b/doc/users/Stefano_Zacchiroli.mdwn
@@ -0,0 +1 @@
+<http://upsilon.cc/~zack>