Mercurial > hg > nginx
changeset 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 | fa663739e115 |
children | db138b3b645e |
files | src/core/ngx_proxy_protocol.c src/core/ngx_proxy_protocol.h src/http/ngx_http_request.c src/http/ngx_http_spdy.c |
diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_proxy_protocol.c Tue Jun 16 13:45:16 2015 +0300 +++ b/src/core/ngx_proxy_protocol.c Tue Jun 16 13:45:19 2015 +0300 @@ -10,7 +10,7 @@ u_char * -ngx_proxy_protocol_parse(ngx_connection_t *c, u_char *buf, u_char *last) +ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last) { size_t len; u_char ch, *p, *addr;
--- a/src/core/ngx_proxy_protocol.h Tue Jun 16 13:45:16 2015 +0300 +++ b/src/core/ngx_proxy_protocol.h Tue Jun 16 13:45:19 2015 +0300 @@ -16,7 +16,7 @@ #define NGX_PROXY_PROTOCOL_MAX_HEADER 107 -u_char *ngx_proxy_protocol_parse(ngx_connection_t *c, u_char *buf, +u_char *ngx_proxy_protocol_read(ngx_connection_t *c, u_char *buf, u_char *last); u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last);
--- a/src/http/ngx_http_request.c Tue Jun 16 13:45:16 2015 +0300 +++ b/src/http/ngx_http_request.c Tue Jun 16 13:45:19 2015 +0300 @@ -467,7 +467,7 @@ if (hc->proxy_protocol) { hc->proxy_protocol = 0; - p = ngx_proxy_protocol_parse(c, b->pos, b->last); + p = ngx_proxy_protocol_read(c, b->pos, b->last); if (p == NULL) { ngx_http_close_connection(c); @@ -675,7 +675,7 @@ if (hc->proxy_protocol) { hc->proxy_protocol = 0; - p = ngx_proxy_protocol_parse(c, buf, buf + n); + p = ngx_proxy_protocol_read(c, buf, buf + n); if (p == NULL) { ngx_http_close_connection(c);
--- a/src/http/ngx_http_spdy.c Tue Jun 16 13:45:16 2015 +0300 +++ b/src/http/ngx_http_spdy.c Tue Jun 16 13:45:19 2015 +0300 @@ -866,7 +866,7 @@ log = sc->connection->log; log->action = "reading PROXY protocol"; - pos = ngx_proxy_protocol_parse(sc->connection, pos, end); + pos = ngx_proxy_protocol_read(sc->connection, pos, end); log->action = "processing SPDY";