diff options
| author | P. Christeas <p_christ@hol.gr> | 2010-10-12 14:20:30 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2010-10-12 14:20:30 +0300 |
| commit | 305b48abe3195f3a7d93852637c79228885d01a2 (patch) | |
| tree | 1782002878c3c703045053dc84e6c1906196dd60 /addons/document_webdav/webdav_server.py | |
| parent | 849548ccf167ead6755fc52d5baf4b43319436df (diff) | |
Document, calendar: Patch code from trunk-xrg branch
several fixes that hadn't been backported or applied correctly.
bzr revid: p_christ@hol.gr-20101012112030-snnb4fjkya4ndqkm
Diffstat (limited to 'addons/document_webdav/webdav_server.py')
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index 7e4bb69fa0a..548c9539b96 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -81,7 +81,14 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler): def setup(self): self.davpath = '/'+config.get_misc('webdav','vdir','webdav') - self.baseuri = "http://%s:%d/"% (self.server.server_name, self.server.server_port) + addr, port = self.server.server_name, self.server.server_port + server_proto = getattr(self.server,'proto', 'http').lower() + try: + addr, port = self.request.getsockname() + except Exception, e: + self.log_error("Cannot calculate own address:" , e) + # Too early here to use self.headers + self.baseuri = "%s://%s:%d/"% (server_proto, addr, port) self.IFACE_CLASS = openerp_dav_handler(self, self.verbose) def copymove(self, CLASS): |