Mercurial > hg > nginx

diff src/http/ngx_http_request.c @ 6185:a420cb1c170b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 187aa751ad62
children 06e850859a26
line wrap: on
line diff
--- 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_
     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);