Fossil

Check-in [2c1677aa17]
Login

Check-in [2c1677aa17]

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

Overview
Comment:Fix another instance of index.wiki to index.html.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2c1677aa176e06d6a7b93bb2565ffee4195f8509
User & Date: drh 2015-01-29 00:44:02.426
Context
2015-01-29
01:23
If a /doc filename ends with "/", then try appending "index.html", "index.wiki", and "index.md" in that order. If none are found, then a 404 error will be generated. Try to find a file named 404.md in the root directory for the text of the 404, or generate a default 404 if no 404.md file is found. ... (check-in: bdfbbddc8f user: drh tags: trunk)
00:44
Fix another instance of index.wiki to index.html. ... (check-in: 2c1677aa17 user: drh tags: trunk)
00:38
For embedded documentation that ends in / go back to appending index.html instead of index.wiki. ... (check-in: 2ddb0e5a23 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/doc.c.
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
    zName += i;
  }
  while( zName[0]=='/' ){ zName++; }
  g.zPath = mprintf("%s/%s/%s", g.zPath, zCheckin, zName);
  zOrigName = zName;
  if( !file_is_simple_pathname(zName, 1) ){
    if( sqlite3_strglob("*/", zName)==0 ){
      zOrigName = zName = mprintf("%sindex.wiki", zName);
      if( !file_is_simple_pathname(zName, 1) ){
        goto doc_not_found;
      }
    }else{
      goto doc_not_found;
    }
  }







|







400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
    zName += i;
  }
  while( zName[0]=='/' ){ zName++; }
  g.zPath = mprintf("%s/%s/%s", g.zPath, zCheckin, zName);
  zOrigName = zName;
  if( !file_is_simple_pathname(zName, 1) ){
    if( sqlite3_strglob("*/", zName)==0 ){
      zOrigName = zName = mprintf("%sindex.html", zName);
      if( !file_is_simple_pathname(zName, 1) ){
        goto doc_not_found;
      }
    }else{
      goto doc_not_found;
    }
  }