Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Move the JSON error cgi_reply() into fossil_print_error(). |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | jsonTestsPass |
| Files: | files | file ages | folders |
| SHA3-256: |
6131789870b2449cdb7269ef0680871f |
| User & Date: | mistachkin 2020-06-13 19:11:54.086 |
Context
|
2020-06-14
| ||
| 15:28 | Robustify a few things in the JSON subsystem integration and get JSON tests passing. check-in: a588e55fe7 user: mistachkin tags: trunk | |
|
2020-06-13
| ||
| 19:11 | Move the JSON error cgi_reply() into fossil_print_error(). Closed-Leaf check-in: 6131789870 user: mistachkin tags: jsonTestsPass | |
|
2020-06-12
| ||
| 23:12 | Merge updates from trunk. check-in: 7b16567772 user: mistachkin tags: jsonTestsPass | |
Changes
Changes to src/json.c.
| ︙ | ︙ | |||
1574 1575 1576 1577 1578 1579 1580 |
cgi_printf("%s(",g.json.jsonp);
}
cson_output( resp, cson_data_dest_cgi, NULL, &g.json.outOpt );
if( g.json.jsonp ){
cgi_append_content(")",1);
}
}
| < | 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 |
cgi_printf("%s(",g.json.jsonp);
}
cson_output( resp, cson_data_dest_cgi, NULL, &g.json.outOpt );
if( g.json.jsonp ){
cgi_append_content(")",1);
}
}
}else{
json_send_response(resp);
}
cson_value_free(resp);
}
/*
|
| ︙ | ︙ |
Changes to src/printf.c.
| ︙ | ︙ | |||
1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 |
** has not yet been initialized, e.g. early SQLite log
** messages, etc.
*/
if( !json_is_main_boostrapped() ) json_main_bootstrap();
json_err( 0, z, 1 );
if( g.isHTTP && !g.json.preserveRc ){
rc = 0 /* avoid HTTP 500 */;
}
}
else
#endif
if( g.cgiOutput==1 && g.db ){
g.cgiOutput = 2;
cgi_reset_content();
| > > > > | 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 |
** has not yet been initialized, e.g. early SQLite log
** messages, etc.
*/
if( !json_is_main_boostrapped() ) json_main_bootstrap();
json_err( 0, z, 1 );
if( g.isHTTP && !g.json.preserveRc ){
rc = 0 /* avoid HTTP 500 */;
}
if( g.cgiOutput==1 ){
g.cgiOutput = 2;
cgi_reply();
}
}
else
#endif
if( g.cgiOutput==1 && g.db ){
g.cgiOutput = 2;
cgi_reset_content();
|
| ︙ | ︙ |