root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix redirect caching in HttpUriPlugin

This commit is contained in:
Tobias Koppers 2022-02-14 12:15:52 +01:00
parent a6099c4ff9
commit c128f4fe44
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/schemes/HttpUriPlugin.js
View File

@ -509,7 +509,7 @@ class HttpUriPlugin {
/**
* @param {string} url URL
* @param {FetchResult} cachedResult result from cache
* @param {FetchResult | RedirectFetchResult} cachedResult result from cache
* @param {function((Error | null)=, FetchResult=): void} callback callback
* @returns {void}
*/
@ -543,15 +543,6 @@ class HttpUriPlugin {
logger.debug(
`GET ${url} [${res.statusCode}] -> ${partialResult.location}`
);
// we should follow redirect and not store partial result
return callback(null, {
...partialResult,
storeLock,
storeCache,
fresh: true,
etag: undefined,
validUntil: undefined
});
} else {
logger.debug(
`GET ${url} [${res.statusCode}] ${Math.ceil(
@ -612,9 +603,30 @@ class HttpUriPlugin {
res.statusCode >= 301 &&
res.statusCode <= 308
) {
return finishWith({
const result = {
location: new URL(location, url).href
});
};
if (
!cachedResult ||
!("location" in cachedResult) ||
cachedResult.location !== result.location ||
cachedResult.validUntil < validUntil ||
cachedResult.storeLock !== storeLock ||
cachedResult.storeCache !== storeCache ||
cachedResult.etag !== etag
) {
return finishWith(result);
} else {
logger.debug(`GET ${url} [${res.statusCode}] (unchanged)`);
return callback(null, {
...result,
fresh: true,
storeLock,
storeCache,
validUntil,
etag
});
}
}
const contentType = res.headers["content-type"] || "";
const bufferArr = [];