Fossil SCM
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].
Commit
e0b51eb2e76b31fe4562fe2ab66cf62942e02b542e0710dd2658be25f54ce73b
Parent
67d79d23e1929ee…
1 file changed
+1
+1
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -67,10 +67,11 @@ | ||
| 67 | 67 | rc = 0; |
| 68 | 68 | }else if(0==strncmp("/json",zPathInfo,5) |
| 69 | 69 | && (zPathInfo[5]==0 || zPathInfo[5]=='/')){ |
| 70 | 70 | rc = 1; |
| 71 | 71 | }else if(g.zCmdName!=0 && (0==strcmp("server",g.zCmdName) |
| 72 | + || 0==strcmp("ui",g.zCmdName) | |
| 72 | 73 | || 0==strcmp("cgi",g.zCmdName)) ){ |
| 73 | 74 | /* When running in server/cgi "directory" mode, zPathInfo is |
| 74 | 75 | ** prefixed with the repository's name, so in order to determine |
| 75 | 76 | ** whether or not we're really running in json mode we have to try |
| 76 | 77 | ** a bit harder. Problem reported here: |
| 77 | 78 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -67,10 +67,11 @@ | |
| 67 | rc = 0; |
| 68 | }else if(0==strncmp("/json",zPathInfo,5) |
| 69 | && (zPathInfo[5]==0 || zPathInfo[5]=='/')){ |
| 70 | rc = 1; |
| 71 | }else if(g.zCmdName!=0 && (0==strcmp("server",g.zCmdName) |
| 72 | || 0==strcmp("cgi",g.zCmdName)) ){ |
| 73 | /* When running in server/cgi "directory" mode, zPathInfo is |
| 74 | ** prefixed with the repository's name, so in order to determine |
| 75 | ** whether or not we're really running in json mode we have to try |
| 76 | ** a bit harder. Problem reported here: |
| 77 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -67,10 +67,11 @@ | |
| 67 | rc = 0; |
| 68 | }else if(0==strncmp("/json",zPathInfo,5) |
| 69 | && (zPathInfo[5]==0 || zPathInfo[5]=='/')){ |
| 70 | rc = 1; |
| 71 | }else if(g.zCmdName!=0 && (0==strcmp("server",g.zCmdName) |
| 72 | || 0==strcmp("ui",g.zCmdName) |
| 73 | || 0==strcmp("cgi",g.zCmdName)) ){ |
| 74 | /* When running in server/cgi "directory" mode, zPathInfo is |
| 75 | ** prefixed with the repository's name, so in order to determine |
| 76 | ** whether or not we're really running in json mode we have to try |
| 77 | ** a bit harder. Problem reported here: |
| 78 |