Core: renamed ngx_proxy_protocol_parse to ngx_proxy_protocol_read.

The new name is consistent with the ngx_proxy_protocol_write function.

diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c
index 74bc623f472a8c2958f5fd2e3d6e99eec31d1431..f347e7f434d38b43cdc08fe628ef141e2087d9d3 100644 (file)
--- 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 e9ad5d53fa3a9755c9aca71d65d89c343af84efb..fb848f683a4c1f2930afb3afa6cdfe06c1647f99 100644 (file)
--- 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 2669b522c1dd785db6b4c44fa57306499e95288c..cd5f3023028fc2f4dc30c0d3de47abdf7fafc745 100644 (file)
--- 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 6bb79b88bab4f32177724f361575887924a2fa2f..21c5217ca92915ea2e1a2d3fa4f7c568c80546da 100644 (file)
--- 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";