github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core/Rpc: No retries of HTTP request allowed, CodeEditor: .cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7789 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-10-16 12:51:33 +00:00
parent 1e4ecabf87
commit 5e9ba51b1b
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/CodeEditor/LogSyntax.cpp
View file

@ -53,7 +53,8 @@ void LogSyntax::Highlight(const wchar *s, const wchar *end, HighlightOutput& hls
hl_line = hl_line || hl;
}
else {
bool hl = findarg(c, '[', ']', '(', ')', ':', '-', '=', '{', '}', '/', '<', '>', '*', '#', '@') >= 0;
bool hl = findarg(c, '[', ']', '(', ')', ':', '-', '=', '{', '}', '/', '<', '>', '*',
'#', '@', '\\', '.') >= 0
hls.Put(1, hl ? hl_style[INK_OPERATOR] : ink);
s++;
}

1
uppsrc/Core/Http.cpp
View file

@ -396,6 +396,7 @@ bool HttpRequest::Do()
}
if(phase == FAILED) {
DDUMP(max_retries);
if(retry_count++ < max_retries) {
LLOGS("HTTP retry on error " << GetErrorDesc());
start_time = msecs();

1
uppsrc/Core/Rpc/Client.cpp
View file

@ -35,6 +35,7 @@ void RpcRequest::Init()
{
ContentType("text/xml");
RequestTimeout(30000);
MaxRetries(0);
json = false;
}