mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: http: Add etag comparison function

Browse Source 
Add a function that compares two etags that might be of different types.
If any of them is weak, the 'W/' prefix is discarded and a strict string
comparison is performed.

Co-authored-by: Tim Duesterhus <tim@bastelstu.be>
This commit is contained in:
Remi Tricot-Le Breton 2020-10-22 10:40:03 +02:00 committed by William Lallemand
parent 2493ee81d4
commit bcced09b91
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/http.h
View File

@ -57,6 +57,8 @@ int http_parse_header(const struct ist hdr, struct ist *name, struct ist *value)
int http_parse_stline(const struct ist line, struct ist *p1, struct ist *p2, struct ist *p3); int http_parse_stline(const struct ist line, struct ist *p1, struct ist *p2, struct ist *p3);
int http_parse_status_val(const struct ist value, struct ist *status, struct ist *reason); int http_parse_status_val(const struct ist value, struct ist *status, struct ist *reason);
int http_compare_etags(struct ist etag1, struct ist etag2);
/* /*
* Given a path string and its length, find the position of beginning of the * Given a path string and its length, find the position of beginning of the
* query string. Returns NULL if no query string is found in the path. * query string. Returns NULL if no query string is found in the path.

26
src/http.c
View File

@ -1047,3 +1047,29 @@ int http_parse_status_val(const struct ist value, struct ist *status, struct ist
code = strl2ui(status->ptr, status->len); code = strl2ui(status->ptr, status->len);
return code; return code;
} }
/* Returns non-zero if the two ETags are comparable (see RFC 7232#2.3.2).
* If any of them is a weak ETag, we discard the weakness prefix and perform
* a strict string comparison.
* Returns 0 otherwise.
*/
int http_compare_etags(struct ist etag1, struct ist etag2)
{
enum http_etag_type etag_type1;
enum http_etag_type etag_type2;
etag_type1 = http_get_etag_type(etag1);
etag_type2 = http_get_etag_type(etag2);
if (etag_type1 == ETAG_INVALID || etag_type2 == ETAG_INVALID)
return 0;
/* Discard the 'W/' prefix an ETag is a weak one. */
if (etag_type1 == ETAG_WEAK)
etag1 = istadv(etag1, 2);
if (etag_type2 == ETAG_WEAK)
etag2 = istadv(etag2, 2);
return isteq(etag1, etag2);
}