X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=b1f300db6c1ccd527e7556d1609d369befb78b43;hb=ceb2e567b5f26ff148fbc0e9526f7e7e99464000;hp=a1c750b4e72e42e6d0ea90fa78bf5cd7507ad430;hpb=28158192742ead144454e071720d10bf5218a20b;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index a1c750b4..b1f300db 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -44,13 +44,11 @@
 
 static char empty_string[] = "";
 
-static const char uuid_header[] = "x-afb-uuid";
-static const char uuid_arg[] = "uuid";
-static const char uuid_cookie[] = "uuid";
+static const char key_for_uuid[] = "x-afb-uuid";
+static const char old_key_for_uuid[] = "uuid";
 
-static const char token_header[] = "x-afb-token";
-static const char token_arg[] = "token";
-static const char token_cookie[] = "token";
+static const char key_for_token[] = "x-afb-token";
+static const char old_key_for_token[] = "token";
 
 static char *cookie_name = NULL;
 static char *cookie_setter = NULL;
@@ -708,17 +706,19 @@ int afb_hreq_init_context(struct afb_hreq *hreq)
 	if (hreq->context.session != NULL)
 		return 0;
 
-	uuid = afb_hreq_get_header(hreq, uuid_header);
+	uuid = afb_hreq_get_header(hreq, key_for_uuid);
 	if (uuid == NULL)
-		uuid = afb_hreq_get_argument(hreq, uuid_arg);
+		uuid = afb_hreq_get_argument(hreq, key_for_uuid);
 	if (uuid == NULL)
 		uuid = afb_hreq_get_cookie(hreq, cookie_name);
+	if (uuid == NULL)
+		uuid = afb_hreq_get_argument(hreq, old_key_for_uuid);
 
-	token = afb_hreq_get_header(hreq, token_header);
+	token = afb_hreq_get_header(hreq, key_for_token);
 	if (token == NULL)
-		token = afb_hreq_get_argument(hreq, token_arg);
+		token = afb_hreq_get_argument(hreq, key_for_token);
 	if (token == NULL)
-		token = afb_hreq_get_cookie(hreq, token_cookie);
+		token = afb_hreq_get_argument(hreq, old_key_for_token);
 
 	return afb_context_connect(&hreq->context, uuid, token);
 }
@@ -733,7 +733,7 @@ int afb_hreq_init_cookie(int port, const char *path, int maxage)
 	cookie_setter = NULL;
 
 	path = path ? : "/";
-	rc = asprintf(&cookie_name, "x-afb-uuid-%d", port);
+	rc = asprintf(&cookie_name, "%s-%d", key_for_uuid, port);
 	if (rc < 0)
 		return 0;
 	rc = asprintf(&cookie_setter, "%s=%%s; Path=%s; Max-Age=%d; HttpOnly",