Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Send Cache-Control: private and Vary headers in img_auth.php.

Browse source
This commit is contained in:
Tim Starling 2007-11-03 02:38:40 +00:00
parent 7f6c911e42
commit 6b5e2f5f0b
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
img_auth.php
View file

@ -66,7 +66,7 @@ if( is_dir( $filename ) ) {
// Stream the requested file
wfDebugLog( 'img_auth', "Streaming `{$filename}`" );
wfStreamFile( $filename );
wfStreamFile( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
wfLogProfilingData();
/**
@ -75,15 +75,16 @@ wfLogProfilingData();
*/
function wfForbidden() {
header( 'HTTP/1.0 403 Forbidden' );
header( 'Vary: Cookie' );
header( 'Content-Type: text/html; charset=utf-8' );
echo <<<END
echo <<<ENDS
<html>
<body>
<h1>Access Denied</h1>
<p>You need to log in to access files on this server.</p>
</body>
</html>
END;
ENDS;
wfLogProfilingData();
exit();
}
}

6
includes/StreamFile.php
View file

@ -2,7 +2,7 @@
/** */
/** */
function wfStreamFile( $fname ) {
function wfStreamFile( $fname, $headers = array() ) {
$stat = @stat( $fname );
if ( !$stat ) {
header( 'HTTP/1.0 404 Not Found' );
@ -34,6 +34,10 @@ function wfStreamFile( $fname ) {
global $wgContLanguageCode;
header( "Content-Disposition: inline;filename*=utf-8'$wgContLanguageCode'" . urlencode( basename( $fname ) ) );
foreach ( $headers as $header ) {
header( $header );
}
if ( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
$modsince = preg_replace( '/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
$sinceTime = strtotime( $modsince );