lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-12-18 16:34:09 +03:00
Code Activity

Refactor ETag comparison logic and add test for If-None-Match with non-existent file

Browse Source
This commit is contained in:
yhirose
2025-12-05 15:54:32 -05:00
parent ef2b0a8d0b
commit 33e0bbfb35
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
httplib.h
View File

@@ -8473,12 +8473,8 @@ inline bool Server::check_if_not_modified(const Request &req, Response &res,
// simplified implementation requires exact matches.
auto ret = detail::split_find(val.data(), val.data() + val.size(), ',',
[&](const char *b, const char *e) {
auto len = static_cast<size_t>(e - b);
if (len == 1 && *b == '*') return true;
if (len == etag.size() &&
std::equal(b, e, etag.begin()))
return true;
return false;
return std::equal(b, e, "*") ||
std::equal(b, e, etag.begin());
});
if (ret) {

34
test/test.cc
View File

@@ -12751,6 +12751,26 @@ TEST(ETagTest, StaticFileETagAndIfNoneMatch) {
std::remove(fname);
}
TEST(ETagTest, StaticFileETagIfNoneMatchStarNotFound) {
using namespace httplib;
Server svr;
svr.set_mount_point("/static", ".");
auto t = std::thread([&]() { svr.listen("localhost", 8090); });
svr.wait_until_ready();
Client cli("localhost", 8090);
// Send If-None-Match: * to a non-existent file
Headers h = {{"If-None-Match", "*"}};
auto res = cli.Get("/static/etag_testfile_notfound.txt", h);
ASSERT_TRUE(res);
EXPECT_EQ(404, res->status);
svr.stop();
t.join();
}
TEST(ETagTest, LastModifiedAndIfModifiedSince) {
using namespace httplib;
@@ -13085,16 +13105,4 @@ TEST(ETagTest, IfRangeWithMalformedETag) {
svr.stop();
t.join();
std::remove(fname);
}
TEST(ETagTest, DateParsingAndMtimeNegative) {
using namespace httplib;
// parse_http_date should return -1 for invalid format
time_t parsed = detail::parse_http_date("this is not a date");
EXPECT_EQ(static_cast<time_t>(-1), parsed);
// file_mtime_to_http_date returns empty string for negative mtime
std::string s = detail::file_mtime_to_http_date(static_cast<time_t>(-1));
EXPECT_TRUE(s.empty());
}
}