Merge pull request #2003 from kareila/media-headers

additional headers for media file requests
dreamwidth · Feb 22, 2017 · 8410894 · 8410894
2 parents ecba2a8 + 7400b91
commit 8410894
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/cgi-bin/DW/Controller/Media.pm b/cgi-bin/DW/Controller/Media.pm
@@ -233,6 +233,7 @@ sub media_handler {
         unless defined $dataref && ref $dataref eq 'SCALAR';
 
     # now we're done!
+    $r->set_last_modified( $obj->{logtime} ) if $obj->{logtime};
     $r->content_type( $obj->mimetype );
     $r->print( $$dataref );
     return $r->OK;

diff --git a/cgi-bin/DW/Routing.pm b/cgi-bin/DW/Routing.pm
@@ -217,6 +217,13 @@ sub _call_hash {
     $r->content_type( $default_content_types->{$format} )
         if $default_content_types->{$format};
 
+    # apply default cache-avoidant settings to "journal" content
+    # (similar to the behavior of our Apache server modules)
+    # so that proxies (e.g. Cloudflare) must revalidate the response
+    if ( $opts->role eq 'user' && ! $opts->no_cache ) {
+        $r->header_out( "Cache-Control" => "private, proxy-revalidate" );
+    }
+
     # apply no-cache if needed
     $r->no_cache if $opts->no_cache;