Changeset 615

Timestamp:

01/16/07 22:53:25 (2 years ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r614	r615
1	1	2007-01-16 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* contrib/05to06.py (Syntax._process_virtual_server_content):
	4	error_handler fixed. It wasn't adding the handler.
	5
	6	* contrib/05to06.py (Syntax._process_entry_guts): Handler /
	7	Balancer conversion fixed. It was using of notation.
	8
	9	* contrib/05to06.py (Syntax): It must translate DirectoryIndex
	10	into directory_index. Fixed.
2	11
3	12	* contrib/05to06.py (Syntax._process_entry_guts): Allow from

r614	r615
61	61	'sslcertificatefile': 'ssl_certificate_file',
62	62	'sslcertificatekeyfile': 'ssl_certificate_key_file',
63		'sslcalistfile': 'ssl_cal_list_file'
	63	'sslcalistfile': 'ssl_cal_list_file',
	64	'directoryindex': 'directory_index'
64	65	}
65	66
…	…
93	94	elif kind == 'server':
94	95	kind, val_prop_val = self._lex.get_token()
95		print '%s!handler!server = %s' % (prefix, val_prop_val)
	96	print '%s!handler!balancer = round_robin' % (prefix)
	97	print '%s!handler!balancer!type= interpreter' % (prefix)
	98	print '%s!handler!balancer!entry1!host = %s' % (prefix, val_prop_val)
96	99
97	100	kind, val = self._lex.get_token()
…	…
110	113	if val == 'env':
111	114	kind_prop_val, val_prop_val = self._lex.get_token()
112		print "%s!handler!~~server~~!env!%s = %s" % (prefix, val_prop, val_prop_val)
	115	print "%s!handler!balancer!entry1!env!%s = %s" % (prefix, val_prop, val_prop_val)
113	116
114	117	else:
115		print "%s!handler!~~server~~!%s = %s" % (prefix, val, val_prop)
	118	print "%s!handler!balancer!entry1!%s = %s" % (prefix, val, val_prop)
116	119	continue
117	120
…	…
141	144	regex_num = regex_num + 1
142	145	continue
	146
143	147
144	148	# Default case
…	…
422	426
423	427	prefix = 'vserver!%s!error_handler' % (vserver)
	428	print "%s = %s" % (prefix, handler_val)
424	429
425	430	while True: