jenkins-bot has submitted this change and it was merged.
Change subject: Don't strip \r in API routes
......................................................................
Don't strip \r in API routes
Inconsistent \r handling in different API routes causes selser corruption,
seen most recently in our rt tests. VE uses RestBase which doesn't
follow any of the \r-stripping paths, so production parsoid use should
be unaffected.
A separate question, unanswered by this patch, is how to handle \r
consistently in the tokenizer.
Change-Id: I017c1ed5bf25dcaeca2d08318cb36bab033a8853
---
M api/routes.js
1 file changed, 2 insertions(+), 8 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/routes.js b/api/routes.js
index 144d86a..400369d 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -322,10 +322,6 @@
var v2 = res.local('v2');
var target = env.resolveTitle(env.normalizeTitle( env.page.name ), '');
- if (wt) {
- wt = wt.replace(/\r/g, '');
- }
-
if ( env.conf.parsoid.allowCORS ) {
// allow cross-domain requests (CORS) so that parsoid service
// can be used by third-party sites
@@ -729,10 +725,8 @@
env.scrubWikitext = true;
}
- // we don't care about \r, and normalize everything to \n
- env.setPageSrcInfo({
- revision: { '*': req.body.content.replace(/\r/g, '') }
- });
+ env.setPageSrcInfo(req.body.content);
+
parse( env, req, res ).then(
roundTripDiff.bind( null, env, req, res, false )
).then(
--
To view, visit https://gerrit.wikimedia.org/r/206149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I017c1ed5bf25dcaeca2d08318cb36bab033a8853
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
