Updates after Seb's feedback #2

livecodepanos · livecodepanos · commit f46276355771 · 2013-09-19T16:45:12.000+01:00
diff --git a/engine/src/srvcgi.cpp b/engine/src/srvcgi.cpp
@@ -1519,14 +1519,14 @@ bool MCServerStartSession()
 
 	MCAutoStringRef t_session_id;
 	MCAutoStringRef t_cookie_id;
-	
-	/* UNCHECKED */ MCStringCreateWithCString(MCsessionid, &t_session_id);
-	
-	if (*t_session_id == nil)
+
+	if (MCsessionid == nil)
 	{
 		t_success = MCServerGetSessionIdFromCookie(&t_cookie_id);
-		t_session_id = t_cookie_id;
+		t_session_id = *t_cookie_id;
 	}
+	else
+		/* UNCHECKED */ MCStringCreateWithCString(MCsessionid, &t_session_id);
 	
 	if (t_success)
 	{
diff --git a/engine/src/srvoutput.cpp b/engine/src/srvoutput.cpp
@@ -496,13 +496,13 @@ bool MCServerSetCookie(MCStringRef p_name, MCStringRef p_value, uint32_t p_expir
 	
 	if (t_success && MCStringGetLength(p_name) != 0 && MCStringGetLength(p_path) != 0 && MCStringGetLength(p_domain) != 0)
 		t_success = true;
-		
+	
+	MCAutoStringRef t_encoded;
 	if (t_success && MCStringGetLength(p_value) != 0)
 	{
 		MCExecPoint ep;
 		ep.setsvalue(MCStringGetCString(p_value));
 		MCU_urlencode(ep);
-		MCAutoStringRef t_encoded;
 		t_success = ep .copyasstringref(&t_encoded);
 	//	p_value = MCValueRetain(*t_encoded);
 

Original file line number	Diff line number	Diff line change
`@@ -1519,14 +1519,14 @@ bool MCServerStartSession()`
`1519`	`1519`
`1520`	`1520`	`MCAutoStringRef t_session_id;`
`1521`	`1521`	`MCAutoStringRef t_cookie_id;`
`1522`		`-`
`1523`		`- /* UNCHECKED */ MCStringCreateWithCString(MCsessionid, &t_session_id);`
`1524`		`-`
`1525`		`- if (*t_session_id == nil)`
	`1522`	`+`
	`1523`	`+ if (MCsessionid == nil)`
`1526`	`1524`	`{`
`1527`	`1525`	`t_success = MCServerGetSessionIdFromCookie(&t_cookie_id);`
`1528`		`- t_session_id = t_cookie_id;`
	`1526`	`+ t_session_id = *t_cookie_id;`
`1529`	`1527`	`}`
	`1528`	`+ else`
	`1529`	`+ /* UNCHECKED */ MCStringCreateWithCString(MCsessionid, &t_session_id);`
`1530`	`1530`
`1531`	`1531`	`if (t_success)`
`1532`	`1532`	`{`