Fossil SCM
Fix a redirect loop problem for the /home URL. Ticket [77dc5de6397fb18c0fbad]
Commit
135fcbbb052bd5a1817383127df5e634f9326b08
Parent
2ceeeca19dfea6e…
1 file changed
+4
-3
+4
-3
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -81,21 +81,22 @@ | ||
| 81 | 81 | */ |
| 82 | 82 | void home_page(void){ |
| 83 | 83 | char *zPageName = db_get("project-name",0); |
| 84 | 84 | char *zIndexPage = db_get("index-page",0); |
| 85 | 85 | login_check_credentials(); |
| 86 | - if( !g.okRdWiki ){ | |
| 87 | - cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL); | |
| 88 | - } | |
| 89 | 86 | if( zIndexPage ){ |
| 90 | 87 | const char *zPathInfo = P("PATH_INFO"); |
| 91 | 88 | while( zIndexPage[0]=='/' ) zIndexPage++; |
| 89 | + while( zPathInfo[0]=='/' ) zPathInfo++; | |
| 92 | 90 | if( strcmp(zIndexPage, zPathInfo)==0 ) zIndexPage = 0; |
| 93 | 91 | } |
| 94 | 92 | if( zIndexPage ){ |
| 95 | 93 | cgi_redirectf("%s/%s", g.zBaseURL, zIndexPage); |
| 96 | 94 | } |
| 95 | + if( !g.okRdWiki ){ | |
| 96 | + cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL); | |
| 97 | + } | |
| 97 | 98 | if( zPageName ){ |
| 98 | 99 | login_check_credentials(); |
| 99 | 100 | g.zExtra = zPageName; |
| 100 | 101 | cgi_set_parameter_nocopy("name", g.zExtra); |
| 101 | 102 | g.isHome = 1; |
| 102 | 103 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -81,21 +81,22 @@ | |
| 81 | */ |
| 82 | void home_page(void){ |
| 83 | char *zPageName = db_get("project-name",0); |
| 84 | char *zIndexPage = db_get("index-page",0); |
| 85 | login_check_credentials(); |
| 86 | if( !g.okRdWiki ){ |
| 87 | cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL); |
| 88 | } |
| 89 | if( zIndexPage ){ |
| 90 | const char *zPathInfo = P("PATH_INFO"); |
| 91 | while( zIndexPage[0]=='/' ) zIndexPage++; |
| 92 | if( strcmp(zIndexPage, zPathInfo)==0 ) zIndexPage = 0; |
| 93 | } |
| 94 | if( zIndexPage ){ |
| 95 | cgi_redirectf("%s/%s", g.zBaseURL, zIndexPage); |
| 96 | } |
| 97 | if( zPageName ){ |
| 98 | login_check_credentials(); |
| 99 | g.zExtra = zPageName; |
| 100 | cgi_set_parameter_nocopy("name", g.zExtra); |
| 101 | g.isHome = 1; |
| 102 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -81,21 +81,22 @@ | |
| 81 | */ |
| 82 | void home_page(void){ |
| 83 | char *zPageName = db_get("project-name",0); |
| 84 | char *zIndexPage = db_get("index-page",0); |
| 85 | login_check_credentials(); |
| 86 | if( zIndexPage ){ |
| 87 | const char *zPathInfo = P("PATH_INFO"); |
| 88 | while( zIndexPage[0]=='/' ) zIndexPage++; |
| 89 | while( zPathInfo[0]=='/' ) zPathInfo++; |
| 90 | if( strcmp(zIndexPage, zPathInfo)==0 ) zIndexPage = 0; |
| 91 | } |
| 92 | if( zIndexPage ){ |
| 93 | cgi_redirectf("%s/%s", g.zBaseURL, zIndexPage); |
| 94 | } |
| 95 | if( !g.okRdWiki ){ |
| 96 | cgi_redirectf("%s/login?g=%s/home", g.zBaseURL, g.zBaseURL); |
| 97 | } |
| 98 | if( zPageName ){ |
| 99 | login_check_credentials(); |
| 100 | g.zExtra = zPageName; |
| 101 | cgi_set_parameter_nocopy("name", g.zExtra); |
| 102 | g.isHome = 1; |
| 103 |