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

MINOR: http: Call http_send_name_header with the stream instead of the txn

Browse Source 
This is just a minor change to ease integrartion of the HTX.
This commit is contained in:
Christopher Faulet 2018-10-23 15:34:07 +02:00 committed by Willy Tarreau
parent 8277ca72b1
commit 27a3dc8fb2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/proto_http.h
View File

@ -40,7 +40,7 @@ int http_process_req_common(struct stream *s, struct channel *req, int an_bit, s
int http_process_request(struct stream *s, struct channel *req, int an_bit); int http_process_request(struct stream *s, struct channel *req, int an_bit);
int http_process_tarpit(struct stream *s, struct channel *req, int an_bit); int http_process_tarpit(struct stream *s, struct channel *req, int an_bit);
int http_wait_for_request_body(struct stream *s, struct channel *req, int an_bit); int http_wait_for_request_body(struct stream *s, struct channel *req, int an_bit);
int http_send_name_header(struct http_txn *txn, struct proxy* be, const char* svr_name); int http_send_name_header(struct stream *s, struct proxy* be, const char* svr_name);
int http_wait_for_response(struct stream *s, struct channel *rep, int an_bit); int http_wait_for_response(struct stream *s, struct channel *rep, int an_bit);
int http_process_res_common(struct stream *s, struct channel *rep, int an_bit, struct proxy *px); int http_process_res_common(struct stream *s, struct channel *rep, int an_bit, struct proxy *px);
int http_request_forward_body(struct stream *s, struct channel *req, int an_bit); int http_request_forward_body(struct stream *s, struct channel *req, int an_bit);

4
src/proto_http.c
View File

@ -3646,10 +3646,10 @@ int http_wait_for_request_body(struct stream *s, struct channel *req, int an_bit
* for being forwarded. This is the reason why it rewinds the buffer before * for being forwarded. This is the reason why it rewinds the buffer before
* proceeding. * proceeding.
*/ */
int http_send_name_header(struct http_txn *txn, struct proxy* be, const char* srv_name) { int http_send_name_header(struct stream *s, struct proxy* be, const char* srv_name) {
struct hdr_ctx ctx; struct hdr_ctx ctx;
struct http_txn *txn = s->txn;
char *hdr_name = be->server_id_hdr_name; char *hdr_name = be->server_id_hdr_name;
int hdr_name_len = be->server_id_hdr_len; int hdr_name_len = be->server_id_hdr_len;
struct channel *chn = txn->req.chn; struct channel *chn = txn->req.chn;

2
src/stream.c
View File

@ -2306,7 +2306,7 @@ redo:
(s->be->server_id_hdr_name != NULL) && (s->be->server_id_hdr_name != NULL) &&
(s->be->mode == PR_MODE_HTTP) && (s->be->mode == PR_MODE_HTTP) &&
objt_server(s->target)) { objt_server(s->target)) {
http_send_name_header(s->txn, s->be, objt_server(s->target)->id); http_send_name_header(s, s->be, objt_server(s->target)->id);
} }
srv = objt_server(s->target); srv = objt_server(s->target);