| Index: branches/REL1_14/phase3/includes/HTMLFileCache.php |
| — | — | @@ -132,12 +132,12 @@ |
| 133 | 133 | $filename = $this->fileCacheName(); |
| 134 | 134 | // Raw pages should handle cache control on their own, |
| 135 | 135 | // even when using file cache. This reduces hits from clients. |
| 136 | | - if( $this->mType !== 'raw' ) |
| | 136 | + if( $this->mType !== 'raw' ) { |
| 137 | 137 | $wgOut->sendCacheControl(); |
| | 138 | + header( "Content-Type: $wgMimeType; charset={$wgOutputEncoding}" ); |
| | 139 | + header( "Content-Language: $wgContLanguageCode" ); |
| | 140 | + } |
| 138 | 141 | |
| 139 | | - header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" ); |
| 140 | | - header( "Content-language: $wgContLanguageCode" ); |
| 141 | | - |
| 142 | 142 | if( $this->useGzip() ) { |
| 143 | 143 | if( wfClientAcceptsGzip() ) { |
| 144 | 144 | header( 'Content-Encoding: gzip' ); |
| Index: branches/REL1_14/phase3/RELEASE-NOTES |
| — | — | @@ -24,6 +24,12 @@ |
| 25 | 25 | release due to the discovery of serious problems with the schema. We expect to |
| 26 | 26 | fix this problem for the release of 1.15.0. |
| 27 | 27 | |
| | 28 | +== Changes since 1.14.0rc1 == |
| | 29 | + |
| | 30 | +* Fixed performance of the backlinks API module |
| | 31 | +* (bug 17420) Send the correct content type from action=raw when the HTML file |
| | 32 | + cache is enabled. |
| | 33 | + |
| 28 | 34 | === Configuration changes in 1.14 === |
| 29 | 35 | |
| 30 | 36 | * $wgExemptFromUserRobotsControl is an array of namespaces to be exempt from |
| Property changes on: branches/REL1_14/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 31 | 37 | - /trunk/phase3:45592 |
| 32 | 38 | + /trunk/phase3:45592,47139 |