Differences From:

File src/doc.c part of check-in [43481115ed] - Add a "logo" image to the local server state. Return this image on all requests to the "/logo" URL. All the administrator to setup that image. Include the image in the default header. by drh on 2009-09-21 19:10:35. [view]

To:

File src/doc.c part of check-in [7a39dde24b] - Clean up and merge updates from trunk by robert on 2009-09-26 08:17:33. Also file src/doc.c part of check-in [f969b6cdde] - Add the optional mimetype= query parameter to the /doc URI. by drh on 2009-09-22 11:15:17. [view]

@@ -317,8 +317,9 @@
 
 /*
 ** WEBPAGE: doc
 ** URL: /doc?name=BASELINE/PATH
+** URL: /doc/BASELINE/PATH
 **
 ** BASELINE can be either a baseline uuid prefix or magic words "tip"
 ** to me the most recently checked in baseline or "ckout" to mean the
 ** content of the local checkout, if any.  PATH is the relative pathname
@@ -439,9 +440,12 @@
 
   /* The file is now contained in the filebody blob.  Deliver the
   ** file to the user
   */
-  zMime = mimetype_from_name(zName);
+  zMime = P("mimetype");
+  if( zMime==0 ){
+    zMime = mimetype_from_name(zName);
+  }
   if( strcmp(zMime, "application/x-fossil-wiki")==0 ){
     Blob title, tail;
     if( wiki_find_title(&filebody, &title, &tail) ){
       style_header(blob_str(&title));