Changeset f3676f3c in mainline

Timestamp:

2012-04-07T12:59:12Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

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:

• app/websrv/websrv.c (modified) (1 diff)
• dist/data/web/bar.html (moved) (moved from uspace/dist/data/web/bar.htm )
• dist/data/web/foo.html (moved) (moved from uspace/dist/data/web/foo.htm )
• dist/data/web/index.html (moved) (moved from uspace/dist/data/web/index.htm ) (1 diff)

uspace/app/websrv/websrv.c

@@ -200 +200 @@
 {
         if (str_cmp(uri, "/") == 0)
-                uri = "/index.htm";
+                uri = "/index.html";
         
         char *fname;

uspace/dist/data/web/index.html

@@ -13 +13 @@
         </p>
         <p>
-            Now <a href="foo.htm">go to page foo</a> or <a href="bar.htm">go
+            Now <a href="foo.html">go to page foo</a> or <a href="bar.html">go
             to bar</a>.
         </p>