Browse Source

minor portability fixes

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@668 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.3
Jan Kneschke 17 years ago
parent
commit
8e742eac4c
  1. 2
      src/configfile-glue.c
  2. 3
      src/network_solaris_sendfilev.c
  3. 13
      tests/LightyTest.pm

2
src/configfile-glue.c

@ -1,3 +1,5 @@
#include <string.h>
#include "base.h"
#include "buffer.h"
#include "array.h"

3
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;
}
}

13
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';

Loading…
Cancel
Save