From: Jakub Narebski <jnareb@gmail.com>
To: Luben Tuikov <ltuikov@yahoo.com>, git@vger.kernel.org
Subject: [RFC/PATCH] gitweb: Enable transparent compression form HTTP output
Date: Wed, 25 Jul 2007 20:39:43 +0200 [thread overview]
Message-ID: <200707252039.44312.jnareb@gmail.com> (raw)
In-Reply-To: <513314.51284.qm@web31813.mail.mud.yahoo.com>
Check if PerlIO::gzip is available, and if it is make it possible to
enable (via 'compression' %feature) transparent compression of HTML
output. Error messages and any non-HTML output are excluded from
transparent compression.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
On Thu, 19 July 2007, Luben Tuikov wrote:
> --- Jakub Narebski <jnareb@gmail.com> wrote:
> > Luben Tuikov wrote:
> >
> > > I wouldn't mind an improvement in the snapshot area of gitweb.
> > > I wasn't really happy with the snapshot feature as it was originally
> > > implemented, as it would generate a tar file with ".tar.bz2"
> > > name extension, but the file was NOT bz2, and I had to always
> > > manually rename, bz2, and rename back.
> >
> > This was a *bug*, but it is now corrected (in 9aa17573). Gitweb used
> > Content-Encoding, which is meant for _transparent_ compression.
>
> Yeah, that's what I suspected, since there was nothing obviously
> wrong with the code.
And _this_ patch adds support for true, intentional transparent
compression.
gitweb/gitweb.perl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 0acd0ca..d48a193 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -20,8 +20,12 @@ binmode STDOUT, ':utf8';
BEGIN {
CGI->compile() if $ENV{'MOD_PERL'};
+
+ eval { require PerlIO::gzip; }; # needed for transparent compression
}
+our $enable_transparent_compression = !! $PerlIO::gzip::VERSION;
+
our $cgi = new CGI;
our $version = "++GIT_VERSION++";
our $my_url = $cgi->url();
@@ -238,6 +242,22 @@ our %feature = (
'override' => 0,
'default' => [1]},
+ # Enable transparent compression, for now only for HTML output;
+ # this reduces network bandwidth at the cost of CPU usage.
+ # You need to have PerlIO::gzip for that, and browser has to accept
+ # (via Accept-Encoding: HTTP request header) 'gzip' encoding.
+ # Transparent compression is not used for error messages.
+
+ # To enable system wide have in $GITWEB_CONFIG
+ # $feature{'compression'}{'default'} = [1];
+ # To have project specific config enable override in $GITWEB_CONFIG
+ # $feature{'compression'}{'override'} = 1;
+ # and in project config gitweb.compression = 0|1;
+ 'compression' => {
+ 'sub' => \&feature_compression,
+ 'override' => 0,
+ 'default' => [0]},
+
# Make gitweb use an alternative format of the URLs which can be
# more readable and natural-looking: project name is embedded
# directly in the path and the query string contains other
@@ -336,6 +356,18 @@ sub feature_pickaxe {
return ($_[0]);
}
+sub feature_compression {
+ my ($val) = git_get_project_config('compression', '--bool');
+
+ if ($val eq 'true') {
+ return (1);
+ } elsif ($val eq 'false') {
+ return (0);
+ }
+
+ return ($_[0]);
+}
+
# checking HEAD file with -e is fragile if the repository was
# initialized long time ago (i.e. symlink HEAD) and was pack-ref'ed
# and then pruned.
@@ -2238,9 +2270,24 @@ sub git_header_html {
} else {
$content_type = 'text/html';
}
+ # transparent compression has to be supported, enabled, and accepted
+ # explicitely by UA; note that qvalue of 0 means "not acceptable."
+ my %content_encoding = ();
+ if ($enable_transparent_compression &&
+ gitweb_check_feature('compression') &&
+ defined $cgi->http('HTTP_ACCEPT_ENCODING') &&
+ $cgi->http('HTTP_ACCEPT_ENCODING') =~ m/(^|,|;|\s)gzip(,|;|\s|$)/ &&
+ $cgi->http('HTTP_ACCEPT_ENCODING') !~ m/(^|,|;|\s)gzip\s*;q=0(,|\s|$)/) {
+ %content_encoding = (-content_encoding => 'gzip');
+ }
print $cgi->header(-type=>$content_type, -charset => 'utf-8',
+ %content_encoding,
-status=> $status, -expires => $expires);
my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
+ if (%content_encoding) {
+ # implies $enable_transparent_compression
+ binmode STDOUT, ':gzip';
+ }
print <<EOF;
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -2375,6 +2422,7 @@ sub die_error {
my $status = shift || "403 Forbidden";
my $error = shift || "Malformed query, file missing or permission denied";
+ $enable_transparent_compression = 0;
git_header_html($status);
print <<EOF;
<div class="page_body">
--
1.5.2.4
next prev parent reply other threads:[~2007-07-25 21:32 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-28 18:02 [PATCH] gitweb: snapshot cleanups & support for offering multiple formats Matt McCutchen
2007-07-07 20:52 ` Junio C Hamano
2007-07-08 9:06 ` Junio C Hamano
2007-07-11 15:55 ` Jakub Narebski
2007-07-11 21:26 ` Junio C Hamano
2007-07-12 1:15 ` Matt McCutchen
2007-07-12 11:07 ` Jakub Narebski
2007-07-17 18:03 ` Matt McCutchen
2007-07-17 19:11 ` Matt McCutchen
2007-07-18 23:40 ` Jakub Narebski
2007-07-19 1:12 ` Junio C Hamano
2007-07-19 3:30 ` Luben Tuikov
2007-07-19 7:30 ` Jakub Narebski
2007-07-19 7:40 ` Luben Tuikov
2007-07-25 18:39 ` Jakub Narebski [this message]
2007-08-25 18:03 ` [RFC/PATCH] gitweb: Enable transparent compression form HTTP output Petr Baudis
2007-08-25 22:09 ` Jakub Narebski
2007-08-25 22:14 ` Petr Baudis
2007-08-27 11:01 ` Jakub Narebski
2007-07-19 9:05 ` [PATCH] gitweb: snapshot cleanups & support for offering multiple formats Jakub Narebski
2007-07-20 4:29 ` Junio C Hamano
2007-07-19 9:14 ` Jakub Narebski
2007-07-21 23:30 ` Jakub Narebski
2007-07-22 5:26 ` Junio C Hamano
2007-07-22 15:05 ` Matt McCutchen
2007-07-22 21:41 ` [PATCH] gitweb: Fix support for legacy gitweb config for snapshots Jakub Narebski
2007-07-22 23:10 ` Matt McCutchen
2007-07-22 23:35 ` Junio C Hamano
2007-07-08 21:54 ` [PATCH] gitweb: snapshot cleanups & support for offering multiple formats Junio C Hamano
2007-07-09 22:52 ` Matt McCutchen
2007-07-09 23:21 ` Matt McCutchen
2007-07-10 23:41 ` Jakub Narebski
2007-07-09 23:48 ` Junio C Hamano
2007-07-10 1:14 ` Matt McCutchen
2007-07-10 1:14 ` Matt McCutchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200707252039.44312.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=ltuikov@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.