diff options
Diffstat (limited to 'tests')
45 files changed, 177 insertions, 167 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 584d9c9..c83026a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,7 +48,7 @@ CONFS=fastcgi-10.conf \ cachable.t -TESTS_ENVIRONMENT=$(srcdir)/wrapper.sh $(srcdir) $(top_builddir) +TESTS_ENVIRONMENT=$(srcdir)/wrapper.sh $(srcdir) $(top_builddir) EXTRA_DIST=wrapper.sh lighttpd.conf \ lighttpd.user \ @@ -62,7 +62,7 @@ leak-check: for i in $(TESTS); do \ $(srcdir)/$$i; \ echo $$?; \ - done + done clean-local: rm -f *.out diff --git a/tests/Makefile.in b/tests/Makefile.in index 93ac0f6..4ba1431 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -134,7 +134,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUACONFIG = @LUACONFIG@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAINT = @MAINT@ @@ -167,6 +166,7 @@ SQLITE_LIBS = @SQLITE_LIBS@ SSL_LIB = @SSL_LIB@ STRIP = @STRIP@ U = @U@ +UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ @@ -262,7 +262,7 @@ CONFS = fastcgi-10.conf \ lowercase.conf \ cachable.t -TESTS_ENVIRONMENT = $(srcdir)/wrapper.sh $(srcdir) $(top_builddir) +TESTS_ENVIRONMENT = $(srcdir)/wrapper.sh $(srcdir) $(top_builddir) EXTRA_DIST = wrapper.sh lighttpd.conf \ lighttpd.user \ lighttpd.htpasswd \ @@ -707,7 +707,7 @@ leak-check: for i in $(TESTS); do \ $(srcdir)/$$i; \ echo $$?; \ - done + done clean-local: rm -f *.out diff --git a/tests/bug-06.conf b/tests/bug-06.conf index b094e88..3cc7525 100644 --- a/tests/bug-06.conf +++ b/tests/bug-06.conf @@ -13,7 +13,7 @@ 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-" @@ -24,24 +24,24 @@ server.dir-listing = "enable" #server.event-handler = "linux-rtsig" #server.modules.path = "" -server.modules = ( +server.modules = ( "mod_rewrite", "mod_setenv", - "mod_access", + "mod_access", "mod_auth", # "mod_httptls", - "mod_status", + "mod_status", "mod_expire", "mod_simple_vhost", - "mod_redirect", + "mod_redirect", # "mod_evhost", # "mod_localizer", "mod_fastcgi", "mod_cgi", "mod_compress", - "mod_accesslog" ) + "mod_accesslog" ) -server.indexfiles = ( "index.html", +server.indexfiles = ( "index.html", "index.htm", "default.htm", "index.php" ) #,-- only root can use these options @@ -53,7 +53,7 @@ server.indexfiles = ( "index.html", #|# change uid to <uid> (default: don't care) #| server.groupid wwwrun #| -#`-- +#`-- ######################## MODULE CONFIG ############################ @@ -61,7 +61,7 @@ server.indexfiles = ( "index.html", accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" -mimetype.assign = ( ".png" => "image/png", +mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".gif" => "image/gif", @@ -85,8 +85,8 @@ setenv.add-request-header = ( "FOO" => "foo") setenv.add-response-header = ( "BAR" => "foo") fastcgi.debug = 0 -fastcgi.server = ( ".php" => ( - "grisu" => ( +fastcgi.server = ( ".php" => ( + "grisu" => ( "host" => "127.0.0.1", "port" => 1026, # "mode" => "authorizer", @@ -94,12 +94,12 @@ fastcgi.server = ( ".php" => ( ) ) ) - + cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", ".py" => "/usr/bin/python" ) - + ssl.engine = "disable" @@ -113,22 +113,22 @@ auth.backend.ldap.hostname = "localhost" auth.backend.ldap.base-dn = "dc=my-domain,dc=com" auth.backend.ldap.filter = "(uid=$)" -auth.require = ( "/server-status" => - ( +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" => - ( + "/auth.php" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "host=192.168.2.10") "require" => "user=jan" ), - "/server-config" => - ( + "/server-config" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10") diff --git a/tests/bug-12.conf b/tests/bug-12.conf index 49aa16b..cd72bf8 100644 --- a/tests/bug-12.conf +++ b/tests/bug-12.conf @@ -13,7 +13,7 @@ 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-" @@ -24,24 +24,24 @@ server.dir-listing = "enable" #server.event-handler = "linux-rtsig" #server.modules.path = "" -server.modules = ( +server.modules = ( "mod_rewrite", "mod_setenv", - "mod_access", + "mod_access", "mod_auth", # "mod_httptls", - "mod_status", + "mod_status", "mod_expire", "mod_simple_vhost", - "mod_redirect", + "mod_redirect", # "mod_evhost", # "mod_localizer", "mod_fastcgi", "mod_cgi", "mod_compress", - "mod_accesslog" ) + "mod_accesslog" ) -server.indexfiles = ( "index.html", +server.indexfiles = ( "index.html", "index.htm", "default.htm", "index.php" ) server.error-handler-404 = "/indexfile/return-404.php" @@ -55,7 +55,7 @@ server.error-handler-404 = "/indexfile/return-404.php" #|# change uid to <uid> (default: don't care) #| server.groupid wwwrun #| -#`-- +#`-- ######################## MODULE CONFIG ############################ @@ -63,7 +63,7 @@ server.error-handler-404 = "/indexfile/return-404.php" accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" -mimetype.assign = ( ".png" => "image/png", +mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".gif" => "image/gif", @@ -87,8 +87,8 @@ setenv.add-request-header = ( "FOO" => "foo") setenv.add-response-header = ( "BAR" => "foo") fastcgi.debug = 0 -fastcgi.server = ( ".php" => ( - "grisu" => ( +fastcgi.server = ( ".php" => ( + "grisu" => ( "host" => "127.0.0.1", "port" => 1026, # "mode" => "authorizer", @@ -96,12 +96,12 @@ fastcgi.server = ( ".php" => ( ) ) ) - + cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", ".py" => "/usr/bin/python" ) - + ssl.engine = "disable" @@ -115,22 +115,22 @@ auth.backend.ldap.hostname = "localhost" auth.backend.ldap.base-dn = "dc=my-domain,dc=com" auth.backend.ldap.filter = "(uid=$)" -auth.require = ( "/server-status" => - ( +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" => - ( + "/auth.php" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "host=192.168.2.10") "require" => "user=jan" ), - "/server-config" => - ( + "/server-config" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10") diff --git a/tests/cachable.t b/tests/cachable.t index 74d9a4b..9dc1121 100755 --- a/tests/cachable.t +++ b/tests/cachable.t @@ -15,7 +15,7 @@ my $tf = LightyTest->new(); my $t; $tf->{CONFIGFILE} = 'lighttpd.conf'; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); ## check if If-Modified-Since, If-None-Match works diff --git a/tests/condition.conf b/tests/condition.conf index 92c05ad..63b8fad 100644 --- a/tests/condition.conf +++ b/tests/condition.conf @@ -15,9 +15,9 @@ server.name = "www.example.org" server.tag = "Apache 1.3.29" -server.modules = ( +server.modules = ( "mod_redirect", - "mod_accesslog" ) + "mod_accesslog" ) ######################## MODULE CONFIG ############################ diff --git a/tests/core-request.t b/tests/core-request.t index f4db937..27edafa 100755 --- a/tests/core-request.t +++ b/tests/core-request.t @@ -223,7 +223,7 @@ ok($tf->handle_http($t) == 0, 'Content-Length > max-request-size'); $t->{REQUEST} = ( <<EOF POST /12345.txt HTTP/1.0 Host: 123.example.org -Content-Length: +Content-Length: EOF ); $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 411 } ]; diff --git a/tests/core-response.t b/tests/core-response.t index a8fbd00..c7a158c 100755 --- a/tests/core-response.t +++ b/tests/core-response.t @@ -14,7 +14,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); ## Low-Level Response-Header Parsing - HTTP/1.1 diff --git a/tests/core-var-include.t b/tests/core-var-include.t index a6ccbd3..b26790f 100755 --- a/tests/core-var-include.t +++ b/tests/core-var-include.t @@ -37,13 +37,13 @@ my $tests = { "var.myvar" => "/good_var_myvar" . $myvar, "myvar" => "/good_myvar" . $myvar, "env" => "/" . $ENV{"env_test"}, - + "number1" => "/good_number" . "1", "number2" => "1" . "/good_number", "array_append" => "/good_array_append", "string_append" => "/good_" . $mystr, "number_append" => "/good_" . "2", - + "include_shell" => "/good_include_shell_" . "456" }; diff --git a/tests/core.t b/tests/core.t index d8187dd..6de933c 100755 --- a/tests/core.t +++ b/tests/core.t @@ -123,7 +123,7 @@ ok($tf->handle_http($t) == 0, 'no whitespace'); $t->{REQUEST} = ( <<EOF GET / HTTP/1.0 -ABC:foo +ABC:foo bc EOF ); diff --git a/tests/docroot/123/Makefile.am b/tests/docroot/123/Makefile.am index 64712d7..e998042 100644 --- a/tests/docroot/123/Makefile.am +++ b/tests/docroot/123/Makefile.am @@ -1 +1 @@ -EXTRA_DIST=12345.html 12345.txt dummyfile.bla phpinfo.php +EXTRA_DIST=12345.html 12345.txt dummyfile.bla phpinfo.php diff --git a/tests/docroot/123/Makefile.in b/tests/docroot/123/Makefile.in index b777dd1..c187355 100644 --- a/tests/docroot/123/Makefile.in +++ b/tests/docroot/123/Makefile.in @@ -100,7 +100,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUACONFIG = @LUACONFIG@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAINT = @MAINT@ @@ -133,6 +132,7 @@ SQLITE_LIBS = @SQLITE_LIBS@ SSL_LIB = @SSL_LIB@ STRIP = @STRIP@ U = @U@ +UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ @@ -185,7 +185,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -EXTRA_DIST = 12345.html 12345.txt dummyfile.bla phpinfo.php +EXTRA_DIST = 12345.html 12345.txt dummyfile.bla phpinfo.php all: all-am .SUFFIXES: diff --git a/tests/docroot/Makefile.in b/tests/docroot/Makefile.in index de9347d..91435f3 100644 --- a/tests/docroot/Makefile.in +++ b/tests/docroot/Makefile.in @@ -109,7 +109,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUACONFIG = @LUACONFIG@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAINT = @MAINT@ @@ -142,6 +141,7 @@ SQLITE_LIBS = @SQLITE_LIBS@ SSL_LIB = @SSL_LIB@ STRIP = @STRIP@ U = @U@ +UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ diff --git a/tests/docroot/www/Makefile.in b/tests/docroot/www/Makefile.in index 4936786..89399a0 100644 --- a/tests/docroot/www/Makefile.in +++ b/tests/docroot/www/Makefile.in @@ -109,7 +109,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUACONFIG = @LUACONFIG@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAINT = @MAINT@ @@ -142,6 +141,7 @@ SQLITE_LIBS = @SQLITE_LIBS@ SSL_LIB = @SSL_LIB@ STRIP = @STRIP@ U = @U@ +UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ diff --git a/tests/docroot/www/cgi-pathinfo.pl b/tests/docroot/www/cgi-pathinfo.pl index af8d4df..7bebb0c 100644 --- a/tests/docroot/www/cgi-pathinfo.pl +++ b/tests/docroot/www/cgi-pathinfo.pl @@ -1,4 +1,4 @@ -#! /usr/bin/perl +#! /usr/bin/perl print "Content-Type: text/html\r\n\r\n"; diff --git a/tests/docroot/www/cgi.php b/tests/docroot/www/cgi.php index d92e52f..f59a840 100755 --- a/tests/docroot/www/cgi.php +++ b/tests/docroot/www/cgi.php @@ -1,4 +1,4 @@ -<?php +<?php #ob_start(/*"ob_gzhandler"*/); print "12345<br />\n"; diff --git a/tests/docroot/www/cgi.pl b/tests/docroot/www/cgi.pl index 9695adf..88ae6d3 100644 --- a/tests/docroot/www/cgi.pl +++ b/tests/docroot/www/cgi.pl @@ -1,4 +1,4 @@ -#! /usr/bin/perl +#! /usr/bin/perl print "Content-Type: text/html\r\n\r\n"; diff --git a/tests/docroot/www/expire/Makefile.in b/tests/docroot/www/expire/Makefile.in index 651ca63..38c6b66 100644 --- a/tests/docroot/www/expire/Makefile.in +++ b/tests/docroot/www/expire/Makefile.in @@ -100,7 +100,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUACONFIG = @LUACONFIG@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAINT = @MAINT@ @@ -133,6 +132,7 @@ SQLITE_LIBS = @SQLITE_LIBS@ SSL_LIB = @SSL_LIB@ STRIP = @STRIP@ U = @U@ +UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ diff --git a/tests/docroot/www/get-env.php b/tests/docroot/www/get-env.php index 15ac94f..8af72a6 100644 --- a/tests/docroot/www/get-env.php +++ b/tests/docroot/www/get-env.php @@ -1,3 +1,3 @@ -<?php +<?php print $_ENV[$_GET["env"]]; ?> diff --git a/tests/docroot/www/get-server-env.php b/tests/docroot/www/get-server-env.php index 17b4994..64d9312 100644 --- a/tests/docroot/www/get-server-env.php +++ b/tests/docroot/www/get-server-env.php @@ -1,3 +1,3 @@ -<?php +<?php print $_SERVER[$_GET["env"]]; ?> diff --git a/tests/docroot/www/go/Makefile.in b/tests/docroot/www/go/Makefile.in index 29dc6e3..b5c5d62 100644 --- a/tests/docroot/www/go/Makefile.in +++ b/tests/docroot/www/go/Makefile.in @@ -100,7 +100,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUACONFIG = @LUACONFIG@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAINT = @MAINT@ @@ -133,6 +132,7 @@ SQLITE_LIBS = @SQLITE_LIBS@ SSL_LIB = @SSL_LIB@ STRIP = @STRIP@ U = @U@ +UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ diff --git a/tests/docroot/www/go/cgi.php b/tests/docroot/www/go/cgi.php index d92e52f..f59a840 100755 --- a/tests/docroot/www/go/cgi.php +++ b/tests/docroot/www/go/cgi.php @@ -1,4 +1,4 @@ -<?php +<?php #ob_start(/*"ob_gzhandler"*/); print "12345<br />\n"; diff --git a/tests/docroot/www/indexfile/Makefile.in b/tests/docroot/www/indexfile/Makefile.in index 86181fa..5285d2d 100644 --- a/tests/docroot/www/indexfile/Makefile.in +++ b/tests/docroot/www/indexfile/Makefile.in @@ -100,7 +100,6 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LUACONFIG = @LUACONFIG@ LUA_CFLAGS = @LUA_CFLAGS@ LUA_LIBS = @LUA_LIBS@ MAINT = @MAINT@ @@ -133,6 +132,7 @@ SQLITE_LIBS = @SQLITE_LIBS@ SSL_LIB = @SSL_LIB@ STRIP = @STRIP@ U = @U@ +UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ diff --git a/tests/docroot/www/indexfile/return-404.php b/tests/docroot/www/indexfile/return-404.php index dd680cc..2adaaea 100644 --- a/tests/docroot/www/indexfile/return-404.php +++ b/tests/docroot/www/indexfile/return-404.php @@ -1,5 +1,5 @@ -<?php - header("Status: 404"); - +<?php + header("Status: 404"); + print $_SERVER["PHP_SELF"]; ?> diff --git a/tests/docroot/www/nph-status.pl b/tests/docroot/www/nph-status.pl index 602cdc7..528791b 100755 --- a/tests/docroot/www/nph-status.pl +++ b/tests/docroot/www/nph-status.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl print "HTTP/1.0 30 FooBar\r\n"; print "\r\n"; diff --git a/tests/fastcgi-auth.conf b/tests/fastcgi-auth.conf index a375e93..00b0060 100644 --- a/tests/fastcgi-auth.conf +++ b/tests/fastcgi-auth.conf @@ -16,7 +16,7 @@ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log 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-" @@ -27,23 +27,23 @@ server.dir-listing = "enable" #server.event-handler = "linux-rtsig" #server.modules.path = "" -server.modules = ( - "mod_rewrite", - "mod_access", +server.modules = ( + "mod_rewrite", + "mod_access", "mod_auth", # "mod_httptls", - "mod_status", + "mod_status", "mod_expire", # "mod_simple_vhost", - "mod_redirect", + "mod_redirect", # "mod_evhost", # "mod_localizer", "mod_fastcgi", "mod_cgi", "mod_compress", - "mod_accesslog" ) + "mod_accesslog" ) -server.indexfiles = ( "index.php", "index.html", +server.indexfiles = ( "index.php", "index.html", "index.htm", "default.htm" ) #,-- only root can use these options @@ -55,7 +55,7 @@ server.indexfiles = ( "index.php", "index.html", #|# change uid to <uid> (default: don't care) #| server.groupid wwwrun #| -#`-- +#`-- ######################## MODULE CONFIG ############################ @@ -63,7 +63,7 @@ server.indexfiles = ( "index.php", "index.html", accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" -mimetype.assign = ( ".png" => "image/png", +mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".gif" => "image/gif", @@ -83,23 +83,23 @@ compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") fastcgi.debug = 0 -fastcgi.server = ( "/" => ( - "grisu" => ( +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/", - + ) ) ) - + cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", ".py" => "/usr/bin/python" ) - + ssl.engine = "disable" @@ -113,22 +113,22 @@ auth.backend.ldap.hostname = "localhost" auth.backend.ldap.base-dn = "dc=my-domain,dc=com" auth.backend.ldap.filter = "(uid=$)" -auth.require = ( "/server-status" => - ( +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" => - ( + "/auth.php" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "host=192.168.2.10") "require" => "user=jan" ), - "/server-config" => - ( + "/server-config" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10") diff --git a/tests/fastcgi-responder.conf b/tests/fastcgi-responder.conf index 65b88bd..be5a97e 100644 --- a/tests/fastcgi-responder.conf +++ b/tests/fastcgi-responder.conf @@ -19,7 +19,7 @@ server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log 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-" @@ -30,23 +30,23 @@ server.dir-listing = "enable" #server.event-handler = "linux-rtsig" #server.modules.path = "" -server.modules = ( - "mod_rewrite", - "mod_access", +server.modules = ( + "mod_rewrite", + "mod_access", "mod_auth", # "mod_httptls", - "mod_status", + "mod_status", "mod_expire", # "mod_simple_vhost", - "mod_redirect", + "mod_redirect", # "mod_evhost", # "mod_localizer", "mod_fastcgi", "mod_cgi", "mod_compress", - "mod_accesslog" ) + "mod_accesslog" ) -server.indexfiles = ( "index.php", "index.html", +server.indexfiles = ( "index.php", "index.html", "index.htm", "default.htm" ) #,-- only root can use these options @@ -58,7 +58,7 @@ server.indexfiles = ( "index.php", "index.html", #|# change uid to <uid> (default: don't care) #| server.groupid wwwrun #| -#`-- +#`-- ######################## MODULE CONFIG ############################ @@ -66,7 +66,7 @@ server.indexfiles = ( "index.php", "index.html", accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" -mimetype.assign = ( ".png" => "image/png", +mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".gif" => "image/gif", @@ -86,8 +86,8 @@ compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") fastcgi.debug = 0 -fastcgi.server = ( ".fcgi" => ( - "grisu" => ( +fastcgi.server = ( ".fcgi" => ( + "grisu" => ( "host" => "127.0.0.1", "port" => 10000, "bin-path" => env.SRCDIR + "/fcgi-responder", @@ -97,12 +97,12 @@ fastcgi.server = ( ".fcgi" => ( ) ) ) - + cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", ".py" => "/usr/bin/python" ) - + ssl.engine = "disable" @@ -116,22 +116,22 @@ auth.backend.ldap.hostname = "localhost" auth.backend.ldap.base-dn = "dc=my-domain,dc=com" auth.backend.ldap.filter = "(uid=$)" -auth.require = ( "/server-status" => - ( +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" => - ( + "/auth.php" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "host=192.168.2.10") "require" => "user=jan" ), - "/server-config" => - ( + "/server-config" => + ( "method" => "basic", "realm" => "download archiv", # "require" => ("group=www", "user=jan", "user=weigon", "host=192.168.2.10") diff --git a/tests/fcgi-auth.c b/tests/fcgi-auth.c index ddecddc..bb7ae69 100644 --- a/tests/fcgi-auth.c +++ b/tests/fcgi-auth.c @@ -1,25 +1,30 @@ +#include "config.h" +#ifdef HAVE_FASTCGI_FASTCGI_H +#include <fastcgi/fcgi_stdio.h> +#else #include <fcgi_stdio.h> +#endif #include <stdlib.h> #include <unistd.h> #include <string.h> int main () { char* p; - - while (FCGI_Accept() >= 0) { + + while (FCGI_Accept() >= 0) { /* wait for fastcgi authorizer request */ - + printf("Content-type: text/html\r\n"); - + if (((p = getenv("QUERY_STRING")) == NULL) || strcmp(p, "ok") != 0) { printf("Status: 403 Forbidden\r\n\r\n"); - } else { + } else { printf("\r\n"); /* default Status is 200 - allow access */ } - - printf("foobar\r\n"); + + printf("foobar\r\n"); } return 0; diff --git a/tests/fcgi-responder.c b/tests/fcgi-responder.c index 7fbaf28..9270295 100644 --- a/tests/fcgi-responder.c +++ b/tests/fcgi-responder.c @@ -1,15 +1,20 @@ +#include "config.h" +#ifdef HAVE_FASTCGI_FASTCGI_H +#include <fastcgi/fcgi_stdio.h> +#else #include <fcgi_stdio.h> +#endif #include <stdlib.h> #include <unistd.h> #include <string.h> int main () { int num_requests = 2; - + while (num_requests > 0 && FCGI_Accept() >= 0) { char* p; - + if (NULL != (p = getenv("QUERY_STRING"))) { if (0 == strcmp(p, "lf")) { printf("Status: 200 OK\n\n"); @@ -32,9 +37,9 @@ int main () { } else { printf("Status: 500 Internal Foo\r\n\r\n"); } - + printf("test123"); } - + return 0; } diff --git a/tests/lighttpd.conf b/tests/lighttpd.conf index 2426925..878cb1f 100644 --- a/tests/lighttpd.conf +++ b/tests/lighttpd.conf @@ -21,17 +21,17 @@ server.dir-listing = "enable" #server.event-handler = "linux-rtsig" #server.modules.path = "" -server.modules = ( +server.modules = ( "mod_rewrite", "mod_setenv", "mod_secdownload", - "mod_access", + "mod_access", "mod_auth", # "mod_httptls", - "mod_status", + "mod_status", "mod_expire", "mod_simple_vhost", - "mod_redirect", + "mod_redirect", # "mod_evhost", # "mod_localizer", "mod_fastcgi", @@ -39,9 +39,9 @@ server.modules = ( "mod_compress", "mod_userdir", "mod_ssi", - "mod_accesslog" ) + "mod_accesslog" ) -server.indexfiles = ( "index.php", "index.html", +server.indexfiles = ( "index.php", "index.html", "index.htm", "default.htm" ) @@ -51,7 +51,7 @@ ssi.extension = ( ".shtml" ) accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" -mimetype.assign = ( ".png" => "image/png", +mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".gif" => "image/gif", @@ -84,12 +84,12 @@ fastcgi.debug = 0 fastcgi.server = ( ".php" => ( ( "host" => "127.0.0.1", "port" => 1026, "broken-scriptfilename" => "enable" ) ), "/prefix.fcgi" => ( ( "host" => "127.0.0.1", "port" => 1026, "check-local" => "disable", "broken-scriptfilename" => "enable" ) ) ) - + cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", ".py" => "/usr/bin/python" ) - + userdir.include-user = ( "jan" ) userdir.path = "/" @@ -106,14 +106,14 @@ auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.htpasswd.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.htpasswd" -auth.require = ( "/server-status" => - ( +auth.require = ( "/server-status" => + ( "method" => "digest", "realm" => "download archiv", "require" => "group=www|user=jan|host=192.168.2.10" ), - "/server-config" => - ( + "/server-config" => + ( "method" => "basic", "realm" => "download archiv", "require" => "valid-user" @@ -125,7 +125,7 @@ url.access-deny = ( "~", ".inc") url.rewrite = ( "^/rewrite/foo($|\?.+)" => "/indexfile/rewrite.php$1", "^/rewrite/bar(?:$|\?(.+))" => "/indexfile/rewrite.php?bar&$1" ) -expire.url = ( "/expire/access" => "access 2 hours", +expire.url = ( "/expire/access" => "access 2 hours", "/expire/modification" => "access plus 1 seconds 2 minutes") #cache.cache-dir = "/home/weigon/wwwroot/cache/" diff --git a/tests/lowercase.conf b/tests/lowercase.conf index 60eb40f..557a703 100644 --- a/tests/lowercase.conf +++ b/tests/lowercase.conf @@ -12,25 +12,25 @@ server.force-lowercase-filenames = "enable" server.dir-listing = "enable" -server.modules = ( +server.modules = ( "mod_rewrite", "mod_setenv", "mod_secdownload", - "mod_access", + "mod_access", "mod_auth", - "mod_status", + "mod_status", "mod_expire", - "mod_redirect", + "mod_redirect", "mod_fastcgi", - "mod_cgi" ) + "mod_cgi" ) -server.indexfiles = ( "index.php", "index.html", +server.indexfiles = ( "index.php", "index.html", "index.htm", "default.htm" ) ######################## MODULE CONFIG ############################ -mimetype.assign = ( ".png" => "image/png", +mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".gif" => "image/gif", @@ -50,20 +50,20 @@ fastcgi.debug = 0 fastcgi.server = ( ".php" => ( ( "host" => "127.0.0.1", "port" => 1026, "broken-scriptfilename" => "enable" ) ), "/prefix.fcgi" => ( ( "host" => "127.0.0.1", "port" => 1026, "check-local" => "disable", "broken-scriptfilename" => "enable" ) ) ) - + cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", ".py" => "/usr/bin/python" ) - + auth.backend = "plain" auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.htpasswd.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.htpasswd" $HTTP["host"] == "lowercase-auth" { - auth.require = ( "/image.jpg" => - ( + auth.require = ( "/image.jpg" => + ( "method" => "digest", "realm" => "download archiv", "require" => "valid-user" diff --git a/tests/lowercase.t b/tests/lowercase.t index e127cdd..b9ee8e8 100755 --- a/tests/lowercase.t +++ b/tests/lowercase.t @@ -15,7 +15,7 @@ my $tf = LightyTest->new(); my $t; $tf->{CONFIGFILE} = 'lowercase.conf'; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); ## check if lower-casing works diff --git a/tests/mod-access.t b/tests/mod-access.t index b32dfe0..fb08db4 100755 --- a/tests/mod-access.t +++ b/tests/mod-access.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); $t->{REQUEST} = ( <<EOF diff --git a/tests/mod-auth.t b/tests/mod-auth.t index 8500ced..b0efbde 100755 --- a/tests/mod-auth.t +++ b/tests/mod-auth.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); $t->{REQUEST} = ( <<EOF @@ -83,11 +83,11 @@ ok($tf->handle_http($t) == 0, 'Digest-Auth: missing qop, no crash'); $t->{REQUEST} = ( <<EOF GET /server-status HTTP/1.0 User-Agent: Wget/1.9.1 -Authorization: Digest username="jan", realm="jan", - nonce="b1d12348b4620437c43dd61c50ae4639", - uri="/MJ-BONG.xm.mpc", qop=auth, noncecount=00000001", - cnonce="036FCA5B86F7E7C4965C7F9B8FE714B7", - response="29B32C2953C763C6D033C8A49983B87E" +Authorization: Digest username="jan", realm="jan", + nonce="b1d12348b4620437c43dd61c50ae4639", + uri="/MJ-BONG.xm.mpc", qop=auth, noncecount=00000001", + cnonce="036FCA5B86F7E7C4965C7F9B8FE714B7", + response="29B32C2953C763C6D033C8A49983B87E" EOF ); $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 400 } ]; diff --git a/tests/mod-cgi.t b/tests/mod-cgi.t index b205d8c..a42bcd5 100755 --- a/tests/mod-cgi.t +++ b/tests/mod-cgi.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); # mod-cgi diff --git a/tests/mod-compress.t b/tests/mod-compress.t index e4f110f..f243832 100755 --- a/tests/mod-compress.t +++ b/tests/mod-compress.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); $t->{REQUEST} = ( <<EOF diff --git a/tests/mod-redirect.t b/tests/mod-redirect.t index 666ca80..b26abc9 100755 --- a/tests/mod-redirect.t +++ b/tests/mod-redirect.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); $t->{REQUEST} = ( <<EOF diff --git a/tests/mod-rewrite.t b/tests/mod-rewrite.t index 31c7d1a..a1e2193 100755 --- a/tests/mod-rewrite.t +++ b/tests/mod-rewrite.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + SKIP: { skip "no PHP running on port 1026", 5 unless $tf->listening_on(1026); @@ -27,7 +27,7 @@ EOF ); $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => '' } ]; ok($tf->handle_http($t) == 0, 'valid request'); - + $t->{REQUEST} = ( <<EOF GET /rewrite/foo?a=b HTTP/1.0 Host: www.example.org diff --git a/tests/mod-setenv.t b/tests/mod-setenv.t index 1eb32a1..a5c2b7e 100755 --- a/tests/mod-setenv.t +++ b/tests/mod-setenv.t @@ -14,7 +14,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); $t->{REQUEST} = ( <<EOF diff --git a/tests/mod-ssi.t b/tests/mod-ssi.t index 8bc88cc..a6b021b 100755 --- a/tests/mod-ssi.t +++ b/tests/mod-ssi.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); # mod-cgi diff --git a/tests/mod-userdir.t b/tests/mod-userdir.t index 30d546a..13a8e1b 100755 --- a/tests/mod-userdir.t +++ b/tests/mod-userdir.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); # get current user diff --git a/tests/prepare.sh b/tests/prepare.sh index 71816d1..040b6ee 100755 --- a/tests/prepare.sh +++ b/tests/prepare.sh @@ -42,7 +42,7 @@ cp $srcdir/var-include-sub.conf $tmpdir/../ touch $tmpdir/servers/www.example.org/pages/image.jpg \ $tmpdir/servers/www.example.org/pages/image.JPG \ $tmpdir/servers/www.example.org/pages/Foo.txt \ - $tmpdir/servers/www.example.org/pages/a + $tmpdir/servers/www.example.org/pages/a echo "12345" > $tmpdir/servers/www.example.org/pages/range.pdf printf "%-40s" "preparing infrastructure" diff --git a/tests/request.t b/tests/request.t index 7dd4cc6..64e48cc 100755 --- a/tests/request.t +++ b/tests/request.t @@ -13,7 +13,7 @@ use LightyTest; my $tf = LightyTest->new(); my $t; - + ok($tf->start_proc == 0, "Starting lighttpd") or die(); ## Basic Request-Handling diff --git a/tests/run-tests.pl b/tests/run-tests.pl index 44e76a9..6dae9a8 100755 --- a/tests/run-tests.pl +++ b/tests/run-tests.pl @@ -2,8 +2,8 @@ use strict; -use Test::Harness qw(&runtests $verbose); -$verbose=0; +use Test::Harness qw(&runtests $verbose); +$verbose=0; my $srcdir = (defined $ENV{'srcdir'} ? $ENV{'srcdir'} : '.'); diff --git a/tests/var-include.conf b/tests/var-include.conf index 397c91d..4cf6113 100644 --- a/tests/var-include.conf +++ b/tests/var-include.conf @@ -16,7 +16,7 @@ server.tag = "Apache 1.3.29" server.modules = ( "mod_redirect", - "mod_accesslog" ) + "mod_accesslog" ) ######################## MODULE CONFIG ############################ |