Changeset Navigation

Changeset 13

Timestamp:

11/23/04 07:00:39

Author:

rdelon

Message:

Fixed ticket #29

Files:

r8	r13
23	23	if not newUrl.startswith('http://') and not newUrl.startswith('https://'):
24	24	# If newUrl is not canonical, we must make it canonical
25		if newUrl[0] == '/':
26		# URL was absolute: we just add the request.base in front of it
	25	if newUrl.startswith('/'):
	26	# newUrl was absolute:
	27	# we just add request.base in front of it
27	28	newUrl = cpg.request.base + newUrl
28	29	else:
29		# URL was relative
30		if cpg.request.browserUrl == cpg.request.base:
31		# browserUrl is request.base
32		newUrl = cpg.request.base + '/' + newUrl
33		else:
34		newUrl = cpg.request.browserUrl[:i+1] + newUrl
	30	# newUrl was relative:
	31	# we remove the last bit from browserUrl and add newUrl to it
	32	i = cpg.request.browserUrl.rfind('/')
	33	newUrl = cpg.request.browserUrl[:i+1] + newUrl
35	34	cpg.response.headerMap['Status'] = 302
36	35	cpg.response.headerMap['Location'] = newUrl