diff options
| -rw-r--r-- | src/configfile-glue.c | 2 | ||||
| -rw-r--r-- | src/network_solaris_sendfilev.c | 3 | ||||
| -rwxr-xr-x | tests/LightyTest.pm | 13 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/configfile-glue.c b/src/configfile-glue.c index 99f002c9..6a4484a4 100644 --- a/src/configfile-glue.c +++ b/src/configfile-glue.c @@ -1,3 +1,5 @@ +#include <string.h> + #include "base.h" #include "buffer.h" #include "array.h" diff --git a/src/network_solaris_sendfilev.c b/src/network_solaris_sendfilev.c index d4538d24..cfccbd84 100644 --- a/src/network_solaris_sendfilev.c +++ b/src/network_solaris_sendfilev.c @@ -133,9 +133,6 @@ int network_write_chunkqueue_solarissendfilev(server *srv, connection *con, chun con->bytes_written += r; chunk_finished = 0; - log_error_write(srv, __FILE__, __LINE__, "sdd", - "partially write: ", r, fd); - break; } } diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index 89272c4f..ca65ba67 100755 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -4,6 +4,7 @@ package LightyTest; use strict; use IO::Socket; use Test::More; +use Cwd 'abs_path'; sub new { my $class = shift; @@ -13,19 +14,13 @@ sub new { $self->{CONFIGFILE} = 'lighttpd.conf'; $lpath = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..'); - $lpath = `readlink -f '$lpath'`; - chomp $lpath; - $self->{BASEDIR} = $lpath; + $self->{BASEDIR} = abs_path($lpath); $lpath = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'}."/tests/" : '.'); - $lpath = `readlink -f '$lpath'`; - chomp $lpath; - $self->{TESTDIR} = $lpath; + $self->{TESTDIR} = abs_path($lpath); $lpath = (defined $ENV{'srcdir'} ? $ENV{'srcdir'} : '.'); - $lpath = `readlink -f '$lpath'`; - chomp $lpath; - $self->{SRCDIR} = $lpath; + $self->{SRCDIR} = abs_path($lpath); $self->{LIGHTTPD_PATH} = $self->{BASEDIR}.'/src/lighttpd'; |