Commit 46c2aebc authored by Oleksandr Shneyder's avatar Oleksandr Shneyder Committed by Mike Gabriel

Set default pack and link options to avoid damage of session…

Set default pack and link options to avoid damage of session (211_nxcomp_set_default_options.full+lite.patch).
parent 8c1b852a
Description: Set default pack and link options to avoid damage of session.
Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -8328,8 +8328,8 @@
cerr << "Error" << ": Can't identify 'link' option in string '"
<< value << "'.\n";
-
- return -1;
+ if (ParseLinkOption("adsl") < 0)
+ return -1;
}
}
else if (strcasecmp(name, "limit") == 0)
@@ -8783,8 +8783,8 @@
cerr << "Error" << ": Can't identify pack method for string '"
<< value << "'.\n";
-
- return -1;
+ if (ParsePackOption("nopack")<0)
+ return -1;
}
}
else if (strcasecmp(name, "core") == 0)
211_nxcomp_set_default_options.full+lite.patch
212_nxcomp_build-on-Android.full+lite.patch
220_nxproxy_bind-loopback-only.full+lite.patch
300_nxagent_set-wm-class.full.patch
......
......@@ -8328,8 +8328,8 @@ int ParseEnvironmentOptions(const char *env, int force)
cerr << "Error" << ": Can't identify 'link' option in string '"
<< value << "'.\n";
return -1;
if (ParseLinkOption("adsl") < 0)
return -1;
}
}
else if (strcasecmp(name, "limit") == 0)
......@@ -8783,8 +8783,8 @@ int ParseEnvironmentOptions(const char *env, int force)
cerr << "Error" << ": Can't identify pack method for string '"
<< value << "'.\n";
return -1;
if (ParsePackOption("nopack")<0)
return -1;
}
}
else if (strcasecmp(name, "core") == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment