aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bachelier <laurent@bachelier.name>2011-07-01 18:22:26 +0200
committerLaurent Bachelier <laurent@bachelier.name>2011-07-01 18:22:26 +0200
commit8bd53eadfae470318fa374120647a2248bb9e605 (patch)
tree52a0a203a40506246b7a5675b4f7cfd0237af7c9
parentRemove getcwd() calls from lib classes (diff)
parentForce expiration of everything (diff)
downloadsymfttpd-8bd53eadfae470318fa374120647a2248bb9e605.tar.xz
Merge branch 'master' into multiapp
Conflicts: data/lighttpd.conf.php
-rw-r--r--LICENSE2
-rw-r--r--README.md6
-rw-r--r--data/lighttpd.conf.php5
-rwxr-xr-xspawn3
4 files changed, 11 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 607ce36..2f15211 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009 Laurent Bachelier
+Copyright (c) 2010-2011 Laurent Bachelier
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
index ec81ce7..93aa7f9 100644
--- a/README.md
+++ b/README.md
@@ -70,10 +70,10 @@ by using the symfttpd.conf.php mechanism.
(useful for running multiple projects at the same time)
* `--all` or `-A`: Listen on all interfaces (overrides `--bind`)
* `--bind=<port>` or `-b<ip>`: Listen on a specific IP (default is `127.0.0.1`)
-* `--path=<path>`: Use a different project path (default is current dir)
-* `--tail` or `t`: Display server logs in the console
+* `--path=<path>` or `-P<path>`: Use a different project path (default is current dir)
+* `--tail` or `-t`: Display server logs in the console
(like the UNIX `tail` command would do)
-* `--no-color` or `C`: Disable colored output
+* `--no-color` or `-C`: Disable colored output
(also automatically disabled if the output is piped)
* `--single-process` or `-s`: Do not try to run lighttpd in another process
(not recommended, you will lose auto-reloading of the rewriting rules)
diff --git a/data/lighttpd.conf.php b/data/lighttpd.conf.php
index 6c03c62..1e481d1 100644
--- a/data/lighttpd.conf.php
+++ b/data/lighttpd.conf.php
@@ -3,7 +3,7 @@ server.modules = (
"mod_access",
"mod_accesslog",
"mod_setenv",
- "mod_fastcgi"
+ "mod_fastcgi",
)
server.port = <?php echo $port ?>
@@ -29,6 +29,9 @@ fastcgi.server = ( ".php" =>
)
)
+setenv.add-response-header = ( "X-Symfttpd" => "1",
+ "Expires" => "Sun, 17 Mar 1985 00:42:00 GMT" )
+
include_shell "cat <?php echo escapeshellarg(dirname(__FILE__).'/mime-types.conf') ?>"
server.indexfiles = ("index.php", "index.html",
"index.htm", "default.htm")
diff --git a/spawn b/spawn
index e8925f6..6f59a3c 100755
--- a/spawn
+++ b/spawn
@@ -141,6 +141,9 @@ else
pclose($handle);
if ($prev_genconf !== null && $prev_genconf !== $genconf)
{
+ // This sleep() is so that if a HTTP request just created a file in web/,
+ // the web server isn't restarted right away.
+ sleep(1);
touch($options['restartfile']);
!PosixTools::killPid($options['pidfile']);
}