sync with -current

1 files changed, 15 insertions, 1 deletions

diff --git a/TODO.md b/TODO.md
index 59f3e4f..6987b14 100644
--- a/TODO.md
+++ b/TODO.md
@@ -30,9 +30,23 @@ is to set a non-accessible root:
                 root "/forbidden"
         }
 
-#20150102-04 server aliases **PENDING**
+#20150102-04 server aliases **CLOSED**
 ---------------------------------------
 
+Update: server aliases and multiple listen statements are supported:
+
+> Support alias names and multiple listen statements per server block.
+The implementation is done in the parser by expanding each
+alias/listen into an independent server configuration; this makes it
+easier to handle internally without adding additional loops or
+conditions.
+
+	server "www.example.com" {
+		alias "example.com"
+		listen on * port 80
+		listen on * tls port 443
+	}
+
 Server aliases and a few restrictions of the grammar: Individual
 server blocks can currently only have one name and listen statement.
 This will be fixed in the parser later.  To avoid too much repeating