From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (mandoc.bsd.lv [local])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id 622d8148
	for <source@mandoc.bsd.lv>;
	Mon, 11 Nov 2019 07:40:43 -0500 (EST)
Date: Mon, 11 Nov 2019 07:40:43 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: Compress::Zlib(3p) is provided by base Perl, so just use it 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <8d07722fda85945c@mandoc.bsd.lv>

Log Message:
-----------
Compress::Zlib(3p) is provided by base Perl, so just use it unconditionally

Modified Files:
--------------
    cvsweb:
        cvsweb.cgi

Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 4.12
retrieving revision 4.13
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.12 -r4.13
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -86,6 +86,7 @@ use vars qw (
   $allow_enscript @enscript_options %enscript_types
 );
 
+require Compress::Zlib;
 use Cwd                   qw(abs_path);
 use File::Path            qw(rmtree);
 use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir
@@ -102,7 +103,6 @@ use constant CVSWEBMARKUP => qr{^text/(x
 use constant LOG_FILESEPR => qr/^={77}$/o;
 use constant LOG_REVSEPR  => qr/^-{28}$/o;
 
-use constant HAS_ZLIB     => eval { require Compress::Zlib; };
 use constant HAS_EDIFF    => eval { require String::Ediff;  };
 
 # -----------------------------------------------------------------------------
@@ -317,7 +317,7 @@ $maycompress = (
     && $ENV{HTTP_ACCEPT_ENCODING} =~ /gzip/)
    || $is_mozilla3)
   && !$is_msie
-  && !(defined($ENV{MOD_PERL}) && !HAS_ZLIB)
+  && !(defined($ENV{MOD_PERL}))
 );
 
 # Parameters that will be sticky in all constructed links/query strings.
@@ -4247,10 +4247,6 @@ sub http_header(;$$)
     "img-src 'self'; style-src 'unsafe-inline'");
 
   if ($allow_compress && $maycompress) {
-    if (HAS_ZLIB
-        || (defined($CMD{gzip}) && open(GZIP, "| $CMD{gzip} -1 -c")))
-    {
-
       push(@headers, 'Content-Encoding: gzip');
       push(@headers, 'Vary: Accept-Encoding');     # RFC 2616, 14.44
       print join("\r\n", @headers) . "\r\n\r\n";
@@ -4258,18 +4254,9 @@ sub http_header(;$$)
       $| = 1;
       $| = 0;                                      # Flush header output.
 
-      tie(*GZIP, __PACKAGE__, \*STDOUT) if HAS_ZLIB;
+      tie(*GZIP, __PACKAGE__, \*STDOUT);
       select(GZIP);
       $gzip_open = 1;
-
-    } else {
-
-      print join("\r\n", @headers) . "\r\n\r\n";
-      printf
-        '<span style="font-size: smaller">Unable to find gzip binary in the <b>$command_path</b> (<code>%s</code>) to compress output</span><br />',
-          htmlquote(join(':', @command_path));
-    }
-
   } else {
     print join("\r\n", @headers) . "\r\n\r\n";
   }
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv