lighttpd
/
lighttpd1.4
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

- a few more whitespace cleanups 

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1374 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.13
Marcus Rückert 16 years ago
parent
bb24041f92
commit
b8df99f3db
41 changed files with 177 additions and 177 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      tests/Makefile.am
  2. 2
      tests/SConscript
  3. 38
      tests/bug-06.conf
  4. 38
      tests/bug-12.conf
  5. 2
      tests/cachable.t
  6. 4
      tests/condition.conf
  7. 2
      tests/core-request.t
  8. 2
      tests/core-response.t
  9. 4
      tests/core-var-include.t
  10. 2
      tests/core.t
  11. 2
      tests/docroot/123/Makefile.am
  12. 2
      tests/docroot/www/cgi-pathinfo.pl
  13. 2
      tests/docroot/www/cgi.php
  14. 2
      tests/docroot/www/cgi.pl
  15. 2
      tests/docroot/www/get-env.php
  16. 2
      tests/docroot/www/get-server-env.php
  17. 2
      tests/docroot/www/go/cgi.php
  18. 6
      tests/docroot/www/indexfile/return-404.php
  19. 2
      tests/docroot/www/nph-status.pl
  20. 42
      tests/fastcgi-auth.conf
  21. 40
      tests/fastcgi-responder.conf
  22. 14
      tests/fcgi-auth.c
  23. 8
      tests/fcgi-responder.c
  24. 28
      tests/lighttpd.conf
  25. 22
      tests/lowercase.conf
  26. 2
      tests/lowercase.t
  27. 2
      tests/mod-access.t
  28. 12
      tests/mod-auth.t
  29. 2
      tests/mod-cgi.t
  30. 2
      tests/mod-compress.t
  31. 2
      tests/mod-redirect.t
  32. 4
      tests/mod-rewrite.t
  33. 2
      tests/mod-secdownload.t
  34. 2
      tests/mod-setenv.t
  35. 2
      tests/mod-ssi.t
  36. 2
      tests/mod-userdir.t
  37. 2
      tests/prepare.sh
  38. 36
      tests/proxy.conf
  39. 2
      tests/request.t
  40. 4
      tests/run-tests.pl
  41. 2
      tests/var-include.conf

4
tests/Makefile.am
Unescape View File

@ -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

2
tests/SConscript
Unescape View File

@ -32,7 +32,7 @@ extra_dist = Split('fastcgi-10.conf \
LightyTest.pm \
mod-setenv.t')
t = env.Command('foo1', 'prepare.sh', '(cd ./tests/; ./prepare.sh; cd ..)')
t = env.Command('foo1', 'prepare.sh', '(cd ./tests/; ./prepare.sh; cd ..)')
t += env.Command('foo2', 'run-tests.pl', '( cd ./tests/; SHELL=/bin/sh ./run-tests.pl; cd ..)')
t += env.Command('foo3', 'cleanup.sh', '(cd ./tests/; ./cleanup.sh; cd ..)')

38
tests/bug-06.conf
Unescape View File

@ -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")

38
tests/bug-12.conf
Unescape View File

@ -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")

2
tests/cachable.t
Unescape View File

@ -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

4
tests/condition.conf
Unescape View File

@ -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 ############################

2
tests/core-request.t
Unescape View File

@ -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 } ];

2
tests/core-response.t
Unescape View File

@ -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

4
tests/core-var-include.t
Unescape View File

@ -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"
};

2
tests/core.t
Unescape View File

@ -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
);

2
tests/docroot/123/Makefile.am
Unescape View File

@ -1 +1 @@
EXTRA_DIST=12345.html 12345.txt dummyfile.bla phpinfo.php
EXTRA_DIST=12345.html 12345.txt dummyfile.bla phpinfo.php

2
tests/docroot/www/cgi-pathinfo.pl
Unescape View File

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

2
tests/docroot/www/cgi.php
Unescape View File

@ -1,4 +1,4 @@
<?php
<?php
#ob_start(/*"ob_gzhandler"*/);
print "12345<br />\n";

2
tests/docroot/www/cgi.pl
Unescape View File

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

2
tests/docroot/www/get-env.php
Unescape View File

@ -1,3 +1,3 @@
<?php
<?php
print $_ENV[$_GET["env"]];
?>

2
tests/docroot/www/get-server-env.php
Unescape View File

