Merge branch 'develop' of https://github.com/clicon/clixon into develop

This commit is contained in:
Olof hagsand 2018-02-25 20:02:55 +01:00
commit e9b61d4ed7
2 changed files with 7 additions and 0 deletions

View file

@ -1,6 +1,10 @@
# Clixon Changelog
## 3.6.0 (Upcoming)
### Major changes:
### Minor changes:
### Corrected Bugs
* Translate xml->json \n correctly
### Major changes:
### Minor changes:

View file

@ -216,6 +216,9 @@ json_str_escape(char *str)
for (i=0;i<strlen(str);i++)
switch (str[i]){
case '\n':
snew[j++]='\\';
snew[j++]='n';
break;
case '\"':
case '\\':
snew[j++]='\\';