[tests] search for perl in PATH instead of /usr/bin; whitespace + test config cleanups

From: Stefan Bühler <stbuehler@web.de>

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3019 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.37
Stefan Bühler 2015-08-22 20:51:08 +00:00
parent 5c48617737
commit 87c5ec9651
29 changed files with 1117 additions and 1102 deletions

View File

@ -15,35 +15,28 @@ server.name = "www.example.org"
server.tag = "Apache 1.3.29"
server.modules = (
"mod_fastcgi",
"mod_cgi",
"mod_accesslog" )
server.modules = (
"mod_fastcgi",
"mod_cgi",
"mod_accesslog",
)
######################## MODULE CONFIG ############################
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = ( ".html" => "text/html" )
mimetype.assign = (
".html" => "text/html",
)
cgi.assign = (".pl" => "/usr/bin/perl" )
# fastcgi.server += ( "/404.pl" =>
# ( "404-handler" =>
# (
# "socket" => env.SRCDIR + "/tmp/pl-404-fastcgi-1.socket",
# "bin-path" => server.document-root + "/404.pl",
# "max-procs" => 1,
# "check-local" => "disable",
# "broken-scriptfilename" => "enable",
# )
# ),
# )
cgi.assign = (
".pl" => env.PERL,
)
$HTTP["url"] =~ "^/static/" {
server.error-handler-404 = "/404.html"
server.error-handler-404 = "/404.html"
}
else $HTTP["url"] =~ "." {
server.error-handler-404 = "/404.pl"
server.error-handler-404 = "/404.pl"
}

79
tests/LightyTest.pm Executable file → Normal file
View File

