Updated core file to Nginx-1.18.0.

alibaba · Mar 24, 2021 · dd4b208 · dd4b208
1 parent ca26648
commit dd4b208
Show file tree

Hide file tree

Showing 64 changed files with 1,799 additions and 508 deletions.
diff --git a/README.markdown b/README.markdown
@@ -9,7  9,7 @@ Tengine has been an open source project since December 2011. It is being activel
 Features
 ========
 
-* All features of nginx-1.17.3 are inherited, i.e., it is 100% compatible with nginx.
 * All features of nginx-1.18.0 are inherited, i.e., it is 100% compatible with nginx.
 * Support the CONNECT HTTP method for forward proxy.
 * Support asynchronous OpenSSL, using hardware such as QAT for HTTPS acceleration.
 * Enhanced operations monitoring, such as asynchronous log & rollback, DNS caching, memory usage, etc.

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
@@ -138,6  138,7 @@ with nginx by using --with-openssl=<path> option.
 END
         exit 1
     fi
 
 fi
 
 

diff --git a/auto/modules b/auto/modules
@@ -113,21  113,6 @@ if [ $HTTP = YES ]; then
     fi
 
 
-    if [ $HTTP_SSI = YES ]; then
-        HTTP_POSTPONE=YES
-    fi
-
-
-    if [ $HTTP_SLICE = YES ]; then
-        HTTP_POSTPONE=YES
-    fi
-
-
-    if [ $HTTP_ADDITION = YES ]; then
-        HTTP_POSTPONE=YES
-    fi
-
-
     # the module order is important
     #     ngx_http_static_module
     #     ngx_http_gzip_static_module
@@ -263,13  248,13 @@ if [ $HTTP = YES ]; then
         . auto/module
     fi
 
-    if [ $HTTP_POSTPONE = YES ]; then
     if :; then
         ngx_module_name=ngx_http_postpone_filter_module
         ngx_module_incs=
         ngx_module_deps=
         ngx_module_srcs=src/http/ngx_http_postpone_filter_module.c
         ngx_module_libs=
-        ngx_module_link=$HTTP_POSTPONE
         ngx_module_link=YES
 
         . auto/module
     fi

diff --git a/auto/options b/auto/options
@@ -61,7  61,6 @@ HTTP_GZIP=YES
 HTTP_SSL=YES
 HTTP_V2=NO
 HTTP_SSI=YES
-HTTP_POSTPONE=NO
 HTTP_REALIP=NO
 HTTP_XSLT=NO
 HTTP_IMAGE_FILTER=NO

diff --git a/auto/unix b/auto/unix
@@ -943,6  943,18 @@ ngx_feature_test="int i = FIONBIO; printf(\"%d\", i)"
 . auto/feature
 
 
 ngx_feature="ioctl(FIONREAD)"
 ngx_feature_name="NGX_HAVE_FIONREAD"
 ngx_feature_run=no
 ngx_feature_incs="#include <sys/ioctl.h>
                   #include <stdio.h>
                   $NGX_INCLUDE_SYS_FILIO_H"
 ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test="int i = FIONREAD; printf(\"%d\", i)"
 . auto/feature
 
 
 ngx_feature="struct tm.tm_gmtoff"
 ngx_feature_name="NGX_HAVE_GMTOFF"
 ngx_feature_run=no

diff --git a/contrib/vim/ftplugin/nginx.vim b/contrib/vim/ftplugin/nginx.vim
@@ -0,0  1 @@
 setlocal commentstring=#\ %s
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
@@ -333,6  333,7 @@ syn keyword ngxDirective contained js_access
 syn keyword ngxDirective contained js_content
 syn keyword ngxDirective contained js_filter
 syn keyword ngxDirective contained js_include
 syn keyword ngxDirective contained js_path
 syn keyword ngxDirective contained js_preread
 syn keyword ngxDirective contained js_set
 syn keyword ngxDirective contained keepalive
@@ -353,6  354,7 @@ syn keyword ngxDirective contained limit_conn_zone
 syn keyword ngxDirective contained limit_rate
 syn keyword ngxDirective contained limit_rate_after
 syn keyword ngxDirective contained limit_req
 syn keyword ngxDirective contained limit_req_dry_run
 syn keyword ngxDirective contained limit_req_log_level
 syn keyword ngxDirective contained limit_req_status
 syn keyword ngxDirective contained limit_req_zone
