Ticket #17077: varnish-2.0.1.patch

File varnish-2.0.1.patch, 2.0 KB (added by macports@…, 16 years ago)
  • varnish/Portfile

    diff -Naur /opt/local/var/macports/sources/rsync.macports.org/release/ports/www/varnish/Portfile varnish/Portfile
    old new  
    33PortSystem            1.0
    44
    55name                  varnish
    6 version               1.1.2
     6version               2.0.1
    77categories            www
    88platforms             darwin
    99maintainers           pmq
     
    1515homepage              http://www.varnish-cache.org
    1616master_sites          sourceforge
    1717
    18 checksums             sha1 286da24d1048f6bea318cc2e061baa8c6d72392f \
    19                       rmd160 89bc574095d1c9e33a82e2626d5eb8b90a2caea5
     18checksums             sha1 3aa91adedd2b6519ae15e090cdc2452b4e93fc3d
    2019
    2120platform darwin 9 {
    2221   patchfiles patch-sendfile.diff
  • varnish/files/patch-sendfile.diff

    diff -Naur /opt/local/var/macports/sources/rsync.macports.org/release/ports/www/varnish/files/patch-sendfile.diff varnish/files/patch-sendfile.diff
    old new  
    1 Index: bin/varnishd/cache_pool.c
    2 ===================================================================
    3 --- bin/varnishd/cache_pool.c   (revision 2262)
    4 +++ bin/varnishd/cache_pool.c   (working copy)
    5 @@ -35,7 +35,7 @@
    6  #include <sys/uio.h>
    7  
    8  #ifdef HAVE_SENDFILE
    9 -#if defined(__FreeBSD__)
    10 +#if defined(__FreeBSD__) || defined(__APPLE__)
    11  #include <sys/socket.h>
    12  #elif defined(__linux__)
    13  #include <sys/sendfile.h>
    14 @@ -151,7 +151,7 @@
     1--- bin/varnishd/cache_pool.c   2008-10-17 20:59:49.000000000 +0200
     2+++ bin/varnishd/cache_pool.c   2008-11-03 11:27:17.000000000 +0100
     3@@ -174,7 +174,7 @@
    154        assert(fd >= 0);
    165        assert(len > 0);
    176 
     
    209        do {
    2110                struct sf_hdtr sfh;
    2211                memset(&sfh, 0, sizeof sfh);
    23 @@ -159,7 +159,7 @@
     12@@ -182,7 +182,7 @@
    2413                        sfh.headers = w->iov;
    2514                        sfh.hdr_cnt = w->niov;
    2615                }