@ -1,6 +1,5 @@
#! /usr/bin/perl -w
package LightyTest;
use strict;
use IO::Socket;
use Test::More;
@ -9,11 +8,46 @@ use Cwd 'abs_path';
use POSIX qw(:sys_wait_h dup2);
use Errno qw(EADDRINUSE);
sub find_program {
my @DEFAULT_PATHS = ('/usr/bin/', '/usr/local/bin/');
my ($envname, $program) = @_;
my $location;
if (defined $ENV{$envname}) {
$location = $ENV{$envname};
} else {
$location = `which "$program" 2>/dev/null`;
if (! -x $location) {
for my $path (@DEFAULT_PATHS) {
$location = $path . $program;
last if -x $location;
}
}
}
if (-x $location) {
$ENV{$envname} = $location;
return 1;
} else {
delete $ENV{$envname};
return 0;
}
}
BEGIN {
our $HAVE_PHP = find_program('PHP', 'php-cgi');
our $HAVE_PERL = find_program('PERL', 'perl');
if (!$HAVE_PERL) {
die "Couldn't find path to perl, but it obviously seems to be running";
}
}
sub mtime {
my $file = shift;
my @stat = stat $file;
return @stat ? $stat[9] : 0;
}
sub new {
my $class = shift;
my $self = {};
@ -58,10 +92,10 @@ sub listening_on {
my $self = shift;
my $port = shift;
my $remote =
IO::Socket::INET->new(Proto => "tcp",
PeerAddr => "127.0.0.1",
PeerPort => $port) or return 0;
my $remote = IO::Socket::INET->new(
Proto => "tcp",
PeerAddr => "127.0.0.1",
PeerPort => $port) or return 0;
close $remote;
@ -165,14 +199,15 @@ sub handle_http {
my $slow = defined $t->{SLOWREQUEST};
my $is_debug = $ENV{"TRACE_HTTP"};
my $remote =
IO::Socket::INET->new(Proto => "tcp",
PeerAddr => $host,
PeerPort => $self->{PORT});
my $remote =
IO::Socket::INET->new(
Proto => "tcp",
PeerAddr => $host,
PeerPort => $self->{PORT});
if (not defined $remote) {
diag("\nconnect failed: $!");
return -1;
return -1;
}
$remote->autoflush(1);
@ -208,7 +243,7 @@ sub handle_http {
print $remote "\012";
select(undef, undef, undef, 0.1);
}
}
diag("\n... done") if $is_debug;
@ -221,7 +256,7 @@ sub handle_http {
diag(">> ".$_) if $is_debug;
}
diag("\n... done") if $is_debug;
close $remote;
my $full_response = $lines;
@ -250,8 +285,8 @@ sub handle_http {
(my $h = $1) =~ tr/[A-Z]/[a-z]/;
if (defined $resp_hdr{$h}) {
# diag(sprintf("\nheader '%s' is duplicated: '%s' and '%s'\n",
# $h, $resp_hdr{$h}, $2));
# diag(sprintf("\nheader '%s' is duplicated: '%s' and '%s'\n",
# $h, $resp_hdr{$h}, $2));
$resp_hdr{$h} .= ', '.$2;
} else {
$resp_hdr{$h} = $2;
@ -307,7 +342,7 @@ sub handle_http {
return -1;
}
}
if (defined $href->{'-HTTP-Content'}) {
if (defined $resp_body && $resp_body ne '') {
diag(sprintf("\nbody failed: expected empty body, got '%s'", $resp_body));
@ -334,7 +369,7 @@ sub handle_http {
$k = substr($k, 1);
$key_inverted = 1;
$verify_value = 0; ## skip the value check
}
}
if ($key_inverted) {
if (defined $resp_hdr{$k}) {
@ -351,13 +386,15 @@ sub handle_http {
if ($verify_value) {
if ($href->{$_} =~ /^\/(.+)\/$/) {
if ($resp_hdr{$k} !~ /$1/) {
diag(sprintf("\nresponse-header failed: expected '%s', got '%s', regex: %s",
$href->{$_}, $resp_hdr{$k}, $1));
diag(sprintf(
"\nresponse-header failed: expected '%s', got '%s', regex: %s",
$href->{$_}, $resp_hdr{$k}, $1));
return -1;
}
} elsif ($href->{$_} ne $resp_hdr{$k}) {
diag(sprintf("\nresponse-header failed: expected '%s', got '%s'",
$href->{$_}, $resp_hdr{$k}));
diag(sprintf(
"\nresponse-header failed: expected '%s', got '%s'",
$href->{$_}, $resp_hdr{$k}));
return -1;
}
}

View File

@ -3,8 +3,6 @@ server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.o
## bind to port (default: 80)
server.port = 2048
# server.license = "00000001000000013feccb804014587f000000010000000105911c976a3d462c8eaa2d7ca850432c"
## bind to localhost (default: all interfaces)
server.bind = "localhost"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
@ -12,152 +10,129 @@ server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.
server.name = "www.example.org"
server.tag = "Apache 1.3.29"
##
## Format: <errorfile-prefix><status>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
server.dir-listing = "enable"
#server.event-handler = "linux-sysepoll"
#server.event-handler = "linux-rtsig"
#server.modules.path = ""
server.modules = (
"mod_rewrite",
"mod_setenv",
"mod_access",
"mod_auth",
# "mod_httptls",
"mod_status",
"mod_expire",
"mod_simple_vhost",
"mod_redirect",
# "mod_evhost",
# "mod_localizer",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog" )
server.indexfiles = ( "index.html",
"index.htm", "default.htm", "index.php" )
#,-- only root can use these options
#|
#|# chroot() to directory (default: no chroot() )
#| server.chroot /
#|# change uid to <uid> (default: don't care)
#| server.userid wwwrun
#|# change uid to <uid> (default: don't care)
#| server.groupid wwwrun
#|
#`--
server.modules = (
"mod_rewrite",
"mod_setenv",
"mod_access",
"mod_auth",
"mod_status",
"mod_expire",
"mod_simple_vhost",
"mod_redirect",
"mod_fastcgi",
"mod_compress",
"mod_accesslog",
)
server.indexfiles = (
"index.html",
"index.htm",
"default.htm",
"index.php",
)
######################## MODULE CONFIG ############################
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = ( ".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain" )
mimetype.assign = (
".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain",
)
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = (
"text/plain",
"text/html",
)
setenv.add-environment = ( "TRAC_ENV" => "foo")
setenv.add-request-header = ( "FOO" => "foo")
setenv.add-response-header = ( "BAR" => "foo")
setenv.add-environment = (
"TRAC_ENV" => "foo",
)
setenv.add-request-header = (
"FOO" => "foo",
)
setenv.add-response-header = (
"BAR" => "foo",
)
fastcgi.debug = 0
fastcgi.server = ( ".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1026,
# "mode" => "authorizer",
# "docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/",
)
)
)
fastcgi.debug = 0
fastcgi.server = ( ".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1026,
),
))
cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl",
".py" => "/usr/bin/python" )
ssl.engine = "disable"
# ssl.pemfile = "server.pem"
auth.backend = "plain"
auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
auth.backend = "plain"
auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
auth.backend.plain.groupfile = "lighttpd.group"
auth.backend.ldap.hostname = "localhost"
auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
auth.backend.ldap.filter = "(uid=$)"
auth.backend.ldap.hostname = "localhost"
auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
auth.backend.ldap.filter = "(uid=$)"
auth.require = ( "/server-status" =>
(
"method" => "digest",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
),
"/auth.php" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "user=jan"
),
"/server-config" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
)
)
auth.require = (
"/server-status" => (
"method" => "digest",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
"/auth.php" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "user=jan",
),
"/server-config" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
)
url.access-deny = ( "~", ".inc")
url.access-deny = (
"~",
".inc",
)
url.redirect = ( "^/redirect/$" => "http://localhost:2048/" )
url.redirect = (
"^/redirect/$" => "http://localhost:2048/",
)
expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
#cache.cache-dir = "/home/weigon/wwwroot/cache/"
expire.url = (
"/buggy/" => "access 2 hours",
"/asdhas/" => "access plus 1 seconds 2 minutes",
)
#### status module
status.status-url = "/server-status"
status.config-url = "/server-config"
status.status-url = "/server-status"
status.config-url = "/server-config"
simple-vhost.document-root = "pages"
simple-vhost.server-root = env.SRCDIR + "/tmp/lighttpd/servers/"
simple-vhost.default-host = "www.example.org"
$HTTP["host"] == "vvv.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
}
$HTTP["host"] == "zzz.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
}

