From: Kevin P. Fleming Date: Thu, 17 Jan 2008 21:31:56 +0000 (+0000) Subject: we should only send the Set-Cookie header to the browser on the first response after... X-Git-Tag: 1.4.18~12^2~39 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af7670bca8e6440b810034d1482f6c0beb9e5131;p=thirdparty%2Fasterisk.git we should only send the Set-Cookie header to the browser on the first response after creating a manager session, not on every response (doing so causes the browser to clear any local cookies it may have associated with the session) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99001 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/manager.c b/main/manager.c index 8e33096675..1b16874086 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2639,6 +2639,7 @@ 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")) { @@ -2670,6 +2671,7 @@ 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 */ @@ -2710,8 +2712,10 @@ 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]); - sprintf(tmp, "%08lx", s->managerid); - ast_build_string(&c, &len, "%s\r\n", ast_http_setcookie("mansession_id", tmp, httptimeout, cookie, sizeof(cookie))); + 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))); + } if (format == FORMAT_HTML) ast_build_string(&c, &len, "Asterisk™ Manager Interface"); if (format == FORMAT_XML) {