Fossil SCM
Honor the --baseurl command-line option in scgi mode.
Commit
3eb0594c9eabe321384ea0df2283057046f9077d
Parent
4ae42e363c585f7…
1 file changed
+5
+5
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -1522,10 +1522,15 @@ | ||
| 1522 | 1522 | break; |
| 1523 | 1523 | } |
| 1524 | 1524 | if( szFile==0 ){ |
| 1525 | 1525 | if( zRepo[0]=='/' && zRepo[1]=='/' ){ zRepo++; j--; } |
| 1526 | 1526 | szFile = file_size(zRepo); |
| 1527 | + /* this should only be set from the --baseurl option, not CGI */ | |
| 1528 | + if( g.zBaseURL && g.zBaseURL[0]!=0 && g.zTop && g.zTop[0]!=0 ){ | |
| 1529 | + g.zBaseURL = mprintf("%s%.*s", g.zBaseURL, i, zPathInfo); | |
| 1530 | + g.zTop = mprintf("%s%.*s", g.zTop, i, zPathInfo); | |
| 1531 | + } | |
| 1527 | 1532 | } |
| 1528 | 1533 | if( szFile<0 && i>0 ){ |
| 1529 | 1534 | const char *zMimetype; |
| 1530 | 1535 | assert( fossil_strcmp(&zRepo[j], ".fossil")==0 ); |
| 1531 | 1536 | zRepo[j] = 0; |
| 1532 | 1537 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1522,10 +1522,15 @@ | |
| 1522 | break; |
| 1523 | } |
| 1524 | if( szFile==0 ){ |
| 1525 | if( zRepo[0]=='/' && zRepo[1]=='/' ){ zRepo++; j--; } |
| 1526 | szFile = file_size(zRepo); |
| 1527 | } |
| 1528 | if( szFile<0 && i>0 ){ |
| 1529 | const char *zMimetype; |
| 1530 | assert( fossil_strcmp(&zRepo[j], ".fossil")==0 ); |
| 1531 | zRepo[j] = 0; |
| 1532 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -1522,10 +1522,15 @@ | |
| 1522 | break; |
| 1523 | } |
| 1524 | if( szFile==0 ){ |
| 1525 | if( zRepo[0]=='/' && zRepo[1]=='/' ){ zRepo++; j--; } |
| 1526 | szFile = file_size(zRepo); |
| 1527 | /* this should only be set from the --baseurl option, not CGI */ |
| 1528 | if( g.zBaseURL && g.zBaseURL[0]!=0 && g.zTop && g.zTop[0]!=0 ){ |
| 1529 | g.zBaseURL = mprintf("%s%.*s", g.zBaseURL, i, zPathInfo); |
| 1530 | g.zTop = mprintf("%s%.*s", g.zTop, i, zPathInfo); |
| 1531 | } |
| 1532 | } |
| 1533 | if( szFile<0 && i>0 ){ |
| 1534 | const char *zMimetype; |
| 1535 | assert( fossil_strcmp(&zRepo[j], ".fossil")==0 ); |
| 1536 | zRepo[j] = 0; |
| 1537 |