Always commit the session fast to allow other consumers to proceed to their requests. This unbreaks now the lock up the GUI had allowing only one action from same source per time. Now even if you run a command that blocks indefinitely for example the GUI want lock anymore but allow you to proceed to other actions

1 files changed, 8 insertions, 1 deletions

diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index dc57b41..1647d7d 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -497,15 +497,22 @@ function write_config($desc="Unknown", $backup = true) {
 		log_error("WARNING! Configuration written on bootup.  This can cause stray openvpn and load balancing items in config.xml");
 	*/
 
+	if (!session_id())
+		session_start();
 	if (!empty($_SESSION['Username']) && ($_SESSION['Username'] != "admin")) {
 		$user = getUserEntry($_SESSION['Username']);
-		if (is_array($user) && userHasPrivilege($user, "user-config-readonly"))
+		if (is_array($user) && userHasPrivilege($user, "user-config-readonly")) {
+			session_commit();
 			return false;
+		}
 	}
+
 	$username = empty($_SESSION["Username"]) ? "(system)" : $_SESSION['Username'];
 	if (!empty($_SERVER['REMOTE_ADDR']))
 		$username .= '@' . $_SERVER['REMOTE_ADDR'];
 
+	session_commit();
+
 	if($backup)
 		backup_config();