Mercurial > hg > nginx

comparison src/stream/ngx_stream_proxy_module.c @ 8099:17d6a537fb1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Increased maximum read PROXY protocol header size. Maximum size for reading the PROXY protocol header is increased to 4096 to accommodate a bigger number of TLVs, which are supported since cca4c8a715de. Maximum size for writing the PROXY protocol header is not changed since only version 1 is currently supported.
author Roman Arutyunyan <arut@nginx.com>
date Wed, 02 Nov 2022 13:46:16 +0400
parents 9d98d524bd02
children 06c7d84cafdb
comparison
equal deleted inserted replaced
8098:a2924855f453 8099:17d6a537fb1b
892 if (cl == NULL) { 892 if (cl == NULL) {
893 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); 893 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
894 return; 894 return;
895 } 895 }
896 896
897 p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_MAX_HEADER); 897 p = ngx_pnalloc(c->pool, NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
898 if (p == NULL) { 898 if (p == NULL) {
899 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); 899 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
900 return; 900 return;
901 } 901 }
902 902
903 cl->buf->pos = p; 903 cl->buf->pos = p;
904 904
905 p = ngx_proxy_protocol_write(c, p, p + NGX_PROXY_PROTOCOL_MAX_HEADER); 905 p = ngx_proxy_protocol_write(c, p,
906 p + NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
906 if (p == NULL) { 907 if (p == NULL) {
907 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); 908 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
908 return; 909 return;
909 } 910 }
910 911
944 u_char *p; 945 u_char *p;
945 ssize_t n, size; 946 ssize_t n, size;
946 ngx_connection_t *c, *pc; 947 ngx_connection_t *c, *pc;
947 ngx_stream_upstream_t *u; 948 ngx_stream_upstream_t *u;
948 ngx_stream_proxy_srv_conf_t *pscf; 949 ngx_stream_proxy_srv_conf_t *pscf;
949 u_char buf[NGX_PROXY_PROTOCOL_MAX_HEADER]; 950 u_char buf[NGX_PROXY_PROTOCOL_V1_MAX_HEADER];
950 951
951 c = s->connection; 952 c = s->connection;
952 953
953 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, 954 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
954 "stream proxy send PROXY protocol header"); 955 "stream proxy send PROXY protocol header");
955 956
956 p = ngx_proxy_protocol_write(c, buf, buf + NGX_PROXY_PROTOCOL_MAX_HEADER); 957 p = ngx_proxy_protocol_write(c, buf,
958 buf + NGX_PROXY_PROTOCOL_V1_MAX_HEADER);
957 if (p == NULL) { 959 if (p == NULL) {
958 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR); 960 ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
959 return NGX_ERROR; 961 return NGX_ERROR;
960 } 962 }
961 963