@ -1,3 +1,3 @@
<?php
<?php
print $_SERVER[$_GET["env"]];
?>

2
tests/docroot/www/go/cgi.php
Unescape View File

@ -1,4 +1,4 @@
<?php
<?php
#ob_start(/*"ob_gzhandler"*/);
print "12345<br />\n";

6
tests/docroot/www/indexfile/return-404.php
Unescape View File

@ -1,5 +1,5 @@
<?php
header("Status: 404");
<?php
header("Status: 404");
print $_SERVER["PHP_SELF"];
?>

2
tests/docroot/www/nph-status.pl
Unescape View File

@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/perl
print "HTTP/1.0 30 FooBar\r\n";
print "\r\n";

42
tests/fastcgi-auth.conf
Unescape View File

@ -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")

40
tests/fastcgi-responder.conf
Unescape View File

@ -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")

14
tests/fcgi-auth.c
Unescape View File

@ -10,21 +10,21 @@
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;

8
tests/fcgi-responder.c
Unescape View File

@ -10,11 +10,11 @@
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");
@ -37,9 +37,9 @@ int main () {
} else {
printf("Status: 500 Internal Foo\r\n\r\n");
}
printf("test123");
}
return 0;
}

28
tests/lighttpd.conf
Unescape View File

@ -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/"

22
tests/lowercase.conf
Unescape View File

@ -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"

2
tests/lowercase.t
Unescape View File

@ -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

2
tests/mod-access.t
Unescape View File

@ -13,7 +13,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
$t->{REQUEST} = ( <<EOF

12
tests/mod-auth.t
Unescape View File

@ -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 } ];

2
tests/mod-cgi.t
Unescape View File

@ -13,7 +13,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
# mod-cgi

2
tests/mod-compress.t
Unescape View File

@ -13,7 +13,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
$t->{REQUEST} = ( <<EOF

2
tests/mod-redirect.t
Unescape View File

@ -13,7 +13,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
$t->{REQUEST} = ( <<EOF

4
tests/mod-rewrite.t
Unescape View File

@ -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

2
tests/mod-secdownload.t
Unescape View File

@ -14,7 +14,7 @@ use Digest::MD5 qw(md5_hex);
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
my $secret = "verysecret";

2
tests/mod-setenv.t
Unescape View File

@ -14,7 +14,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
$t->{REQUEST} = ( <<EOF

2
tests/mod-ssi.t
Unescape View File

@ -13,7 +13,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
# mod-cgi

2
tests/mod-userdir.t
Unescape View File

@ -13,7 +13,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
# get current user

2
tests/prepare.sh
Unescape View File

@ -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"

36
tests/proxy.conf
Unescape View File

@ -16,16 +16,16 @@ 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",
@ -33,9 +33,9 @@ server.modules = (
"mod_cgi",
"mod_compress",
"mod_userdir",
"mod_accesslog" )
"mod_accesslog" )
server.indexfiles = ( "index.php", "index.html",
server.indexfiles = ( "index.php", "index.html",
"index.htm", "default.htm" )
@ -44,7 +44,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",
@ -68,19 +68,19 @@ setenv.add-request-header = ( "FOO" => "foo")
setenv.add-response-header = ( "BAR" => "foo")
proxy.debug = 1
proxy.server = ( "" => (
"grisu" => (
proxy.server = ( "" => (
"grisu" => (
"host" => "127.0.0.1",
"port" => 2048,
)
)
)
cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/usr/bin/perl",
".py" => "/usr/bin/python" )
userdir.include-user = ( "jan" )
userdir.path = "/"
@ -95,22 +95,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")
@ -125,7 +125,7 @@ url.redirect = ( "^/redirect/$" => "http://localhost:2048/" )
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/"

2
tests/request.t
Unescape View File

@ -13,7 +13,7 @@ use LightyTest;
my $tf = LightyTest->new();
my $t;
ok($tf->start_proc == 0, "Starting lighttpd") or die();
## Basic Request-Handling

4
tests/run-tests.pl
Unescape View File

@ -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'} : '.');

2
tests/var-include.conf
Unescape View File

@ -16,7 +16,7 @@ server.tag = "Apache 1.3.29"
server.modules = ( "mod_redirect",
"mod_accesslog" )
"mod_accesslog" )
######################## MODULE CONFIG ############################

Write Preview
Loading…
Cancel
Save