jenkins-bot has submitted this change and it was merged.
Change subject: Avoid infinite loop if oldid and a cookie.
......................................................................
Avoid infinite loop if oldid and a cookie.
Introduced in 5cc3dfb83f6d2741be88a7f38e63f70dc6c63730.
Change-Id: I3ea96df904f210890d453e2ed0a74c8cfed16f74
---
M js/api/ParserService.js
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/api/ParserService.js b/js/api/ParserService.js
index 43c392a..e6c7496 100644
--- a/js/api/ParserService.js
+++ b/js/api/ParserService.js
@@ -646,9 +646,13 @@
}
};
} else {
- if ( req.query.oldid && !req.headers.cookie ) {
+ if ( req.query.oldid ) {
oldid = req.query.oldid;
- res.setHeader( 'Cache-Control', 's-maxage=2592000' );
+ if ( !req.headers.cookie ) {
+ res.setHeader( 'Cache-Control',
's-maxage=2592000' );
+ } else {
+ res.setHeader( 'Cache-Control',
'private,no-cache,s-maxage=0' );
+ }
tmpCb = parse.bind( null, env, req, res, function (
req, res, src, doc ) {
sendRes( doc.documentElement );
});
--
To view, visit https://gerrit.wikimedia.org/r/92663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ea96df904f210890d453e2ed0a74c8cfed16f74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
