GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93902
Change subject: Don't perform any recursive requests from recursive requests
......................................................................
Don't perform any recursive requests from recursive requests
This cuts down parse times on selser cache request misses drastically.
Change-Id: Iea344f6e899a34c5bd01fcf64abbaaa2562d6319
---
M js/api/ParserService.js
M js/lib/mediawiki.ApiRequest.js
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/02/93902/1
diff --git a/js/api/ParserService.js b/js/api/ParserService.js
index cf67ec3..8f0a67d 100644
--- a/js/api/ParserService.js
+++ b/js/api/ParserService.js
@@ -325,8 +325,8 @@
// See if we can reuse transclusion or extension expansions.
if (!err && env.conf.parsoid.parsoidCacheURI &&
- // Don't enter an infinite request loop.
- ! /only-if-cached/.test(req.headers['cache-control']))
+ // And don't parse twice for recursive parsoid requests
+ ! req.headers['x-parsoid-request'])
{
// Try to retrieve a cached copy of the content so that we can
recycle
// template and / or extension expansions.
diff --git a/js/lib/mediawiki.ApiRequest.js b/js/lib/mediawiki.ApiRequest.js
index 8e7c343..8ac266b 100644
--- a/js/lib/mediawiki.ApiRequest.js
+++ b/js/lib/mediawiki.ApiRequest.js
@@ -561,7 +561,8 @@
headers: {
'User-Agent': userAgent,
'Cookie': env.cookie,
- 'Connection': 'close'
+ 'Connection': 'close',
+ 'x-parsoid-request': 'cache'
}
};
--
To view, visit https://gerrit.wikimedia.org/r/93902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea344f6e899a34c5bd01fcf64abbaaa2562d6319
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
