Skip to content

Commit

Permalink
fix(chromium): best effort 304 status on reload (#29373)
Browse files Browse the repository at this point in the history
Reference #28779
  • Loading branch information
yury-s authored Feb 6, 2024
1 parent 4bafe71 commit 17bc8f9
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
10 changes: 10 additions & 0 deletions packages/playwright-core/src/server/chromium/crNetworkManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,8 @@ class ResponseExtraInfoTracker {
if (response && responseExtraInfo) {
response.setResponseHeadersSize(responseExtraInfo.headersText?.length || 0);
response.setRawResponseHeaders(headersObjectToArray(responseExtraInfo.headers, '\n'));
// This is racy, but proper fix reuquires risky changes, so we doing best effort here.
response.setRawStatus(responseExtraInfo.statusCode, getStatusText(responseExtraInfo.headersText));
info.responseReceivedExtraInfo[index] = undefined;
}
}
Expand All @@ -781,3 +783,11 @@ class ResponseExtraInfoTracker {
this._requests.delete(requestId);
}
}

function getStatusText(headersText?: string): string {
if (!headersText)
return '';
const statusLine = headersText.split('\n')[0];
const match = statusLine.match(/\S+\s+\d+\s*(.*)/);
return match?.[1] ?? '';
}
5 changes: 5 additions & 0 deletions packages/playwright-core/src/server/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,11 @@ export class Response extends SdkObject {
this._transferSizePromise.resolve(size);
}

setRawStatus(status: number, statusText: string) {
this._status = status;
this._statusText = statusText;
}

setEncodedBodySize(size: number | null) {
this._encodedBodySizePromise.resolve(size);
}
Expand Down
10 changes: 7 additions & 3 deletions tests/page/page-network-request.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@ it('should not allow to access frame on popup main request', async ({ page, serv

it('page.reload return 304 status code', async ({ page, server, browserName }) => {
it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28779' });
it.fixme(browserName === 'chromium', 'Returns 200 instead of 304');
it.fixme(browserName === 'firefox', 'Does not send second request');
let requestNumber = 0;
server.setRoute('/test.html', (req, res) => {
Expand All @@ -473,6 +472,11 @@ it('page.reload return 304 status code', async ({ page, server, browserName }) =
expect(response1.status()).toBe(200);
const response2 = await page.reload();
expect(requestNumber).toBe(2);
expect(response2.status()).toBe(304);
expect(response2.statusText()).toBe('Not Modified');
if (browserName === 'chromium') {
expect([200, 304].includes(response2.status()), 'actual status: ' + response2.status());
expect(['OK', 'Not Modified'].includes(response2.statusText()), 'actual statusText: ' + response2.statusText());
} else {
expect(response2.status()).toBe(304);
expect(response2.statusText()).toBe('Not Modified');
}
});

0 comments on commit 17bc8f9

Please sign in to comment.