Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Parsoid API: emit strong eTags"

Browse source
This commit is contained in:
jenkins-bot 2022-06-17 18:57:33 +00:00 committed by Gerrit Code Review
commit 3a66ddbf57
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/Rest/Handler/ParsoidHandler.php
View file

@ -127,8 +127,10 @@ abstract class ParsoidHandler extends Handler {
parent::checkPreconditions();
// Disable precondition checks by ignoring the return value above.
// Parsoid/JS doesn't implement these checks.
// See https://phabricator.wikimedia.org/T238849#5683035 for a discussion.
// This works around the problem that Visual Editor sends weak ETags with
// If-Match headers in some requests, which always fails. The weak ETags seem
// to originate from Varnish. See T238849 for the issue that prompted this
// workaround, and T310710 for removing it.
return null;
}
@ -697,7 +699,7 @@ abstract class ParsoidHandler extends Handler {
}
if ( $request->getMethod() === 'GET' ) {
$tid = UIDGenerator::newUUIDv1();
$response->addHeader( 'Etag', "W/\"{$oldid}/{$tid}\"" );
$response->addHeader( 'Etag', "\"{$oldid}/{$tid}\"" );
}
// FIXME: For pagebundle requests, this can be somewhat inflated

1
tests/api-testing/REST/Page.js
View file

@ -113,6 +113,7 @@ describe( 'Page Source', () => {
assert.strictEqual( isNaN( postEditDate.getTime() ), false );
assert.notEqual( preEditDate, postEditDate );
assert.notEqual( preEditEtag, postEditEtag );
assert.match( postEditHeaders.etag, /^".*"$/, 'ETag must be present and not marked weak' );
} );
} );

1
tests/api-testing/REST/Revision.js
View file

@ -142,6 +142,7 @@ describe( 'Revision', () => {
assert.match( text, /<html / );
assert.match( text, /Hello World/ );
assert.match( headers.etag, /^".*"$/, 'ETag must be present and not marked weak' );
} );
it( 'should return 404 for revision that does not exist', async () => {