5b6f78c Merge pull request #1541 from lianglli/master

64 files Merged by Mengqi Wu 3 years ago, Committed by GitHub 3 years ago,
64 files changed. 1799 lines added. 508 lines removed.
README.markdown
file modified
+1 -1
auto/lib/openssl/conf
file modified
+1 -0
auto/modules
file modified
+2 -17
auto/options
file modified
+0 -1
auto/unix
file modified
+12 -0
contrib/vim/ftplugin/nginx.vim
file added
+1
contrib/vim/syntax/nginx.vim
file modified
+5 -0
src/core/nginx.h
file modified
+2 -2
src/core/ngx_conf_file.h
file modified
+1 -1
src/core/ngx_connection.h
file modified
+1 -2
src/core/ngx_core.h
file modified
+1 -0
src/core/ngx_inet.c
file modified
+1 -0
src/core/ngx_proxy_protocol.c
file modified
+141 -62
src/core/ngx_proxy_protocol.h
file modified
+8 -0
src/core/ngx_rbtree.c
file modified
+1 -6
src/core/ngx_resolver.c
file modified
+2 -1
src/event/modules/ngx_devpoll_module.c
file modified
+1 -0
src/event/modules/ngx_epoll_module.c
file modified
+1 -2
src/event/modules/ngx_eventport_module.c
file modified
+1 -0
src/event/modules/ngx_poll_module.c
file modified
+1 -0
src/event/modules/ngx_select_module.c
file modified
+1 -0
src/event/modules/ngx_win32_poll_module.c
file added
+436
src/event/modules/ngx_win32_select_module.c
file modified
+1 -0
src/event/ngx_event.c
file modified
+6 -0
src/event/ngx_event.h
file modified
+1 -8
src/event/ngx_event_openssl.c
file modified
+48 -0
src/event/ngx_event_pipe.c
file modified
+5 -1
src/event/ngx_event_posted.c
file modified
+25 -0
src/event/ngx_event_posted.h
file modified
+2 -0
src/http/modules/ngx_http_auth_basic_module.c
file modified
+18 -19
src/http/modules/ngx_http_dav_module.c
file modified
+10 -28
src/http/modules/ngx_http_grpc_module.c
file modified
+190 -38
src/http/modules/ngx_http_index_module.c
file modified
+1 -1
src/http/modules/ngx_http_limit_conn_module.c
file modified
+138 -50
src/http/modules/ngx_http_limit_req_module.c
file modified
+74 -5
src/http/modules/ngx_http_memcached_module.c
file modified
+0 -3
src/http/modules/ngx_http_mp4_module.c
file modified
+64 -11
src/http/modules/ngx_http_realip_module.c
file modified
+3 -4
src/http/modules/ngx_http_rewrite_module.c
file modified
+5 -0
src/http/modules/ngx_http_scgi_module.c
file modified
+1 -0
src/http/modules/ngx_http_ssl_module.c
file modified
+1 -1
src/http/modules/ngx_http_static_module.c
file modified
+2 -2
src/http/modules/ngx_http_upstream_keepalive_module.c
file modified
+1 -0
src/http/ngx_http_core_module.c
file modified
+111 -30
src/http/ngx_http_core_module.h
file modified
+1 -0
src/http/ngx_http_parse.c
file modified
+44 -7
src/http/ngx_http_request.c
file modified
+24 -32
src/http/ngx_http_request.h
file modified
+3 -3
src/http/ngx_http_script.c
file modified
+8 -1
src/http/ngx_http_special_response.c
file modified
+12 -0
src/http/ngx_http_upstream.h
file modified
+0 -1
src/http/ngx_http_variables.c
file modified
+34 -6
src/http/v2/ngx_http_v2.c
file modified
+73 -100
src/http/v2/ngx_http_v2.h
file modified
+3 -0
src/http/v2/ngx_http_v2_filter_module.c
file modified
+12 -1
src/mail/ngx_mail_ssl_module.c
file modified
+1 -1
src/os/unix/ngx_readv_chain.c
file modified
+35 -1
src/os/unix/ngx_recv.c
file modified
+35 -1
src/os/unix/ngx_socket.h
file modified
+7 -0
src/stream/ngx_stream.h
file modified
+2 -0
src/stream/ngx_stream_limit_conn_module.c
file modified
+138 -47
src/stream/ngx_stream_realip_module.c
file modified
+4 -4
src/stream/ngx_stream_ssl_module.c
file modified
+1 -1
src/stream/ngx_stream_variables.c
file modified
+34 -6
    Merge pull request #1541 from lianglli/master
    
    Updated core file to Nginx-1.18.0.
        
file modified
+1 -1
file modified
+1 -0
file modified
+2 -17
file modified
+0 -1
file modified
+12 -0
file modified
+5 -0
file modified
+2 -2
file modified
+1 -1
file modified
+1 -2
file modified
+1 -0
file modified
+1 -0
file modified
+141 -62
file modified
+1 -6
file modified
+2 -1
file modified
+6 -0
file modified
+1 -8
file modified
+48 -0
file modified
+5 -1
file modified
+25 -0
file modified
+2 -0
file modified
+111 -30
file modified
+44 -7
file modified
+24 -32
file modified
+3 -3
file modified
+8 -1
file modified
+0 -1
file modified
+34 -6
file modified
+73 -100
file modified
+3 -0
file modified
+35 -1
file modified
+35 -1
file modified
+7 -0
file modified
+2 -0