Merged with the default branch.

diff --cc auto/os/linux
index f60809c7a2e168c33b64565014e5542a35940cb1,0ae701fad6daf932d6df022a872b7153a78a9697..87b0e1281caf7f770b8b4ec93251195629ab517f
--- 1/auto/os/linux
--- 2/auto/os/linux
+++ b/auto/os/linux
@@@ -232,53 -232,6 +232,50 @@@ ngx_feature_test="struct crypt_data  cd
  ngx_include="sys/vfs.h";     . auto/include
  
  
- CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
- 
- 
 +# BPF sockhash
 +
 +ngx_feature="BPF sockhash"
 +ngx_feature_name="NGX_HAVE_BPF"
 +ngx_feature_run=no
 +ngx_feature_incs="#include <linux/bpf.h>
 +                  #include <sys/syscall.h>"
 +ngx_feature_path=
 +ngx_feature_libs=
 +ngx_feature_test="union bpf_attr attr = { 0 };
 +
 +                  attr.map_flags = 0;
 +                  attr.map_type = BPF_MAP_TYPE_SOCKHASH;
 +
 +                  syscall(__NR_bpf, 0, &attr, 0);"
 +. auto/feature
 +
 +if [ $ngx_found = yes ]; then
 +    CORE_SRCS="$CORE_SRCS src/core/ngx_bpf.c"
 +    CORE_DEPS="$CORE_DEPS src/core/ngx_bpf.h"
 +
 +    if [ $QUIC_BPF != NONE ]; then
 +        QUIC_BPF=YES
 +    fi
 +fi
 +
 +
 +ngx_feature="SO_COOKIE"
 +ngx_feature_name="NGX_HAVE_SO_COOKIE"
 +ngx_feature_run=no
 +ngx_feature_incs="#include <sys/socket.h>
 +                  #include <stdint.h>"
 +ngx_feature_path=
 +ngx_feature_libs=
 +ngx_feature_test="socklen_t optlen = sizeof(uint64_t);
 +                  uint64_t cookie;
 +                  getsockopt(0, SOL_SOCKET, SO_COOKIE, &cookie, &optlen)"
 +. auto/feature
 +
 +if [ $ngx_found = yes ]; then
 +    SO_COOKIE_FOUND=YES
 +fi
 +
 +
  # UDP segmentation offloading
  
  ngx_feature="UDP_SEGMENT"

diff --cc src/core/ngx_connection.h
Simple merge

diff --cc src/event/ngx_event_openssl.c
Simple merge

diff --cc src/event/ngx_event_udp.c
Simple merge

diff --cc src/event/ngx_event_udp.h
Simple merge

diff --cc src/http/ngx_http_write_filter_module.c
Simple merge