RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: http: remove some leftovers from recent cleanups 

The prototypes of functions find_hdr_value_end(), extract_cookie_value()
and http_header_match2() were still in proto_http.h while some of them
don't exist anymore and the others were just moved. Let's remove them.
In addition, da.c was updated to use http_extract_cookie_value() which
is the correct one.
This commit is contained in:
Willy Tarreau 2018-10-02 18:37:27 +02:00
parent 61c112aa5b
commit 491cec20be
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/proto/proto_http.h
View File

@ -82,10 +82,6 @@ int http_find_header2(const char *name, int len,
struct hdr_ctx *ctx);
int http_find_next_header(char *sol, struct hdr_idx *idx,
struct hdr_ctx *ctx);
char *find_hdr_value_end(char *s, const char *e);
char *extract_cookie_value(char *hdr, const char *hdr_end, char *cookie_name,
size_t cookie_name_l, int list, char **value, size_t *value_l);
int http_header_match2(const char *hdr, const char *end, const char *name, int len);
int http_remove_header2(struct http_msg *msg, struct hdr_idx *idx, struct hdr_ctx *ctx);
int http_header_add_tail2(struct http_msg *msg, struct hdr_idx *hdr_idx, const char *text, int len);
int http_replace_req_line(int action, const char *replace, int len, struct proxy *px, struct stream *s);

3
src/da.c
View File

@ -2,6 +2,7 @@
#include <common/cfgparse.h>
#include <common/errors.h>
#include <common/http.h>
#include <proto/arg.h>
#include <proto/http_fetch.h>
#include <proto/log.h>
@ -335,7 +336,7 @@ static int da_haproxy_fetch(const struct arg *args, struct sample *smp, const ch
* The cookie value, if it exists, is located between the current header's
* value position and the next one
*/
if (extract_cookie_value(pval, eval, global_deviceatlas.cookiename,
if (http_extract_cookie_value(pval, eval, global_deviceatlas.cookiename,
global_deviceatlas.cookienamelen, 1, &p, &pl) == NULL) {
continue;
}