Skip to content

Commit abe1372

Browse files
committed
fix s3 request with mixed image format (unknown mimetype)
1 parent 23181c0 commit abe1372

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

lib/cache_rest.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,16 @@ static void _mapcache_cache_rest_multi_set(mapcache_context *ctx, mapcache_cache
865865
}
866866

867867
apr_table_set(headers,"Content-Length",apr_psprintf(ctx->pool,"%lu",tile->encoded_data->size));
868-
if(tile->tileset->format)
868+
if(tile->tileset->format && tile->tileset->format->mime_type)
869869
apr_table_set(headers, "Content-Type", tile->tileset->format->mime_type);
870+
else {
871+
mapcache_image_format_type imgfmt = mapcache_imageio_header_sniff(ctx,tile->encoded_data);
872+
if(imgfmt == GC_JPEG) {
873+
apr_table_set(headers, "Content-Type", "image/jpeg");
874+
} else if (imgfmt == GC_PNG) {
875+
apr_table_set(headers, "Content-Type", "image/png");
876+
}
877+
}
870878

871879
if(rcache->rest.add_headers) {
872880
rcache->rest.add_headers(ctx,rcache,tile,url,headers);

0 commit comments

Comments
 (0)