Handle whitespace control over templates using Windows end of line marker

1 files changed, 1 insertions, 0 deletions

diff --git a/bottle.py b/bottle.py
index 6b0bdeb..3e83add 100644
--- a/bottle.py
+++ b/bottle.py
@@ -3430,6 +3430,7 @@ class StplParser(object):
             prefix = text[pos:]
             lines = prefix.splitlines(True)
             if lines[-1].endswith('\\\\\n'): lines[-1] = lines[-1][:-3]
+            elif lines[-1].endswith('\\\\\r\n'): lines[-1] = lines[-1][:-4]
             parts.append(nl.join(map(repr, lines)))
         code = '_printlist((%s,))' % ', '.join(parts)
         self.lineno += code.count('\n')+1