cvs: /php4/ext/session session.c

sas Sun Sep 12 08:27:12 1999 EDT Modified files: /php4/ext/session session.c Log: calculate length of cookie string correctly Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.46 php4/ext/session/session.c:1.47 --- php4/ext/session/session.c:1.46 Sun Sep 12 05:57:51 1999 +++ php4/ext/session/session.c Sun Sep 12 08:27:11 1999 @@ -76,7 +76,7 @@ PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL, NULL) PHP_INI_ENTRY("session.extern_referer_check", "", PHP_INI_ALL, NULL) PHP_INI_ENTRY("session.entropy_file", "", PHP_INI_ALL, NULL) - PHP_INI_ENTRY("session.entropy_length", "", PHP_INI_ALL, NULL) + PHP_INI_ENTRY("session.entropy_length", "0", PHP_INI_ALL, NULL) PHP_INI_END() PS_SERIALIZER_FUNCS(php); @@ -374,10 +374,11 @@ } cookie = ecalloc(len + 1, 1); - snprintf(cookie, len, COOKIE_FMT, PS(session_name), PS(id)); + len = snprintf(cookie, len, COOKIE_FMT, PS(session_name), PS(id)); if (PS(lifetime) > 0) { strcat(cookie, COOKIE_EXPIRES); strcat(cookie, date_fmt); + len += strlen(COOKIE_EXPIRES) + strlen(date_fmt); efree(date_fmt); }