[nginx] Core: renamed ngx_proxy_protocol_parse to ngx_proxy_prot...

[Roman Arutyunyan]

details:   http://hg.nginx.org/nginx/rev/a420cb1c170b
branches:  
changeset: 6185:a420cb1c170b
user:      Roman Arutyunyan <arut at nginx.com>
date:      Tue Jun 16 13:45:19 2015 +0300
description:
Core: renamed ngx_proxy_protocol_parse to ngx_proxy_protocol_read.

The new name is consistent with the ngx_proxy_protocol_write function.

diffstat:

 src/core/ngx_proxy_protocol.c |  2 +-
 src/core/ngx_proxy_protocol.h |  2 +-
 src/http/ngx_http_request.c   |  4 ++--
 src/http/ngx_http_spdy.c      |  2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r fa663739e115 -r a420cb1c170b src/core/ngx_proxy_protocol.c
--- 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;
diff -r fa663739e115 -r a420cb1c170b src/core/ngx_proxy_protocol.h
--- 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);
diff -r fa663739e115 -r a420cb1c170b src/http/ngx_http_request.c
--- 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 @@ ngx_http_wait_request_handler(ngx_event_
     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 -r fa663739e115 -r a420cb1c170b src/http/ngx_http_spdy.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 @@ ngx_http_spdy_proxy_protocol(ngx_http_sp
     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";