2 files changed, 30 insertions, 0 deletions
diff --git a/source4/lib/appweb/ejs/ejs.h b/source4/lib/appweb/ejs/ejs.h
index 5efdb47192..c7b0c54d8e 100644
--- a/source4/lib/appweb/ejs/ejs.h
+++ b/source4/lib/appweb/ejs/ejs.h
@@ -71,6 +71,9 @@ extern void 	ejsClose(void);
 extern EjsId	ejsOpenEngine(EjsHandle primaryHandle, EjsHandle altHandle);
 extern void		ejsCloseEngine(EjsId eid);
 
+void *ejs_save_state(void);
+void ejs_restore_state(void *ptr);
+
 /*
  *	Evaluation functions
  */
diff --git a/source4/lib/appweb/ejs/ejsLib.c b/source4/lib/appweb/ejs/ejsLib.c
index b24b2b013c..f6c004592b 100644
--- a/source4/lib/appweb/ejs/ejsLib.c
+++ b/source4/lib/appweb/ejs/ejsLib.c
@@ -58,6 +58,33 @@ static void			*lockData;
 #define ejsUnlock()	
 #endif
 
+
+/*
+  save/restore global ejs state - used to cope with simultaneous ejs requests
+  this is a workaround for the use of global variables in ejs
+*/
+struct ejs_state_ctx {
+	struct MprVar master;
+	struct MprArray *ejsList;
+};
+
+void *ejs_save_state(void)
+{
+	struct ejs_state_ctx *ctx = talloc(talloc_autofree_context(), struct ejs_state_ctx);
+	ctx->master = master;
+	ctx->ejsList = ejsList;
+	return ctx;
+}
+
+void ejs_restore_state(void *ptr)
+{
+	struct ejs_state_ctx *ctx = talloc_get_type(ptr, struct ejs_state_ctx);
+	master = ctx->master;
+	ejsList = ctx->ejsList;
+	talloc_free(ctx);
+}
+
+
 /****************************** Forward Declarations **************************/
 
 static char	*getNextVarToken(char **next, char *tokBuf, int tokBufLen);