View File

@ -3,8 +3,6 @@ server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.o
## bind to port (default: 80)
server.port = 2048
# server.license = "00000001000000013feccb804014587f000000010000000105911c976a3d462c8eaa2d7ca850432c"
## bind to localhost (default: all interfaces)
server.bind = "localhost"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
@ -13,153 +11,130 @@ server.name = "www.example.org"
server.tag = "Apache 1.3.29"
##
## Format: <errorfile-prefix><status>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
server.dir-listing = "enable"
server.dir-listing = "enable"
server.modules = (
"mod_rewrite",
"mod_setenv",
"mod_access",
"mod_auth",
"mod_status",
"mod_expire",
"mod_simple_vhost",
"mod_redirect",
"mod_fastcgi",
"mod_compress",
"mod_accesslog",
)
#server.event-handler = "linux-sysepoll"
#server.event-handler = "linux-rtsig"
#server.modules.path = ""
server.modules = (
"mod_rewrite",
"mod_setenv",
"mod_access",
"mod_auth",
# "mod_httptls",
"mod_status",
"mod_expire",
"mod_simple_vhost",
"mod_redirect",
# "mod_evhost",
# "mod_localizer",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog" )
server.indexfiles = ( "index.html",
"index.htm", "default.htm", "index.php" )
server.indexfiles = (
"index.html",
"index.htm",
"default.htm",
"index.php",
)
server.error-handler-404 = "/indexfile/return-404.php"
#,-- only root can use these options
#|
#|# chroot() to directory (default: no chroot() )
#| server.chroot /
#|# change uid to <uid> (default: don't care)
#| server.userid wwwrun
#|# change uid to <uid> (default: don't care)
#| server.groupid wwwrun
#|
#`--
######################## MODULE CONFIG ############################
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = (
".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain",
)
mimetype.assign = ( ".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain" )
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = (
"text/plain",
"text/html",
)
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
setenv.add-environment = (
"TRAC_ENV" => "foo",
)
setenv.add-request-header = (
"FOO" => "foo",
)
setenv.add-response-header = (
"BAR" => "foo",
)
setenv.add-environment = ( "TRAC_ENV" => "foo")
setenv.add-request-header = ( "FOO" => "foo")
setenv.add-response-header = ( "BAR" => "foo")
fastcgi.debug = 0
fastcgi.server = ( ".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1026,
),
))
fastcgi.debug = 0
fastcgi.server = ( ".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1026,
# "mode" => "authorizer",
# "docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/",
)
)
)
cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl",
".py" => "/usr/bin/python" )
ssl.engine = "disable"
# ssl.pemfile = "server.pem"
auth.backend = "plain"
auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
auth.backend = "plain"
auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
auth.backend.plain.groupfile = "lighttpd.group"
auth.backend.ldap.hostname = "localhost"
auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
auth.backend.ldap.filter = "(uid=$)"
auth.require = ( "/server-status" =>
(
"method" => "digest",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
),
"/auth.php" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "user=jan"
),
"/server-config" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
)
)
auth.require = (
"/server-status" => (
"method" => "digest",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
"/auth.php" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "user=jan",
),
"/server-config" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
)
url.access-deny = ( "~", ".inc")
url.access-deny = (
"~",
".inc",
)
url.redirect = ( "^/redirect/$" => "http://localhost:2048/" )
url.redirect = (
"^/redirect/$" => "http://localhost:2048/",
)
expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
#cache.cache-dir = "/home/weigon/wwwroot/cache/"
expire.url = (
"/buggy/" => "access 2 hours",
"/asdhas/" => "access plus 1 seconds 2 minutes",
)
#### status module
status.status-url = "/server-status"
status.config-url = "/server-config"
status.status-url = "/server-status"
status.config-url = "/server-config"
simple-vhost.document-root = "pages"
simple-vhost.server-root = env.SRCDIR + "/tmp/lighttpd/servers/"
simple-vhost.default-host = "www.example.org"
$HTTP["host"] == "vvv.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
}
$HTTP["host"] == "zzz.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
}

