tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle use in a subdir. Patch from Clint Adams <clint@softwarefreedom.org> adapted from http://redmine.kozea.fr/issues/996

Browse Source
This commit is contained in:
Fabrice Bellet 2012-10-22 12:44:42 +02:00 committed by Vincent Untz
parent b6b48b5af7
commit 54bda5594c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config
View File

@ -27,7 +27,8 @@ certificate = /etc/apache2/ssl/server.crt
key = /etc/apache2/ssl/server.key key = /etc/apache2/ssl/server.key
# Reverse DNS to resolve client address in logs # Reverse DNS to resolve client address in logs
dns_lookup = True dns_lookup = True
# base URL if / is not the CalDAV root
base_prefix =
[encoding] [encoding]
# Encoding for responding requests # Encoding for responding requests

3
radicale/config.py
View File

@ -45,7 +45,8 @@ INITIAL_CONFIG = {
"ssl": "False", "ssl": "False",
"certificate": "/etc/apache2/ssl/server.crt", "certificate": "/etc/apache2/ssl/server.crt",
"key": "/etc/apache2/ssl/server.key", "key": "/etc/apache2/ssl/server.key",
"dns_lookup": "True"}, "dns_lookup": "True",
"base_prefix": ""},
"encoding": { "encoding": {
"request": "utf-8", "request": "utf-8",
"stock": "utf-8"}, "stock": "utf-8"},

1
radicale/xmlutils.py
View File

@ -227,6 +227,7 @@ def _propfind_response(path, item, props, user):
href = ET.Element(_tag("D", "href")) href = ET.Element(_tag("D", "href"))
uri = item.url if is_collection else "%s/%s" % (path, item.name) uri = item.url if is_collection else "%s/%s" % (path, item.name)
uri = "%s/%s" % (config.get("server", "base_prefix"), uri)
href.text = uri.replace("//", "/") href.text = uri.replace("//", "/")
response.append(href) response.append(href)