Changeset 1858

Timestamp:

08/18/08 23:09:00 (3 months ago)

Author:

alo

Message:

Files:

cherokee/branches/0.8
- Property svnmerge-integrated changed from /cherokee/trunk:1-1826,1842,1854 to /cherokee/trunk:1-1826,1842,1854,1857

cherokee/branches/0.8/ChangeLog

r1856	r1858
1	1	2008-08-18 Alvaro Lopez Ortega <alvaro@alobbs.com>
2	2
	3	* cherokee/handler_dirlist.c: Adds a final slash whenever the list
	4	entry is a directory, so next request does go through a
	5	redirection reply.
	6
3	7	* cherokee/handler_dirlist.c: Fixes an issue redirecting
4	8	connections when the server does not run on the port 80.

r1856	r1858
809	809	ret_t ret;
810	810	cherokee_buffer_t *vtmp[2];
	811	cuint_t name_len;
811	812	cherokee_boolean_t is_dir;
812	813	cherokee_boolean_t is_link = false;
…	…
837	838	*/
838	839	alt = (is_dir) ? "[DIR]" : "[ ]";
	840	name_len = strlen(name);
839	841
840	842	if (props->show_icons) {
…	…
844	846	cherokee_buffer_t name_buf;
845	847
846		cherokee_buffer_fake (&name_buf, name, ~~strlen(name)~~);
	848	cherokee_buffer_fake (&name_buf, name, name_len);
847	849	ret = cherokee_icons_get_icon (icons, &name_buf, &icon);
848	850	if (ret != ret_ok)
…	…
865	867	*/
866	868	VTMP_SUBSTITUTE_TOKEN ("%file_name%", name);
867		VTMP_SUBSTITUTE_TOKEN ("%file_link%", name);
	869
	870	if (! is_dir) {
	871	VTMP_SUBSTITUTE_TOKEN ("%file_link%", name);
	872	} else {
	873	cherokee_buffer_clean (tmp);
	874	cherokee_buffer_add (tmp, name, name_len);
	875	cherokee_buffer_add_str (tmp, "/");
	876	VTMP_SUBSTITUTE_TOKEN ("%file_link%", tmp->buf);
	877	}
868	878
869	879	/* Date