View File

@ -15,55 +15,74 @@ server.name = "www.example.org"
server.tag = "Apache 1.3.29"
server.modules = (
"mod_redirect",
"mod_accesslog" )
server.modules = (
"mod_redirect",
"mod_accesslog",
)
######################## MODULE CONFIG ############################
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = ( ".html" => "text/html" )
mimetype.assign = (
".html" => "text/html",
)
url.redirect = ("^" => "/default")
url.redirect = (
"^" => "/default",
)
$HTTP["host"] == "www.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "www.example.org"
url.redirect = ("^" => "/match_1")
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "www.example.org"
url.redirect = (
"^" => "/match_1",
)
}
else $HTTP["host"] == "test1.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test1.example.org"
url.redirect = ("^" => "/match_2")
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test1.example.org"
url.redirect = (
"^" => "/match_2",
)
}
# comments
else $HTTP["host"] == "test2.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test2.example.org"
url.redirect = ("^" => "/match_3")
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test2.example.org"
url.redirect = (
"^" => "/match_3",
)
}
# comments
else $HTTP["host"] == "test3.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test3.example.org"
url.redirect = ("^" => "/match_4")
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test3.example.org"
url.redirect = (
"^" => "/match_4",
)
# comments
$HTTP["url"] == "/index.html" {
url.redirect = ("^" => "/match_5")
}
# comments
$HTTP["url"] == "/index.html" {
url.redirect = (
"^" => "/match_5",
)
}
}
else $HTTP["host"] == "test4.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test4.example.org"
url.redirect = ("^" => "/match_6")
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "test4.example.org"
url.redirect = (
"^" => "/match_6",
)
$HTTP["url"] =~ "^/subdir/" {
url.redirect = ("^" => "/match_7")
}
$HTTP["url"] =~ "^/subdir/" {
url.redirect = (
"^" => "/match_7",
)
}
}

View File

