aboutsummaryrefslogtreecommitdiffstats
path: root/main/manager.c
diff options
context:
space:
mode:
authorpari <pari@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-17 23:09:53 +0000
committerpari <pari@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-17 23:09:53 +0000
commitafa1e547c7e6a16d54fdbadf42efccffed5e2a19 (patch)
tree451696f468a4906ccdb6237559ac7bb546338ac3 /main/manager.c
parent37d625d3a31eeff735c2f1d983dc38d8d438f8e4 (diff)
reverting 99001 - We need the Max-Age for extending the life of cookie mansession_id
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@99007 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/main/manager.c b/main/manager.c
index 1b1687408..bc342cf42 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2639,7 +2639,6 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co
char *c = workspace;
char *retval = NULL;
struct ast_variable *v;
- unsigned int new_session = 0;
for (v = params; v; v = v->next) {
if (!strcasecmp(v->name, "mansession_id")) {
@@ -2671,7 +2670,6 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co
ast_atomic_fetchadd_int(&s->eventq->usecount, 1);
ast_atomic_fetchadd_int(&num_sessions, 1);
AST_LIST_UNLOCK(&sessions);
- new_session = 1;
}
/* Reset HTTP timeout. If we're not yet authenticated, keep it extremely short */
@@ -2712,10 +2710,8 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co
s->needdestroy = 1;
}
ast_build_string(&c, &len, "Content-type: text/%s\r\n", contenttype[format]);
- if (new_session) {
- sprintf(tmp, "%08lx", s->managerid);
- ast_build_string(&c, &len, "%s\r\n", ast_http_setcookie("mansession_id", tmp, httptimeout, cookie, sizeof(cookie)));
- }
+ sprintf(tmp, "%08lx", s->managerid);
+ ast_build_string(&c, &len, "%s", ast_http_setcookie("mansession_id", tmp, httptimeout, cookie, sizeof(cookie)));
if (format == FORMAT_HTML)
ast_build_string(&c, &len, "<title>Asterisk&trade; Manager Interface</title>");
if (format == FORMAT_XML) {