Mercurial > hg > nginx-quic

comparison src/stream/ngx_stream_proxy_module.c @ 8999:91ad1abfb285 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 15 Dec 2022 19:40:44 +0400
parents b30bec3d71d6 06c7d84cafdb
children 0af598651e33
comparison
equal deleted inserted replaced
8991:b87a0dbc1150 8999:91ad1abfb285
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
1671 } 1673 }
1672 } 1674 }
1673 1675
1674 size = b->end - b->last; 1676 size = b->end - b->last;
1675 1677
1676 if (size && src->read->ready && !src->read->delayed 1678 if (size && src->read->ready && !src->read->delayed) {
1677 && !src->read->error) 1679
1678 {
1679 if (limit_rate) { 1680 if (limit_rate) {
1680 limit = (off_t) limit_rate * (ngx_time() - u->start_sec + 1) 1681 limit = (off_t) limit_rate * (ngx_time() - u->start_sec + 1)
1681 - *received; 1682 - *received;
1682 1683
1683 if (limit <= 0) { 1684 if (limit <= 0) {