updated to the new pikotools api: [ezc out] and [out] changed to [ezc frame] or just [frame]
- when returning json streams changed "out" field to "frames" - renamed config parameter: allow_ezc_out_in_executable_items -> allow_ezc_frames_in_executable_items - added basic support for ajax requests in thread plugin
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user