Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
46c2aebc
Commit
46c2aebc
authored
Feb 10, 2015
by
Oleksandr Shneyder
Committed by
Mike Gabriel
Feb 10, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
32 deletions
+4
-32
211_nxcomp_set_default_options.full+lite.patch
...an/patches/211_nxcomp_set_default_options.full+lite.patch
+0
-27
series
debian/patches/series
+0
-1
Loop.cpp
nxcomp/Loop.cpp
+4
-4
No files found.
debian/patches/211_nxcomp_set_default_options.full+lite.patch
deleted
100644 → 0
View file @
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)
debian/patches/series
View file @
46c2aebc
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
...
...
nxcomp/Loop.cpp
View file @
46c2aebc
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment