Mercurial > prosody-hg

diff net/httpserver.lua @ 4541:05f5ec99da77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parents d1d4d8c8a2a9
children de04897cb8fe
line wrap: on
line diff
--- a/net/httpserver.lua	Sat Dec 10 17:21:19 2011 +0000
+++ b/net/httpserver.lua	Sun Jan 22 22:55:49 2012 +0000
@@ -7,7 +7,6 @@
 --
 
 
-local server = require "net.server"
 local url_parse = require "socket.url".parse;
 local httpstream_new = require "util.httpstream".new;