CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-10-24 13:04:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SPDY: set log action for PROXY protocol only while parsing it.

Browse source 
Handling of PROXY protocol for SPDY connection is currently implemented as
a SPDY state.  And while nginx waiting for PROXY protocol data it continues
to process SPDY connection: initializes zlib context, sends control frames.
This commit is contained in:
Valentin Bartenev 2014-05-15 19:22:06 +04:00
parent ef51079fe2
commit d51d168066
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/http/ngx_http_spdy.c
View file

@ -424,12 +424,8 @@ ngx_http_spdy_init(ngx_event_t *rev)
sc->init_window = NGX_SPDY_INIT_STREAM_WINDOW;
sc->handler = ngx_http_spdy_state_head;
if (hc->proxy_protocol) {
c->log->action = "reading PROXY protocol";
sc->handler = ngx_http_spdy_proxy_protocol;
}
sc->handler = hc->proxy_protocol ? ngx_http_spdy_proxy_protocol
: ngx_http_spdy_state_head;
sc->zstream_in.zalloc = ngx_http_spdy_zalloc;
sc->zstream_in.zfree = ngx_http_spdy_zfree;
@ -823,14 +819,19 @@ static u_char *
ngx_http_spdy_proxy_protocol(ngx_http_spdy_connection_t *sc, u_char *pos,
u_char *end)
{
ngx_log_t *log;
log = sc->connection->log;
log->action = "reading PROXY protocol";
pos = ngx_proxy_protocol_parse(sc->connection, pos, end);
log->action = "processing SPDY";
if (pos == NULL) {
return ngx_http_spdy_state_protocol_error(sc);
}
sc->connection->log->action = "processing SPDY";
return ngx_http_spdy_state_complete(sc, pos, end);
}