Decline processing if we're unable to determine the Content-Type.

Author: bleargh45

Changes

@@ -1,5 +1,8 @@
 Revision history for Perl extension Apache2::Filter::Minifier::JavaScript.
 
+1.04_02 ???
+    - decline processing if unable to determine Content-Type of document
+
 1.04_01 Tue Oct 16 00:59 PDT 2007
     - added timing info to the debug logs
     - use JavaScript::Minifier::XS if available; its -MUCH- faster

MANIFEST

@@ -6,8 +6,8 @@ MANIFEST.SKIP
 META.yml
 README.txt
 lib/Apache2/Filter/Minifier/JavaScript.pm
-t/charset.t
 t/content-length.t
+t/content-type.t
 t/decline.t
 t/dynamic.t
 t/mime-types.t
@@ -25,6 +25,7 @@ t/htdocs/minified-xs.txt
 t/MY/slurp.pm
 t/MY/CharsetHandler.pm
 t/MY/JSHandler.pm
+t/MY/NoCTypeHandler.pm
 t/MY/PlainHandler.pm
 t/MY/UpperCase.pm
 t/perl-bin/js.pl

META.yml

@@ -1,6 +1,6 @@
 ---
 name: Apache2-Filter-Minifier-JavaScript
-version: 1.04_01
+version: 1.04_02
 author:
   - Graham TerMarsch ([email protected])
 abstract: JS minifying output filter
@@ -18,7 +18,7 @@ recommends:
 provides:
   Apache2::Filter::Minifier::JavaScript:
     file: lib/Apache2/Filter/Minifier/JavaScript.pm
-    version: 1.04_01
+    version: 1.04_02
 generated_by: Module::Build version 0.2805
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.2.html

lib/Apache2/Filter/Minifier/JavaScript.pm

@@ -19,7 +19,7 @@ eval { require JavaScript::Minifier::XS; };
 
 ###############################################################################
 # Version number.
-our $VERSION = '1.04_01';
+our $VERSION = '1.04_02';
 
 ###############################################################################
 # MIME-Types we're willing to minify.
@@ -47,8 +47,11 @@ sub handler {
         );
 
     # determine Content-Type of document
-    my $ctype = $r->content_type;
-    $ctype =~ s{;.*}{};
+    my ($ctype) = ($r->content_type =~ /^(.+?)(?:;.*)?$/);
+    unless ($ctype) {
+        $log->info( "unable to determine content type; skipping : URL ", $r->uri );
+        return Apache2::Const::DECLINED;
+    }
 
     # only process JS documents
     unless (exists $types{$ctype}) {

t/MY/NoCTypeHandler.pm

@@ -0,0 +1,18 @@
+package MY::NoCTypeHandler;
+
+use strict;
+use warnings;
+use Apache2::RequestIO qw();
+use Apache2::RequestRec qw();
+use Apache2::RequestUtil qw();
+use Apache2::Const -compile => qw(OK);
+use File::Spec::Functions qw(catfile);
+use MY::slurp;
+
+sub handler {
+    my $r = shift;
+    $r->print( slurp(catfile($r->document_root,'test.txt')) );
+    return Apache2::Const::OK;
+}
+
+1;

t/charset.t

@@ -27,12 +27,18 @@ Alias /raw @DocumentRoot@
     PerlAddVar              JsMimeType text/json
 </Location>
 
-<Location /charset>
+<Location /content-type/charset>
     SetHandler              modperl
     PerlResponseHandler     MY::CharsetHandler
     PerlOutputFilterHandler Apache2::Filter::Minifier::JavaScript
 </Location>
 
+<Location /content-type/missing>
+    SetHandler              modperl
+    PerlResponseHandler     MY::NoCTypeHandler
+    PerlOutputFilterHandler Apache2::Filter::Minifier::JavaScript
+</Location>
+
 <Location /decline_uc>
     SetHandler              modperl
     PerlResponseHandler     MY::PlainHandler

t/conf/extra.conf.in

@@ -0,0 +1,31 @@
+use strict;
+use warnings FATAL => 'all';
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil qw(t_cmp);
+use lib 't';
+use MY::slurp;
+
+# Test "Content-Type" headers
+plan tests => 3, need_lwp;
+
+# "Content-Type" with additional attributes (e.g. "charset")
+charset_minified: {
+    my $body = GET_BODY '/content-type/charset';
+    my $min  = slurp( 't/htdocs/minified.txt' );
+    chomp($min);
+
+    ok( t_cmp($body, $min) );
+}
+
+# Missing "Content-Type" header; should decline processing and we get the
+# un-minified version.  Apache, however, -will- set a default "Content-Type"
+# into the response.
+content_type_missing: {
+    my $res  = GET '/content-type/missing';
+    my $body = $res->content;
+    my $orig = slurp( 't/htdocs/test.js' );
+
+    ok( $res->content_type !~ m{text/javascript} );
+    ok( t_cmp($body, $orig) );
+}