diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2015-06-16 13:45:19 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2015-06-16 13:45:19 +0300 |
| commit | 4404c3fd6d10ce6e393113aabb32cfe7818ff8ac (patch) | |
| tree | c8aa5543423d3e3ef102f75b077f28c6cd0a0efd | |
| parent | 3ed1b3b5b0ab92666d1e24f9161561d580421f17 (diff) | |
| download | nginx-4404c3fd6d10ce6e393113aabb32cfe7818ff8ac.tar.gz | |
Core: renamed ngx_proxy_protocol_parse to ngx_proxy_protocol_read.
The new name is consistent with the ngx_proxy_protocol_write function.
| -rw-r--r-- | src/core/ngx_proxy_protocol.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_proxy_protocol.h | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_spdy.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c index 74bc623f4..f347e7f43 100644 --- a/src/core/ngx_proxy_protocol.c +++ b/src/core/ngx_proxy_protocol.c @@ -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; diff --git a/src/core/ngx_proxy_protocol.h b/src/core/ngx_proxy_protocol.h index e9ad5d53f..fb848f683 100644 --- a/src/core/ngx_proxy_protocol.h +++ b/src/core/ngx_proxy_protocol.h @@ -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); diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 2669b522c..cd5f30230 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -467,7 +467,7 @@ ngx_http_wait_request_handler(ngx_event_t *rev) 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 @@ ngx_http_ssl_handshake(ngx_event_t *rev) 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); diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c index 6bb79b88b..21c5217ca 100644 --- a/src/http/ngx_http_spdy.c +++ b/src/http/ngx_http_spdy.c @@ -866,7 +866,7 @@ ngx_http_spdy_proxy_protocol(ngx_http_spdy_connection_t *sc, u_char *pos, 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"; |