2009-11-17 16:29:42 +00:00
|
|
|
$OpenBSD: patch-gitweb_gitweb_perl,v 1.14 2009/11/17 16:29:42 bernd Exp $
|
2007-12-17 20:00:05 +00:00
|
|
|
|
|
|
|
|
This prevents the following error: '-T and -B not implemented on filehandles'
|
|
|
|
|
|
2009-11-17 16:29:42 +00:00
|
|
|
--- gitweb/gitweb.perl.orig Mon Nov 16 23:14:46 2009
|
|
|
|
|
+++ gitweb/gitweb.perl Tue Nov 17 14:30:56 2009
|
|
|
|
|
@@ -4952,7 +4952,7 @@ sub git_blob_plain {
|
2008-06-24 20:28:00 +00:00
|
|
|
$expires = "+1d";
|
2007-12-17 20:00:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
|
|
|
|
|
+ open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
|
2008-09-27 21:47:20 +00:00
|
|
|
or die_error(500, "Open git-cat-file blob '$hash' failed");
|
2007-12-17 20:00:05 +00:00
|
|
|
|
2008-06-24 20:28:00 +00:00
|
|
|
# content-type (can include charset)
|
2009-11-17 16:29:42 +00:00
|
|
|
@@ -5005,7 +5005,7 @@ sub git_blob {
|
2007-12-17 20:00:05 +00:00
|
|
|
}
|
|
|
|
|
|
2009-01-24 14:31:28 +00:00
|
|
|
my $have_blame = gitweb_check_feature('blame');
|
2007-12-17 20:00:05 +00:00
|
|
|
- open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash
|
|
|
|
|
+ open my $fd, "-|:raw:perlio", git_cmd(), "cat-file", "blob", $hash
|
2008-09-27 21:47:20 +00:00
|
|
|
or die_error(500, "Couldn't cat $file_name, $hash");
|
2007-12-17 20:00:05 +00:00
|
|
|
my $mimetype = blob_mimetype($fd, $file_name);
|
2008-02-08 17:56:00 +00:00
|
|
|
if ($mimetype !~ m!^(?:text/|image/(?:gif|png|jpeg)$)! && -B $fd) {
|
