# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1304950260 -7200
# Node ID 5290b5c586ec225eae4541f88ba9140451e3f362
# Parent  591d6ed3e1f4cdaefba9149c60cab91f16c91e1c
[etwist] fix bug w/ new resources concantenation and https-url enabled sites

diff -r 591d6ed3e1f4 -r 5290b5c586ec etwist/server.py
--- a/etwist/server.py	Mon May 09 12:47:49 2011 +0200
+++ b/etwist/server.py	Mon May 09 16:11:00 2011 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
@@ -99,8 +99,11 @@
 
     def getChild(self, path, request):
         if not path:
-            if request.uri.startswith(self.data_modconcat_basepath):
-                resource_relpath = request.uri[len(self.data_modconcat_basepath):]
+            uri = request.uri
+            if uri.startswith('/https/'):
+                uri = uri[6:]
+            if uri.startswith(self.data_modconcat_basepath):
+                resource_relpath = uri[len(self.data_modconcat_basepath):]
                 if resource_relpath:
                     paths = resource_relpath.split(',')
                     try: