haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 18:29:23 +00:00
Code Issues Releases Wiki Activity

Fixed bug in ccnet_server_addr when there is a '/' at end

Browse Source
This commit is contained in:
zhengxie
2013-01-08 11:47:46 +08:00
parent 74e13a7a7d
commit 078faaa57b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
thirdpart/seaserv/service.py
View File

@@ -78,11 +78,11 @@ if config.has_option('General', 'SERVICE_URL') and \
service_url = service_url.lstrip('http://').lstrip('https://') service_url = service_url.lstrip('http://').lstrip('https://')
if ':' in service_url: if ':' in service_url:
# strip http port such as ':8000' in 'http://192.168.1.101:8000' # strip http port such as ':8000' in 'http://192.168.1.101:8000'
idx = service_url.rindex(':') idx = service_url.index(':')
service_url = service_url[:idx] service_url = service_url[:idx]
if '/' in service_url: if '/' in service_url:
# strip url suffix like the '/seahub' part of www.gonggeng.org/seahub # strip url suffix like the '/seahub' part of www.gonggeng.org/seahub
idx = service_url.rindex('/') idx = service_url.index('/')
service_url = service_url[:idx] service_url = service_url[:idx]
CCNET_SERVER_ADDR = service_url CCNET_SERVER_ADDR = service_url
@@ -115,9 +115,13 @@ if config.has_option('httpserver', 'max_upload_size'):
pass pass
if CCNET_SERVER_ADDR: if CCNET_SERVER_ADDR:
enable_https = config.getboolean('httpserver', 'https') if \
config.has_option('httpserver', 'https') else False
http_or_https = 'https://' if enable_https else 'http://'
port = config.get('httpserver', 'port') if \ port = config.get('httpserver', 'port') if \
config.has_option('httpserver', 'port') else '8082' config.has_option('httpserver', 'port') else '8082'
HTTP_SERVER_ROOT = CCNET_SERVER_ADDR + ':' + port HTTP_SERVER_ROOT = http_or_https + CCNET_SERVER_ADDR + ':' + port
else: else:
HTTP_SERVER_ROOT = None HTTP_SERVER_ROOT = None