From efbcd517fc9ec1ef5a6dfe85cb79bf0a57b954c5 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Tue, 17 Mar 2020 14:44:06 +0300 Subject: [PATCH] Checking sendfile() availability in configure. Removing SF_NODISKIO flag for FreeBSD sendfile() check because it is not used yet and to support DragonFlyBSD. This closes #414 issue on GitHub. --- auto/sendfile | 64 +++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/auto/sendfile b/auto/sendfile index e5bf3b79..a065f7b6 100644 --- a/auto/sendfile +++ b/auto/sendfile @@ -46,7 +46,7 @@ if [ $nxt_found = no ]; then int main() { off_t sent; - sendfile(-1, -1, 0, 0, NULL, &sent, SF_NODISKIO); + sendfile(-1, -1, 0, 0, NULL, &sent, 0); return 0; }" . auto/feature @@ -57,33 +57,6 @@ if [ $nxt_found = no ]; then fi -NXT_LIBSENDFILE= - -if [ $nxt_found = no ]; then - - # Solaris 8 sendfilev(). - - nxt_feature="Solaris sendfilev()" - nxt_feature_name=NXT_HAVE_SOLARIS_SENDFILEV - nxt_feature_libs="-lsendfile" - nxt_feature_test="#include - - int main() { - size_t sent; - struct sendfilevec vec; - - sendfilev(-1, &vec, 0, &sent); - return 0; - }" - . auto/feature - - if [ $nxt_found = yes ]; then - NXT_HAVE_SOLARIS_SENDFILEV=YES - NXT_LIBSENDFILE=$nxt_feature_libs - fi -fi - - if [ $nxt_found = no ]; then # MacOSX sendfile(). @@ -110,6 +83,41 @@ if [ $nxt_found = no ]; then fi +if [ $nxt_found = no ]; then + $echo + $echo "$0: error: no supported sendfile() found." + $echo + exit 1; +fi + + +NXT_LIBSENDFILE= + +if [ $nxt_found = no ]; then + + # Solaris 8 sendfilev(). + + nxt_feature="Solaris sendfilev()" + nxt_feature_name=NXT_HAVE_SOLARIS_SENDFILEV + nxt_feature_libs="-lsendfile" + nxt_feature_test="#include + + int main() { + size_t sent; + struct sendfilevec vec; + + sendfilev(-1, &vec, 0, &sent); + return 0; + }" + . auto/feature + + if [ $nxt_found = yes ]; then + NXT_HAVE_SOLARIS_SENDFILEV=YES + NXT_LIBSENDFILE=$nxt_feature_libs + fi +fi + + if [ $nxt_found = no ]; then # AIX send_file().