Fossil

Check-in [e0b51eb2]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Extended [dd490d17bec777c4] to also apply to the 'ui' command to resolve a JSON-mode assertion which happens when running ui --repolist reported at https://fossil-scm.org/forum/forumpost/2cc2bbd4a2.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e0b51eb2e76b31fe4562fe2ab66cf62942e02b542e0710dd2658be25f54ce73b
User & Date: stephan 2021-01-02 02:56:36
References
2021-01-02
05:26
Extended the is-json-mode check in [e0b51eb2e7] to include the 'http' command when looking for repolist-style paths. ... (check-in: bc593ea0 user: stephan tags: trunk)
Context
2021-01-02
03:06
Updated link to the public JSON API docs. ... (check-in: acda62f5 user: stephan tags: trunk)
02:56
Extended [dd490d17bec777c4] to also apply to the 'ui' command to resolve a JSON-mode assertion which happens when running ui --repolist reported at https://fossil-scm.org/forum/forumpost/2cc2bbd4a2. ... (check-in: e0b51eb2 user: stephan tags: trunk)
2021-01-01
22:07
Update the built-in SQLite to the latest 3.35.0 alpha which features faster startup time. ... (check-in: 67d79d23 user: drh tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/json.c.

65
66
67
68
69
70
71

72
73
74
75
76
77
78
  int rc = 0;
  if(zPathInfo==0){
    rc = 0;
  }else if(0==strncmp("/json",zPathInfo,5)
           && (zPathInfo[5]==0 || zPathInfo[5]=='/')){
    rc = 1;
  }else if(g.zCmdName!=0 && (0==strcmp("server",g.zCmdName)

                             || 0==strcmp("cgi",g.zCmdName)) ){
    /* When running in server/cgi "directory" mode, zPathInfo is
    ** prefixed with the repository's name, so in order to determine
    ** whether or not we're really running in json mode we have to try
    ** a bit harder. Problem reported here:
    ** https://fossil-scm.org/forum/forumpost/e4953666d6
    */







>







65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
  int rc = 0;
  if(zPathInfo==0){
    rc = 0;
  }else if(0==strncmp("/json",zPathInfo,5)
           && (zPathInfo[5]==0 || zPathInfo[5]=='/')){
    rc = 1;
  }else if(g.zCmdName!=0 && (0==strcmp("server",g.zCmdName)
                             || 0==strcmp("ui",g.zCmdName)
                             || 0==strcmp("cgi",g.zCmdName)) ){
    /* When running in server/cgi "directory" mode, zPathInfo is
    ** prefixed with the repository's name, so in order to determine
    ** whether or not we're really running in json mode we have to try
    ** a bit harder. Problem reported here:
    ** https://fossil-scm.org/forum/forumpost/e4953666d6
    */