Mercurial > prosody-hg
comparison net/httpserver_listener.lua @ 3047:820ae39e06de
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 18 May 2010 00:47:06 +0100 |
| parents | 692b3c6c5bd2 92173d8a35d3 |
| children |
comparison
equal
deleted
inserted
replaced
| 3044:a6f89c72d305 | 3047:820ae39e06de |
|---|---|
| 27 if conn:ssl() then | 27 if conn:ssl() then |
| 28 request.secure = true; | 28 request.secure = true; |
| 29 end | 29 end |
| 30 end | 30 end |
| 31 | 31 |
| 32 if data then | 32 if data and data ~= "" then |
| 33 request_reader(request, data); | 33 request_reader(request, data); |
| 34 end | 34 end |
| 35 end | 35 end |
| 36 | 36 |
| 37 function httpserver.ondisconnect(conn, err) | 37 function httpserver.ondisconnect(conn, err) |
