Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 6185:a420cb1c170b
Core: renamed ngx_proxy_protocol_parse to ngx_proxy_protocol_read.
The new name is consistent with the ngx_proxy_protocol_write function.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Tue, 16 Jun 2015 13:45:19 +0300 |
parents | 187aa751ad62 |
children | 06e850859a26 |
comparison
equal
deleted
inserted
replaced
6184:fa663739e115 | 6185:a420cb1c170b |
---|---|
465 b->last += n; | 465 b->last += n; |
466 | 466 |
467 if (hc->proxy_protocol) { | 467 if (hc->proxy_protocol) { |
468 hc->proxy_protocol = 0; | 468 hc->proxy_protocol = 0; |
469 | 469 |
470 p = ngx_proxy_protocol_parse(c, b->pos, b->last); | 470 p = ngx_proxy_protocol_read(c, b->pos, b->last); |
471 | 471 |
472 if (p == NULL) { | 472 if (p == NULL) { |
473 ngx_http_close_connection(c); | 473 ngx_http_close_connection(c); |
474 return; | 474 return; |
475 } | 475 } |
673 } | 673 } |
674 | 674 |
675 if (hc->proxy_protocol) { | 675 if (hc->proxy_protocol) { |
676 hc->proxy_protocol = 0; | 676 hc->proxy_protocol = 0; |
677 | 677 |
678 p = ngx_proxy_protocol_parse(c, buf, buf + n); | 678 p = ngx_proxy_protocol_read(c, buf, buf + n); |
679 | 679 |
680 if (p == NULL) { | 680 if (p == NULL) { |
681 ngx_http_close_connection(c); | 681 ngx_http_close_connection(c); |
682 return; | 682 return; |
683 } | 683 } |