[Cvs-annodex] commit (annodex): cmmlwiki/trunk/cmmlwiki/request.py

[conrad]

Update of /var/local/lib/svn/annodex (new revision 2387)

Modified files:
   cmmlwiki/trunk/cmmlwiki/request.py

Log Message:
Work around a bug in Cortado, where it tries to access plugins.in as
com/fluendo/jst/plugins.ini on the remote host, as described at:

  https://core.fluendo.com/flumotion/trac/ticket/387

The workaround is to ensure that HTTP Status 404 is returned by cmmlwiki for
that path. If 200 OK is returned, then Cortado fails (fairly) silently.


Modified: cmmlwiki/trunk/cmmlwiki/request.py
===================================================================
--- cmmlwiki/trunk/cmmlwiki/request.py	2006-08-17 03:25:32 UTC (rev 2386)
+++ cmmlwiki/trunk/cmmlwiki/request.py	2006-08-17 06:32:54 UTC (rev 2387)
@@ -29,6 +29,8 @@
 from cmmlwiki.story import Story, StoryEdit, StoryList
 import cmmlwiki.story as story
 
+from cmmlwiki.http404 import HTTP404
+
 from cmmlwiki.userprofile import UserProfile
 
 class Request(object):
@@ -38,6 +40,12 @@
     if (path_info == None or path_info == '' or path_info == '/'):
         path0 = ""
         ext = ""
+        o = None
+
+    # Workaround a bug in Cortado
+    elif (path_info == "/com/fluendo/jst/plugins.ini"):
+        o = HTTP404()
+
     else:
         try:
             # Strip leading '/' from PATH_INFO, split off extension
@@ -49,7 +57,7 @@
             path0 = ""
             ext = ""
 
-    o = redirect (path0, ext)
+        o = redirect (path0, ext)
 
     if (not o):
         cmd_bits = split (path0, ':')


-- 
conrad