Fossil SCM

Making the raw page download guess the mime type based on filename also for attachments, not only repository files.

viriketo 2012-10-09 13:30 trunk
Commit 5f3916ac5b75a69c72abb41ee90cfe87c0a65bac
1 file changed +6
+6
--- src/info.c
+++ src/info.c
@@ -1304,10 +1304,16 @@
13041304
zMime = P("m");
13051305
if( zMime==0 ){
13061306
char *zFName = db_text(0, "SELECT filename.name FROM mlink, filename"
13071307
" WHERE mlink.fid=%d"
13081308
" AND filename.fnid=mlink.fnid", rid);
1309
+ if( !zFName ){
1310
+ /* Look also at the attachment table */
1311
+ zFName = db_text(0, "SELECT attachment.filename FROM attachment, blob"
1312
+ " WHERE blob.rid=%d"
1313
+ " AND attachment.src=blob.uuid", rid);
1314
+ }
13091315
if( zFName ) zMime = mimetype_from_name(zFName);
13101316
if( zMime==0 ) zMime = "application/x-fossil-artifact";
13111317
}
13121318
content_get(rid, &content);
13131319
cgi_set_content_type(zMime);
13141320
--- src/info.c
+++ src/info.c
@@ -1304,10 +1304,16 @@
1304 zMime = P("m");
1305 if( zMime==0 ){
1306 char *zFName = db_text(0, "SELECT filename.name FROM mlink, filename"
1307 " WHERE mlink.fid=%d"
1308 " AND filename.fnid=mlink.fnid", rid);
 
 
 
 
 
 
1309 if( zFName ) zMime = mimetype_from_name(zFName);
1310 if( zMime==0 ) zMime = "application/x-fossil-artifact";
1311 }
1312 content_get(rid, &content);
1313 cgi_set_content_type(zMime);
1314
--- src/info.c
+++ src/info.c
@@ -1304,10 +1304,16 @@
1304 zMime = P("m");
1305 if( zMime==0 ){
1306 char *zFName = db_text(0, "SELECT filename.name FROM mlink, filename"
1307 " WHERE mlink.fid=%d"
1308 " AND filename.fnid=mlink.fnid", rid);
1309 if( !zFName ){
1310 /* Look also at the attachment table */
1311 zFName = db_text(0, "SELECT attachment.filename FROM attachment, blob"
1312 " WHERE blob.rid=%d"
1313 " AND attachment.src=blob.uuid", rid);
1314 }
1315 if( zFName ) zMime = mimetype_from_name(zFName);
1316 if( zMime==0 ) zMime = "application/x-fossil-artifact";
1317 }
1318 content_get(rid, &content);
1319 cgi_set_content_type(zMime);
1320

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button