@@ -472,6  474,7 @@ syn keyword ngxDirective contained proxy_requests
 syn keyword ngxDirective contained proxy_responses
 syn keyword ngxDirective contained proxy_send_lowat
 syn keyword ngxDirective contained proxy_send_timeout
 syn keyword ngxDirective contained proxy_session_drop
 syn keyword ngxDirective contained proxy_set_body
 syn keyword ngxDirective contained proxy_set_header
 syn keyword ngxDirective contained proxy_socket_keepalive
@@ -1325,6  1328,7 @@ syn keyword ngxDirectiveThirdParty contained lua_check_client_abort
 syn keyword ngxDirectiveThirdParty contained lua_code_cache
 syn keyword ngxDirectiveThirdParty contained lua_fake_shm
 syn keyword ngxDirectiveThirdParty contained lua_http10_buffering
 syn keyword ngxDirectiveThirdParty contained lua_load_resty_core
 syn keyword ngxDirectiveThirdParty contained lua_malloc_trim
 syn keyword ngxDirectiveThirdParty contained lua_max_pending_timers
 syn keyword ngxDirectiveThirdParty contained lua_max_running_timers
@@ -1779,6  1783,7 @@ syn keyword ngxDirectiveThirdParty contained vod_expires_live_time_dependent
 syn keyword ngxDirectiveThirdParty contained vod_fallback_upstream_location
 syn keyword ngxDirectiveThirdParty contained vod_force_continuous_timestamps
 syn keyword ngxDirectiveThirdParty contained vod_force_playlist_type_vod
 syn keyword ngxDirectiveThirdParty contained vod_force_sequence_index
 syn keyword ngxDirectiveThirdParty contained vod_gop_look_ahead
 syn keyword ngxDirectiveThirdParty contained vod_gop_look_behind
 syn keyword ngxDirectiveThirdParty contained vod_ignore_edit_list

diff --git a/src/core/nginx.h b/src/core/nginx.h
@@ -9,8  9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1017003
-#define NGINX_VERSION      "1.17.3"
 #define nginx_version      1018000
 #define NGINX_VERSION      "1.18.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define TENGINE            "Tengine"

diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
@@ -49,7  49,7 @@
 #define NGX_DIRECT_CONF      0x00010000
 
 #define NGX_MAIN_CONF        0x01000000
-#define NGX_ANY_CONF         0x1F000000
 #define NGX_ANY_CONF         0xFF000000
 
 
 

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
@@ -159,8  159,7 @@ struct ngx_connection_s {
     socklen_t           socklen;
     ngx_str_t           addr_text;
 
-    ngx_str_t           proxy_protocol_addr;
-    in_port_t           proxy_protocol_port;
     ngx_proxy_protocol_t  *proxy_protocol;
 
 #if (NGX_SSL || NGX_COMPAT)
     ngx_ssl_connection_t  *ssl;

diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
@@ -26,6  26,7 @@ typedef struct ngx_event_aio_s       ngx_event_aio_t;
 typedef struct ngx_connection_s      ngx_connection_t;
 typedef struct ngx_thread_task_s     ngx_thread_task_t;
 typedef struct ngx_ssl_s             ngx_ssl_t;
 typedef struct ngx_proxy_protocol_s  ngx_proxy_protocol_t;
 typedef struct ngx_ssl_connection_s  ngx_ssl_connection_t;
 typedef struct ngx_udp_connection_s  ngx_udp_connection_t;
 

diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
@@ -1633,6  1633,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u)
 
 #endif /* NGX_HAVE_GETADDRINFO && NGX_HAVE_INET6 */
 
 
 static ngx_int_t
 ngx_inet_add_addr(ngx_pool_t *pool, ngx_url_t *u, struct sockaddr *sockaddr,
     socklen_t socklen, ngx_uint_t total)
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,6 138,7 @@ with nginx by using --with-openssl=<path> option. @@
     END
             exit 1
         fi
     fi
@@ Expand Down @@