Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Server error #7784

Merged
merged 4 commits into from
Jan 1, 2023
Merged

Fix Server error #7784

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f205248
Fix Server error
Joerg-Schoemer Dec 20, 2022
fb68a99
Merge branch 'dev' into master
sulkaharo Jan 1, 2023
417a0e4
Merge branch 'dev' into master
sulkaharo Jan 1, 2023
2af94d3
Merge branch 'dev' into master
sulkaharo Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 13 additions & 11 deletions lib/api/treatments/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,20 @@ function configure (app, wares, ctx, env) {
}
});

if (!_isNil(d1)) res.setHeader('Last-Modified', d1.toUTCString());
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is possible that d1 is null, but the next call d1.getTime() was not 'not null safe'.


if (ifModifiedSince && d1.getTime() <= moment(ifModifiedSince).valueOf()) {
res.status(304).send({
status: 304
, message: 'Not modified'
, type: 'internal'
});
return;
} else {
return res.json(results);
if (!_isNil(d1)) {
res.setHeader('Last-Modified', d1.toUTCString());

if (ifModifiedSince && d1.getTime() <= moment(ifModifiedSince).valueOf()) {
res.status(304).send({
status: 304
, message: 'Not modified'
, type: 'internal'
});
return;
}
}

return res.json(results);
}

// List treatments available
Expand Down