@ -1,6 +1,8 @@
#!/usr/bin/perl
#!/usr/bin/env perl
#use CGI qw/:standard/;
use CGI::Fast qw(:standard);
my $cgi = new CGI;
while (new CGI::Fast) {
my $request_uri = $ENV{'REQUEST_URI'};

View File

@ -1,5 +1,7 @@
#!/usr/bin/perl
#!/usr/bin/env perl
use CGI qw/:standard/;
my $cgi = new CGI;
my $request_uri = $ENV{'REQUEST_URI'};
print (STDERR "REQUEST_URI: $request_uri\n");

View File

@ -1,4 +1,4 @@
#! /usr/bin/perl
#!/usr/bin/env perl
print "Content-Type: text/html\r\n\r\n";

View File

@ -1,4 +1,4 @@
#! /usr/bin/perl
#!/usr/bin/env perl
print "Content-Type: text/html\r\n\r\n";

View File

@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
my $s = $ENV{$ENV{"QUERY_STRING"}};

View File

@ -1,5 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
print "Content-Type: text/plain\r\n\r\n";
@ -12,4 +11,3 @@ if ($ENV{"REQUEST_METHOD"} eq "POST") {
} else {
print "0";
}

View File

@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
print "Content-Type: text/html\r\n\r\n";
print $ENV{'REMOTE_ADDR'};

View File

@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
my $status = 200;

View File

@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
use CGI qw/:standard/;
print header ( -status => 404
-type => 'text/plain' );

View File

@ -10,81 +10,72 @@ server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.
server.name = "www.example.org"
server.tag = "Apache 1.3.29"
##
## Format: <errorfile-prefix><status>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
server.dir-listing = "enable"
#server.event-handler = "linux-sysepoll"
#server.event-handler = "linux-rtsig"
#server.modules.path = ""
server.modules = (
"mod_rewrite",
"mod_access",
"mod_auth",
# "mod_httptls",
"mod_status",
"mod_expire",
# "mod_simple_vhost",
"mod_redirect",
# "mod_evhost",
# "mod_localizer",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog" )
server.indexfiles = ( "index.php", "index.html",
"index.htm", "default.htm" )
server.modules = (
"mod_rewrite",
"mod_access",
"mod_auth",
"mod_status",
"mod_expire",
"mod_redirect",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog",
)
server.indexfiles = (
"index.php",
"index.html",
"index.htm",
"default.htm",
)
######################## MODULE CONFIG ############################
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = (
".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain",
)
mimetype.assign = ( ".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain" )
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = (
"text/plain",
"text/html",
)
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
fastcgi.debug = 0
fastcgi.server = (
".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1026,
),
),
)
fastcgi.debug = 0
fastcgi.server = ( ".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1026
)
)
)
cgi.assign = (
".pl" => env.PERL,
".cgi" => env.PERL,
)
cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl",
".py" => "/usr/bin/python" )
ssl.engine = "disable"
# ssl.pemfile = "server.pem"
auth.backend = "plain"
auth.backend = "plain"
auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
auth.backend.plain.groupfile = "lighttpd.group"
@ -92,47 +83,47 @@ auth.backend.ldap.hostname = "localhost"
auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
auth.backend.ldap.filter = "(uid=$)"
auth.require = ( "/server-status" =>
(
"method" => "digest",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
),
"/auth.php" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "user=jan"
),
"/server-config" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
)
)
auth.require = (
"/server-status" => (
"method" => "digest",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
"/auth.php" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "user=jan",
),
"/server-config" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
)
url.access-deny = ( "~", ".inc")
url.access-deny = (
"~",
".inc",
)
url.redirect = ( "^/redirect/$" => "http://localhost:2048/" )
url.redirect = (
"^/redirect/$" => "http://localhost:2048/",
)
expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
#cache.cache-dir = "/home/weigon/wwwroot/cache/"
expire.url = (
"/buggy/" => "access 2 hours",
"/asdhas/" => "access plus 1 seconds 2 minutes",
)
#### status module
status.status-url = "/server-status"
status.config-url = "/server-config"
status.status-url = "/server-status"
status.config-url = "/server-config"
$HTTP["host"] == "vvv.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
}
$HTTP["host"] == "zzz.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
}

View File

