Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset f3676f3c in mainline


Ignore:
Timestamp:
2012-04-07T12:59:12Z (10 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
Children:
c6a44a3
Parents:
adf4f13 (diff), 6bb169b5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline

Location:
uspace
Files:
1 edited
3 moved

Legend:

Unmodified
Added
Removed
  • uspace/app/websrv/websrv.c

    radf4f13 rf3676f3c  
    200200{
    201201        if (str_cmp(uri, "/") == 0)
    202                 uri = "/index.htm";
     202                uri = "/index.html";
    203203       
    204204        char *fname;
  • uspace/dist/data/web/index.html

    radf4f13 rf3676f3c  
    1313        </p>
    1414        <p>
    15             Now <a href="foo.htm">go to page foo</a> or <a href="bar.htm">go
     15            Now <a href="foo.html">go to page foo</a> or <a href="bar.html">go
    1616            to bar</a>.
    1717        </p>
Note: See TracChangeset for help on using the changeset viewer.