dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7f6c911)
Send Cache-Control: private and Vary headers in img_auth.php.
authorTim Starling <tstarling@users.mediawiki.org>
Sat, 3 Nov 2007 02:38:40 +0000 (02:38 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Sat, 3 Nov 2007 02:38:40 +0000 (02:38 +0000)
img_auth.php patch | blob | history
includes/StreamFile.php patch | blob | history

diff --git a/img_auth.php b/img_auth.php
index 2e8f624..bb419b3 100644 (file)
--- a/img_auth.php
+++ b/img_auth.php
@@ -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();
-}
\ No newline at end of file
+}
diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index 8ecaa4f..2dbbe6d 100644 (file)
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -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 );
Wiklou, le Wiki du Wiklou