Check-in [d2f1df363e]
Not logged in

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

Overview
Comment:Take extra precaution to not disturb single file server invocations even though they should already be open and not hit this code.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d2f1df363ed47d5cdfdd6851bf1b5384aaeb5d74
User & Date: andybradford 2015-04-03 02:05:01.770
Context
2015-04-03
03:55
Update error messages and help text for the 'all' sub-command. check-in: ac56af176b user: mistachkin tags: trunk
03:13
Merge updates from trunk. check-in: bc31308652 user: mistachkin tags: mvAndRmFiles
02:36
Merge updates from trunk. check-in: 06ffd8009f user: mistachkin tags: tkt-b6eea9446d
02:05
Take extra precaution to not disturb single file server invocations even though they should already be open and not hit this code. check-in: d2f1df363e user: andybradford tags: trunk
01:44
Fix search result title handling for 'documents' that are not wiki, markdown, or HTML. check-in: 9b8d2dcb9f user: mistachkin tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
1521
1522
1523
1524
1525
1526
1527
1528

1529
1530
1531
1532
1533
1534
1535
        szFile = 1;
        break;
      }
      if( szFile==0 ){
        if( zRepo[0]=='/' && zRepo[1]=='/' ){ zRepo++; j--; }
        szFile = file_size(zRepo);
        /* this should only be set from the --baseurl option, not CGI  */
        if( g.zBaseURL && g.zBaseURL[0]!=0 && g.zTop && g.zTop[0]!=0 ){

          g.zBaseURL = mprintf("%s%.*s", g.zBaseURL, i, zPathInfo);
          g.zTop = mprintf("%s%.*s", g.zTop, i, zPathInfo);
        }
      }
      if( szFile<0 && i>0 ){
        const char *zMimetype;
        assert( fossil_strcmp(&zRepo[j], ".fossil")==0 );







|
>







1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
        szFile = 1;
        break;
      }
      if( szFile==0 ){
        if( zRepo[0]=='/' && zRepo[1]=='/' ){ zRepo++; j--; }
        szFile = file_size(zRepo);
        /* this should only be set from the --baseurl option, not CGI  */
        if( g.zBaseURL && g.zBaseURL[0]!=0 && g.zTop && g.zTop[0]!=0 &&
            file_isdir(g.zRepositoryName)==1 ){
          g.zBaseURL = mprintf("%s%.*s", g.zBaseURL, i, zPathInfo);
          g.zTop = mprintf("%s%.*s", g.zTop, i, zPathInfo);
        }
      }
      if( szFile<0 && i>0 ){
        const char *zMimetype;
        assert( fossil_strcmp(&zRepo[j], ".fossil")==0 );