diff --git a/winixd/core/app.cpp b/winixd/core/app.cpp index ef30631..308bb8c 100644 --- a/winixd/core/app.cpp +++ b/winixd/core/app.cpp @@ -750,7 +750,7 @@ void App::CreateJSONAnswer() if( !req.return_info_only ) { - json_out_stream << L"{\n\"out\": {\n"; + json_out_stream << L"{\n\"frames\": {\n"; auto i = req.out_streams.streams_map.begin(); bool is_first = true; diff --git a/winixd/core/config.cpp b/winixd/core/config.cpp index aa99f40..72345d8 100644 --- a/winixd/core/config.cpp +++ b/winixd/core/config.cpp @@ -309,7 +309,7 @@ void Config::AssignValues(bool stdout_is_closed) incorrect_login_cannot_login_delay = Size(L"incorrect_login_cannot_login_delay", 1800); pid_file = Text(L"pid_file", L""); - allow_ezc_out_in_executable_items = Bool(L"allow_ezc_out_in_executable_items", false); + allow_ezc_frames_in_executable_items = Bool(L"allow_ezc_frames_in_executable_items", false); check_proxy_ip_header = Bool(L"check_proxy_ip_header", false); proxy_ip_header = Text(L"proxy_ip_header", L"X_Real_IP"); diff --git a/winixd/core/config.h b/winixd/core/config.h index ec952ac..55f1805 100644 --- a/winixd/core/config.h +++ b/winixd/core/config.h @@ -638,7 +638,7 @@ public: // how many output streams do we have in Request class // those streams used in ajax responses - // you can use no more [ezc out] statements than this limit + // you can use no more [ezc frames] statements than this limit // default: 128 size_t ezc_out_streams_size; @@ -758,10 +758,10 @@ public: // pid file is saved after winix has dropped privileges std::wstring pid_file; - // allow to use [ezc out] statement in executable items (used in 'run' winix function) + // allow to use [ezc frame] statements in executable items (used in 'run' winix function) // default false // warning: if you enable this options a user can override a different output stream when using ajax - bool allow_ezc_out_in_executable_items; + bool allow_ezc_frames_in_executable_items; // check whether there is a 'log_proxy_ip_header' header diff --git a/winixd/html/fun_createthread.html b/winixd/html/fun_createthread.html index 4108bf4..63da5b6 100644 --- a/winixd/html/fun_createthread.html +++ b/winixd/html/fun_createthread.html @@ -3,7 +3,7 @@