RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-05 19:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] tools: add a "word_match()" function to match words and ignore spaces

Browse Source 
Some header values might be delimited with spaces, so it's not enough to
compare "close" or "keep-alive" with strncasecmp(). Use word_match() for
that.
This commit is contained in:
Willy Tarreau 2010-01-18 15:05:57 +01:00
parent 68085d8cfb
commit 348238b3a9
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/common/standard.h
View File

@ -2,7 +2,7 @@
* include/common/standard.h
* This files contains some general purpose functions and macros.
*
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
* Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -363,4 +363,11 @@ char *my_strndup(const char *src, int n);
*/
unsigned int get_next_id(struct eb_root *root, unsigned int key);
/* This function compares a sample word possibly followed by blanks to another
* clean word. The compare is case-insensitive. 1 is returned if both are equal,
* otherwise zero. This intends to be used when checking HTTP headers for some
* values.
*/
int word_match(const char *sample, int slen, const char *word, int wlen);
#endif /* _COMMON_STANDARD_H */

31
src/standard.c
View File

@ -1,7 +1,7 @@
/*
* General purpose functions.
*
* Copyright 2000-2009 Willy Tarreau <w@1wt.eu>
* Copyright 2000-2010 Willy Tarreau <w@1wt.eu>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -813,6 +813,35 @@ unsigned int get_next_id(struct eb_root *root, unsigned int key)
return key;
}
/* This function compares a sample word possibly followed by blanks to another
* clean word. The compare is case-insensitive. 1 is returned if both are equal,
* otherwise zero. This intends to be used when checking HTTP headers for some
* values. Note that it validates a word followed only by blanks but does not
* validate a word followed by blanks then other chars.
*/
int word_match(const char *sample, int slen, const char *word, int wlen)
{
if (slen < wlen)
return 0;
while (wlen) {
char c = *sample ^ *word;
if (c && c != ('A' ^ 'a'))
return 0;
sample++;
word++;
slen--;
wlen--;
}
while (slen) {
if (*sample != ' ' && *sample != '\t')
return 0;
sample++;
slen--;
}
return 1;
}
/*
* Local variables: