aboutsummaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2006-06-17 13:32:15 +0200
committerJunio C Hamano <junkio@cox.net>2006-06-18 21:19:14 -0700
commitf5aa79d909f8c4838bf500c22fa5f7967d219925 (patch)
tree4a85bc4fa53a54a31fbd2ab0b8ba8bd2b7061acd /merge-tree.c
parentaedd9425ce211d132f8671bc3d94623ab9595f02 (diff)
downloadgit-f5aa79d909f8c4838bf500c22fa5f7967d219925.tar.gz
git-f5aa79d909f8c4838bf500c22fa5f7967d219925.tar.xz
gitweb: safely output binary files for 'blob_plain' action
gitweb tries now to output correct Content-Type header for 'blob_plain' action; for now text/plain for text files, appropriate image MIME type for *.png, *.gif and *.jpg/*.jpeg files, and application/octet-stream for other binary files. Introduced new configuration variables: $default_blob_plain_mimetype and $default_text_plain_charset (only 'utf-8' is guaranteed to work for the latter). binmode changed to ':raw' in git_blob_plain for output of non-text files. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions