Fossil SCM
Permit the --notfound and --repolist options to be used together.
Commit
fd783e2b6a76bae642f5f5a4908186aa35ff5de6
Parent
8ab3f62090095da…
1 file changed
+3
-3
+3
-3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1563,16 +1563,16 @@ | ||
| 1563 | 1563 | zRepo[j] = '.'; |
| 1564 | 1564 | } |
| 1565 | 1565 | |
| 1566 | 1566 | if( szFile<1024 ){ |
| 1567 | 1567 | set_base_url(0); |
| 1568 | - if( zNotFound ){ | |
| 1569 | - cgi_redirect(zNotFound); | |
| 1570 | - }else if( strcmp(zPathInfo,"/")==0 | |
| 1568 | + if( strcmp(zPathInfo,"/")==0 | |
| 1571 | 1569 | && allowRepoList |
| 1572 | 1570 | && repo_list_page() ){ |
| 1573 | 1571 | /* Will return a list of repositories */ |
| 1572 | + }else if( zNotFound ){ | |
| 1573 | + cgi_redirect(zNotFound); | |
| 1574 | 1574 | }else{ |
| 1575 | 1575 | #ifdef FOSSIL_ENABLE_JSON |
| 1576 | 1576 | if(g.json.isJsonMode){ |
| 1577 | 1577 | json_err(FSL_JSON_E_RESOURCE_NOT_FOUND,NULL,1); |
| 1578 | 1578 | return; |
| 1579 | 1579 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1563,16 +1563,16 @@ | |
| 1563 | zRepo[j] = '.'; |
| 1564 | } |
| 1565 | |
| 1566 | if( szFile<1024 ){ |
| 1567 | set_base_url(0); |
| 1568 | if( zNotFound ){ |
| 1569 | cgi_redirect(zNotFound); |
| 1570 | }else if( strcmp(zPathInfo,"/")==0 |
| 1571 | && allowRepoList |
| 1572 | && repo_list_page() ){ |
| 1573 | /* Will return a list of repositories */ |
| 1574 | }else{ |
| 1575 | #ifdef FOSSIL_ENABLE_JSON |
| 1576 | if(g.json.isJsonMode){ |
| 1577 | json_err(FSL_JSON_E_RESOURCE_NOT_FOUND,NULL,1); |
| 1578 | return; |
| 1579 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1563,16 +1563,16 @@ | |
| 1563 | zRepo[j] = '.'; |
| 1564 | } |
| 1565 | |
| 1566 | if( szFile<1024 ){ |
| 1567 | set_base_url(0); |
| 1568 | if( strcmp(zPathInfo,"/")==0 |
| 1569 | && allowRepoList |
| 1570 | && repo_list_page() ){ |
| 1571 | /* Will return a list of repositories */ |
| 1572 | }else if( zNotFound ){ |
| 1573 | cgi_redirect(zNotFound); |
| 1574 | }else{ |
| 1575 | #ifdef FOSSIL_ENABLE_JSON |
| 1576 | if(g.json.isJsonMode){ |
| 1577 | json_err(FSL_JSON_E_RESOURCE_NOT_FOUND,NULL,1); |
| 1578 | return; |
| 1579 |