Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for CHttpCacheFilter's Cache-Control headers being overwritten by started sessions #1628

Merged
merged 6 commits into from
Nov 10, 2012
Merged

Fix for CHttpCacheFilter's Cache-Control headers being overwritten by started sessions #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65396b9
Workaround for cache-control headers being overwritten by starting se…
DaSourcerer Oct 27, 2012
a4cb04b
'public' instead of 'nocache' for session limiters. Pragma header is …
DaSourcerer Oct 29, 2012
bc6b17e
csfix - thx @resurtm
DaSourcerer Nov 8, 2012
7ebfcdf
Merge remote-tracking branch 'upstream/master' into http-caching
DaSourcerer Nov 9, 2012
686480e
Updated CHANGELOG
DaSourcerer Nov 9, 2012
93d109a
Added issue number
DaSourcerer Nov 10, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Version 1.1.13 work in progress
- Bug #1584: Fixed CGridView and CListView urls when enableHistory was used with "path" urlFormat (mdomba) - Bug #1584: Fixed CGridView and CListView urls when enableHistory was used with "path" urlFormat (mdomba)
- Bug #1622: CLocale::getTerritory() used to return invalid territory name when locales (language tags) were specified without territory part (e.g. 'de', 'fr') (resurtm) - Bug #1622: CLocale::getTerritory() used to return invalid territory name when locales (language tags) were specified without territory part (e.g. 'de', 'fr') (resurtm)
- Bug #1624: Requirements page now tries all other preferred languages when the most preferred one is missing (ArtVal) - Bug #1624: Requirements page now tries all other preferred languages when the most preferred one is missing (ArtVal)
- Bug #1628: Active HTTP sessions overwrote the Cache-Control header set by CHttpCacheFilter (DaSourcerer)
- Bug #1646: CLocale::getTerritory() used to return invalid territory name when locales (language tags) were specified with script part (e.g. 'zh-Hans-CN', 'zh-Hant-HK') (resurtm) - Bug #1646: CLocale::getTerritory() used to return invalid territory name when locales (language tags) were specified with script part (e.g. 'zh-Hans-CN', 'zh-Hant-HK') (resurtm)
- Bug #1652: Fixed incorrect syntax of CDbSchema::renameTable() for SQLite, added CSqliteSchema::renameTable() method (Sarke) - Bug #1652: Fixed incorrect syntax of CDbSchema::renameTable() for SQLite, added CSqliteSchema::renameTable() method (Sarke)
- Bug: Table schema is refreshed on Gii model generation when schemaCachingDuration is used (SonkoDmitry) - Bug: Table schema is refreshed on Gii model generation when schemaCachingDuration is used (SonkoDmitry)
Expand Down
7 changes: 6 additions & 1 deletion framework/web/filters/CHttpCacheFilter.php
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -181,7 +181,12 @@ protected function send304Header()
*/ */
protected function sendCacheControlHeader() protected function sendCacheControlHeader()
{ {
header('Cache-Control: '.$this->cacheControl, true); if(Yii::app()->session->isStarted)
{
session_cache_limiter('public');
header('Pragma:',true);
}
header('Cache-Control: '.$this->cacheControl,true);
} }


/** /**
Expand Down