@ -14,94 +14,75 @@ server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.
server.name = "www.example.org"
server.tag = "Apache 1.3.29"
##
## Format: <errorfile-prefix><status>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
server.dir-listing = "enable"
#server.event-handler = "linux-sysepoll"
#server.event-handler = "linux-rtsig"
#server.modules.path = ""
server.modules = (
"mod_rewrite",
"mod_access",
"mod_auth",
# "mod_httptls",
"mod_status",
"mod_expire",
# "mod_simple_vhost",
"mod_redirect",
# "mod_evhost",
# "mod_localizer",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog" )
server.indexfiles = ( "index.php", "index.html",
"index.htm", "default.htm" )
#,-- only root can use these options
#|
#|# chroot() to directory (default: no chroot() )
#| server.chroot /
#|# change uid to <uid> (default: don't care)
#| server.userid wwwrun
#|# change uid to <uid> (default: don't care)
#| server.groupid wwwrun
#|
#`--
server.modules = (
"mod_rewrite",
"mod_access",
"mod_auth",
"mod_status",
"mod_expire",
"mod_redirect",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog"
)
server.indexfiles = (
"index.php",
"index.html",
"index.htm",
"default.htm",
)
######################## MODULE CONFIG ############################
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = ( ".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain" )
mimetype.assign = (
".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain",
)
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = (
"text/plain",
"text/html",
)
fastcgi.debug = 0
fastcgi.server = ( ".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1048,
"bin-path" => env.PHP,
"bin-copy-environment" => ( "PATH", "SHELL", "USER" ),
)
)
)
fastcgi.debug = 0
fastcgi.server = (
".php" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 1048,
"bin-path" => env.PHP,
"bin-copy-environment" => ( "PATH", "SHELL", "USER", ),
),
),
)
cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl",
".py" => "/usr/bin/python" )
cgi.assign = (
".pl" => env.PERL,
".cgi" => env.PERL,
)
ssl.engine = "disable"
# ssl.pemfile = "server.pem"
auth.backend = "plain"
auth.backend = "plain"
auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
auth.backend.plain.groupfile = "lighttpd.group"
@ -109,47 +90,47 @@ auth.backend.ldap.hostname = "localhost"
auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
auth.backend.ldap.filter = "(uid=$)"
auth.require = ( "/server-status" =>
(
"method" => "digest",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
),
"/auth.php" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "user=jan"
),
"/server-config" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
)
)
auth.require = (
"/server-status" => (
"method" => "digest",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
"/auth.php" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "user=jan",
),
"/server-config" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
)
url.access-deny = ( "~", ".inc")
url.access-deny = (
"~",
".inc",
)
url.redirect = ( "^/redirect/$" => "http://localhost:2048/" )
url.redirect = (
"^/redirect/$" => "http://localhost:2048/",
)
expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
#cache.cache-dir = "/home/weigon/wwwroot/cache/"
expire.url = (
"/buggy/" => "access 2 hours",
"/asdhas/" => "access plus 1 seconds 2 minutes",
)
#### status module
status.status-url = "/server-status"
status.config-url = "/server-config"
status.status-url = "/server-status"
status.config-url = "/server-config"
$HTTP["host"] == "vvv.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
}
$HTTP["host"] == "zzz.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
}

View File

