mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: renamed ngx_proxy_protocol_parse to ngx_proxy_protocol_read.

Browse Source 
The new name is consistent with the ngx_proxy_protocol_write function.
This commit is contained in:
Roman Arutyunyan 2015-06-16 13:45:19 +03:00
parent 3ed1b3b5b0
commit 4404c3fd6d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_proxy_protocol.c
View File

@ -10,7 +10,7 @@
u_char * 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; size_t len;
u_char ch, *p, *addr; u_char ch, *p, *addr;

2
src/core/ngx_proxy_protocol.h
View File

@ -16,7 +16,7 @@
#define NGX_PROXY_PROTOCOL_MAX_HEADER 107 #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 *last);
u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf,
u_char *last); u_char *last);

4
src/http/ngx_http_request.c
View File

@ -467,7 +467,7 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
if (hc->proxy_protocol) { if (hc->proxy_protocol) {
hc->proxy_protocol = 0; 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) { if (p == NULL) {
ngx_http_close_connection(c); ngx_http_close_connection(c);
@ -675,7 +675,7 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
if (hc->proxy_protocol) { if (hc->proxy_protocol) {
hc->proxy_protocol = 0; 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) { if (p == NULL) {
ngx_http_close_connection(c); ngx_http_close_connection(c);

2
src/http/ngx_http_spdy.c
View File

@ -866,7 +866,7 @@ ngx_http_spdy_proxy_protocol(ngx_http_spdy_connection_t *sc, u_char *pos,
log = sc->connection->log; log = sc->connection->log;
log->action = "reading PROXY protocol"; 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"; log->action = "processing SPDY";