Changeset 443

Timestamp:

11/02/06 14:09:07 (2 years ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r442	r443
1	1	2006-11-02 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* cherokee/server.c (update_bogo_now): It have to use "timezone"
	4	if the system doesn't support the gmtoff property.
	5
	6	* cherokee/main.c (BASIC_CONFIG): Now, it uses the new try_include
	7	keyword. The -r parameter should work even if /etc/cherokee is not
	8	in place.
	9
	10	* cherokee/config_node.c (cherokee_config_node_add): Added new
	11	"try_include" clause. If inclusion fails it'll okay.
2	12
3	13	* configure.in (HAVE_GNUTLS, HAVE_OPENSSL): There is no reason to
4	14	show such a fancy warning message is gnutls or openssl is not
5	15	found. Removed.
	16
	17	* configure.in: Added check for struct tm.tm_gmtoff
6	18
7	19	2006-11-01 Alvaro Lopez Ortega <alvaro@alobbs.com>

r385	r443
190	190	if (equal_str (key, "include")) {
191	191	return do_include (conf, val);
	192	} else if (equal_str (key, "try_include")) {
	193	do_include (conf, val);
192	194	}
193	195

r391	r443
55	55	"vserver!default!directory!/cherokee_themes!document_root = " CHEROKEE_THEMEDIR "\n" \
56	56	"vserver!default!directory!/cherokee_themes!priority = 3\n" \
57		"include = " CHEROKEE_CONFDIR "/mods-enabled\n"
	57	"try_include = " CHEROKEE_CONFDIR "/mods-enabled\n"
58	58
59	59	static cherokee_server_t *srv = NULL;

r441	r443
1064	1064	update_bogo_now (cherokee_server_t *srv)
1065	1065	{
1066		time_t newtime;
1067		static long *this_timezone = NULL;
	1066	char sign;
	1067	cuint_t offset;
	1068	time_t newtime;
1068	1069
1069	1070	/* Read the time
…	…
1080	1081	cherokee_localtime (&newtime, &srv->bogo_now_tm);
1081	1082
1082		/* Update time string
1083		*/
1084		if (unlikely (this_timezone == NULL))
1085		this_timezone = cherokee_get_timezone_ref();
	1083	#ifdef HAVE_STRUCT_TM_GMTOFF
	1084	sign = srv->bogo_now_tm.tm_gmtoff < 0 ? '-' : '+';
	1085	offset = abs(srv->bogo_now_tm.tm_gmtoff / 3600);
	1086	#else
	1087	sign = timezone < 0 ? '-' : '+';
	1088	offset = abs(timezone / 3600);
	1089	#endif
1086	1090
1087	1091	cherokee_buffer_clean (&srv->bogo_now_string);
…	…
1095	1099	srv->bogo_now_tm.tm_min,
1096	1100	srv->bogo_now_tm.tm_sec,
1097		srv->bogo_now_tm.tm_gmtoff < 0 ? '-' : '+',
1098		abs(srv->bogo_now_tm.tm_gmtoff / 3600));
	1101	sign, offset);
1099	1102
1100	1103	CHEROKEE_RWLOCK_UNLOCK (&srv->bogo_now_mutex); /* 2.- release */

r442	r443
26	26	m4_define([cherokee_minor_version], [6])
27	27	m4_define([cherokee_micro_version], [0])
28		m4_define([cherokee_patch_version], [b~~397~~])
	28	m4_define([cherokee_patch_version], [b442])
29	29	m4_define([cherokee_version], m4_format('%s.%s.%s%s', cherokee_major_version, cherokee_minor_version, cherokee_micro_version, cherokee_patch_version))
30	30
…	…
215	215	FW_CHECK_GRP
216	216
	217	AC_CHECK_MEMBER(struct tm.tm_gmtoff,
	218	AC_DEFINE([HAVE_STRUCT_TM_GMTOFF],[1],[gmtoff in struct tm]),,[#include <time.h>])
	219
217	220	AH_BOTTOM([
218	221	/* Give us an unsigned 32-bit data type. */