Changeset 6731

Timestamp:

11/29/07 09:47:47 (1 year ago)

Author:

mtredinnick

Message:

Fixed #1291 -- Fixed a potential infinite loop for some URL constructions in
the development server. Thanks, Graham Carlyle.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/views/static.py (modified) (1 diff)
• django/trunk/tests/regressiontests/views/tests/static.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -72 +72 @@
-    Trevor Caira <trevor@caira.com>
-    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
+    Graham Carlyle <graham.carlyle@maplecroft.net>
-    Antonio Cavedoni <http://cavedoni.com/>
-    C8E

django/trunk/django/views/static.py

@@ -34 +34 @@
-    # Clean up given path to only allow serving files below document_root.
-    path = posixpath.normpath(urllib.unquote(path))
+    path = path.lstrip('/')
-    newpath = ''
-    for part in path.split('/'):

django/trunk/tests/regressiontests/views/tests/static.py

@@ -14 +14 @@
-            file = open(path.join(media_dir, filename))
-            self.assertEquals(file.read(), response.content)
+
+    def test_copes_with_empty_path_component(self):
+        file_name = 'file.txt'
+        response = self.client.get('/views/site_media//%s' % file_name)
+        file = open(path.join(media_dir, file_name))
+        self.assertEquals(file.read(), response.content)
+        
+