@ -7,8 +7,6 @@ debug.log-request-handling = "enable"
## bind to port (default: 80)
server.port = 2048
# server.license = "00000001000000013feccb804014587f000000010000000105911c976a3d462c8eaa2d7ca850432c"
## bind to localhost (default: all interfaces)
server.bind = "localhost"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
@ -16,97 +14,77 @@ server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.
server.name = "www.example.org"
server.tag = "Apache 1.3.29"
##
## Format: <errorfile-prefix><status>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
server.dir-listing = "enable"
#server.event-handler = "linux-sysepoll"
#server.event-handler = "linux-rtsig"
#server.modules.path = ""
server.modules = (
"mod_rewrite",
"mod_access",
"mod_auth",
# "mod_httptls",
"mod_status",
"mod_expire",
# "mod_simple_vhost",
"mod_redirect",
# "mod_evhost",
# "mod_localizer",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog" )
server.indexfiles = ( "index.php", "index.html",
"index.htm", "default.htm" )
#,-- only root can use these options
#|
#|# chroot() to directory (default: no chroot() )
#| server.chroot /
#|# change uid to <uid> (default: don't care)
#| server.userid wwwrun
#|# change uid to <uid> (default: don't care)
#| server.groupid wwwrun
#|
#`--
server.modules = (
"mod_rewrite",
"mod_access",
"mod_auth",
"mod_status",
"mod_expire",
"mod_redirect",
"mod_fastcgi",
"mod_cgi",
"mod_compress",
"mod_accesslog",
)
server.indexfiles = (
"index.php",
"index.html",
"index.htm",
"default.htm",
)
######################## MODULE CONFIG ############################
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
mimetype.assign = ( ".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain" )
mimetype.assign = (
".png" => "image/png",
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".gif" => "image/gif",
".html" => "text/html",
".htm" => "text/html",
".pdf" => "application/pdf",
".swf" => "application/x-shockwave-flash",
".spl" => "application/futuresplash",
".txt" => "text/plain",
".tar.gz" => "application/x-tgz",
".tgz" => "application/x-tgz",
".gz" => "application/x-gzip",
".c" => "text/plain",
".conf" => "text/plain",
)
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = ("text/plain", "text/html")
compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/"
compress.filetype = (
"text/plain",
"text/html",
)
fastcgi.debug = 0
fastcgi.server = ( "/" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 20000,
"bin-path" => env.SRCDIR + "/fcgi-auth",
"mode" => "authorizer",
"docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/",
"check-local" => "disable",
fastcgi.debug = 0
fastcgi.server = (
"/" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 20000,
"bin-path" => env.SRCDIR + "/fcgi-auth",
"mode" => "authorizer",
"docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/",
"check-local" => "disable",
),
),
)
)
)
)
cgi.assign = (
".pl" => env.PERL,
".cgi" => env.PERL,
)
cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl",
".py" => "/usr/bin/python" )
ssl.engine = "disable"
# ssl.pemfile = "server.pem"
auth.backend = "plain"
auth.backend = "plain"
auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user"
auth.backend.plain.groupfile = "lighttpd.group"
@ -114,47 +92,49 @@ auth.backend.ldap.hostname = "localhost"
auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
auth.backend.ldap.filter = "(uid=$)"
auth.require = ( "/server-status" =>
(
"method" => "digest",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
),
"/auth.php" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "host=192.168.2.10")
"require" => "user=jan"
),
"/server-config" =>
(
"method" => "basic",
"realm" => "download archiv",
# "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10")
"require" => "group=www|user=jan|host=192.168.2.10"
)
)
auth.require = (
"/server-status" => (
"method" => "digest",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
"/auth.php" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "user=jan",
),
"/server-config" => (
"method" => "basic",
"realm" => "download archiv",
"require" => "group=www|user=jan|host=192.168.2.10",
),
)
url.access-deny = ( "~", ".inc")
url.access-deny = (
"~",
".inc",
)
url.redirect = ( "^/redirect/$" => "http://localhost:2048/" )
url.redirect = (
"^/redirect/$" => "http://localhost:2048/",
)
expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
expire.url = (
"/buggy/" => "access 2 hours",
"/asdhas/" => "access plus 1 seconds 2 minutes",
)
#cache.cache-dir = "/home/weigon/wwwroot/cache/"
#### status module
status.status-url = "/server-status"
status.config-url = "/server-config"
status.status-url = "/server-status"
status.config-url = "/server-config"
$HTTP["host"] == "vvv.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
}
$HTTP["host"] == "zzz.example.org" {
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
server.name = "zzz.example.org"
}

View File

@ -10,8 +10,6 @@ server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.o
## bind to port (default: 80)
server.port = 2048
# server.license = "00000001000000013feccb804014587f000000010000000105911c976a3d462c8eaa2d7ca850432c"
## bind to localhost (default: all interfaces)
server.bind = "localhost"
server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log"
@ -19,94 +17,75 @@ server.breakagelog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.breakage.
server.name = "www.example.org"
server.tag = "Apache 1.3.29"
##
## Format: <errorfile-prefix><status>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
server.dir-listing = "enable"
#server.event-handler = "linux-sysepoll"
#server.event-handler = "linux-rtsig"