dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
installer: Use wfLoadExtension/Skin in LocalSettingsGenerator
[lhc/web/wiklou.git]
/
includes
/
OutputHandler.php
diff --git
a/includes/OutputHandler.php
b/includes/OutputHandler.php
index
3860b8e
..
c6209ee
100644
(file)
--- a/
includes/OutputHandler.php
+++ b/
includes/OutputHandler.php
@@
-23,13
+23,15
@@
/**
* Standard output handler for use with ob_start
*
/**
* Standard output handler for use with ob_start
*
- * @param
$s string
+ * @param
string $s
*
* @return string
*/
function wfOutputHandler( $s ) {
*
* @return string
*/
function wfOutputHandler( $s ) {
- global $wgDisableOutputCompression, $wgValidateAllHtml;
- $s = wfMangleFlashPolicy( $s );
+ global $wgDisableOutputCompression, $wgValidateAllHtml, $wgMangleFlashPolicy;
+ if ( $wgMangleFlashPolicy ) {
+ $s = wfMangleFlashPolicy( $s );
+ }
if ( $wgValidateAllHtml ) {
$headers = headers_list();
$isHTML = false;
if ( $wgValidateAllHtml ) {
$headers = headers_list();
$isHTML = false;
@@
-94,7
+96,7
@@
function wfRequestExtension() {
* Handler that compresses data with gzip if allowed by the Accept header.
* Unlike ob_gzhandler, it works for HEAD requests too.
*
* Handler that compresses data with gzip if allowed by the Accept header.
* Unlike ob_gzhandler, it works for HEAD requests too.
*
- * @param
$s string
+ * @param
string $s
*
* @return string
*/
*
* @return string
*/
@@
-127,7
+129,8
@@
function wfGzipHandler( $s ) {
$headers = headers_list();
$foundVary = false;
foreach ( $headers as $header ) {
$headers = headers_list();
$foundVary = false;
foreach ( $headers as $header ) {
- if ( substr( $header, 0, 5 ) == 'Vary:' ) {
+ $headerName = strtolower( substr( $header, 0, 5 ) );
+ if ( $headerName == 'vary:' ) {
$foundVary = true;
break;
}
$foundVary = true;
break;
}
@@
-145,7
+148,7
@@
function wfGzipHandler( $s ) {
/**
* Mangle flash policy tags which open up the site to XSS attacks.
*
/**
* Mangle flash policy tags which open up the site to XSS attacks.
*
- * @param
$s string
+ * @param
string $s
*
* @return string
*/
*
* @return string
*/
@@
-161,10
+164,13
@@
function wfMangleFlashPolicy( $s ) {
/**
* Add a Content-Length header if possible. This makes it cooperate with squid better.
*
/**
* Add a Content-Length header if possible. This makes it cooperate with squid better.
*
- * @param
$length int
+ * @param
int $length
*/
function wfDoContentLength( $length ) {
*/
function wfDoContentLength( $length ) {
- if ( !headers_sent() && isset( $_SERVER['SERVER_PROTOCOL'] ) && $_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.0' ) {
+ if ( !headers_sent()
+ && isset( $_SERVER['SERVER_PROTOCOL'] )
+ && $_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.0'
+ ) {
header( "Content-Length: $length" );
}
}
header( "Content-Length: $length" );
}
}
@@
-172,7
+178,7
@@
function wfDoContentLength( $length ) {
/**
* Replace the output with an error if the HTML is not valid
*
/**
* Replace the output with an error if the HTML is not valid
*
- * @param
$s string
+ * @param
string $s
*
* @return string
*/
*
* @return string
*/