Latest update - 9246
This commit is contained in:
+2
-2
@@ -9,8 +9,8 @@
|
|||||||
#define _NGINX_H_INCLUDED_
|
#define _NGINX_H_INCLUDED_
|
||||||
|
|
||||||
|
|
||||||
#define nginx_version 1025005
|
#define nginx_version 1027000
|
||||||
#define NGINX_VERSION "1.25.5"
|
#define NGINX_VERSION "1.27.0"
|
||||||
#define NGINX_VER "nginx/" NGINX_VERSION " by Hakase"
|
#define NGINX_VER "nginx/" NGINX_VERSION " by Hakase"
|
||||||
|
|
||||||
#ifndef NGINX_SERVER
|
#ifndef NGINX_SERVER
|
||||||
|
|||||||
@@ -764,13 +764,13 @@ ngx_ssl_load_certificate_key(ngx_pool_t *pool, char **err,
|
|||||||
|
|
||||||
engine = ENGINE_by_id((char *) p);
|
engine = ENGINE_by_id((char *) p);
|
||||||
|
|
||||||
|
*last++ = ':';
|
||||||
|
|
||||||
if (engine == NULL) {
|
if (engine == NULL) {
|
||||||
*err = "ENGINE_by_id() failed";
|
*err = "ENGINE_by_id() failed";
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
*last++ = ':';
|
|
||||||
|
|
||||||
pkey = ENGINE_load_private_key(engine, (char *) last, 0, 0);
|
pkey = ENGINE_load_private_key(engine, (char *) last, 0, 0);
|
||||||
|
|
||||||
if (pkey == NULL) {
|
if (pkey == NULL) {
|
||||||
|
|||||||
@@ -1575,6 +1575,15 @@ ngx_http_v3_request_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
|
|||||||
/* rc == NGX_OK */
|
/* rc == NGX_OK */
|
||||||
|
|
||||||
if (max != -1 && (uint64_t) (max - rb->received) < st->length) {
|
if (max != -1 && (uint64_t) (max - rb->received) < st->length) {
|
||||||
|
|
||||||
|
if (r->headers_in.content_length_n != -1) {
|
||||||
|
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
||||||
|
"client intended to send body data "
|
||||||
|
"larger than declared");
|
||||||
|
|
||||||
|
return NGX_HTTP_BAD_REQUEST;
|
||||||
|
}
|
||||||
|
|
||||||
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
||||||
"client intended to send too large "
|
"client intended to send too large "
|
||||||
"body: %O+%ui bytes",
|
"body: %O+%ui bytes",
|
||||||
|
|||||||
@@ -83,6 +83,11 @@ ngx_stream_pass_handler(ngx_stream_session_t *s)
|
|||||||
|
|
||||||
c->log->action = "passing connection to port";
|
c->log->action = "passing connection to port";
|
||||||
|
|
||||||
|
if (c->type == SOCK_DGRAM) {
|
||||||
|
ngx_log_error(NGX_LOG_ERR, c->log, 0, "cannot pass udp connection");
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
|
||||||
if (c->buffer && c->buffer->pos != c->buffer->last) {
|
if (c->buffer && c->buffer->pos != c->buffer->last) {
|
||||||
ngx_log_error(NGX_LOG_ERR, c->log, 0,
|
ngx_log_error(NGX_LOG_ERR, c->log, 0,
|
||||||
"cannot pass connection with preread data");
|
"cannot pass connection with preread data");
|
||||||
@@ -217,6 +222,10 @@ ngx_stream_pass_cleanup(void *data)
|
|||||||
static ngx_int_t
|
static ngx_int_t
|
||||||
ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr)
|
ngx_stream_pass_match(ngx_listening_t *ls, ngx_addr_t *addr)
|
||||||
{
|
{
|
||||||
|
if (ls->type == SOCK_DGRAM) {
|
||||||
|
return NGX_DECLINED;
|
||||||
|
}
|
||||||
|
|
||||||
if (!ls->wildcard) {
|
if (!ls->wildcard) {
|
||||||
return ngx_cmp_sockaddr(ls->sockaddr, ls->socklen,
|
return ngx_cmp_sockaddr(ls->sockaddr, ls->socklen,
|
||||||
addr->sockaddr, addr->socklen, 1);
|
addr->sockaddr, addr->socklen, 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user