Mercurial > hg > nginx-quic
view auto/cc/owc @ 8253:7a55311b0dc3
Fixed double close of non-regular files in flv and mp4.
With introduction of open_file_cache in 1454:f497ed7682a7, opening a file
with ngx_open_cached_file() automatically adds a cleanup handler to close
the file. As such, calling ngx_close_file() directly for non-regular files
is no longer needed and will result in duplicate close() call.
In 1454:f497ed7682a7 ngx_close_file() call for non-regular files was removed
in the static module, but wasn't in the flv module. And the resulting
incorrect code was later copied to the mp4 module. Fix is to remove the
ngx_close_file() call from both modules.
Reported by Chris Newton.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 11 Dec 2020 13:42:07 +0300 |
parents | b7b7f3a0cc28 |
children |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. # Open Watcom C 1.0, 1.2, 1.3 # optimizations # maximize speed CFLAGS="$CFLAGS -ot" # reorder instructions for best pipeline usage CFLAGS="$CFLAGS -op" # inline intrinsic functions CFLAGS="$CFLAGS -oi" # inline expansion CFLAGS="$CFLAGS -oe" # disable stack checking calls CFLAGS="$CFLAGS -s" case $CPU in pentium) # optimize for Pentium and Athlon # register-based arguments passing conventions CPU_OPT="-5r" # stack-based arguments passing conventions #CPU_OPT="-5s" ;; pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III # register-based arguments passing conventions CPU_OPT="-6r" # stack-based arguments passing conventions #CPU_OPT="-6s" ;; esac CFLAGS="$CFLAGS $CPU_OPT" # warnings # maximum level CFLAGS="$CFLAGS -wx" #CFLAGS="$CFLAGS -w3" # stop on warning CFLAGS="$CFLAGS -we" # built target is NT CFLAGS="$CFLAGS -bt=nt" # multithreaded CFLAGS="$CFLAGS -bm" # debug CFLAGS="$CFLAGS -d2" # quiet CFLAGS="$CFLAGS -zq" # Open Watcom C 1.2 have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have # the precompiled headers #CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" #NGX_PCH="$NGX_OBJS/ngx_config.pch" #NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" #NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" # the link flags, built target is NT GUI mode application #CORE_LINK="$CORE_LINK -l=nt_win" # the resource file NGX_RCC="wrc \$(CORE_INCS) -fo=$NGX_OBJS/nginx.res " NGX_RCC="$NGX_RCC $NGX_WIN32_RC $NGX_OBJS/nginx.exe" ngx_include_opt="-i=" ngx_objout="-fo" ngx_binout="-fe=" ngx_objext="obj" ngx_regex_dirsep='\\' ngx_dirsep="\\" ngx_long_start=' ' ngx_long_end=' ' ngx_long_regex_cont=' \&\ ' ngx_long_cont=' & ' ngx_regex_cont=' \&\ ' ngx_cont=' & ' ngx_tab=' & '