Merge 0.9->trunk

diff --cc net/server_event.lua
index e320b15c3b759539e4d8af00dcd3aacb06dc9f89,dc48e338b21e3997098b25c17a7d3e3c3685fa4f..9f479d5be6e95576c1c6acd57eea8cf5e2044441
--- 1/net/server_event.lua
--- 2/net/server_event.lua
+++ b/net/server_event.lua
@@@ -477,7 -484,7 +484,8 @@@ d
                        ondisconnect = listener.ondisconnect;  -- will be called when client disconnects
                        onincoming = listener.onincoming;  -- will be called when client sends data
                        ontimeout = listener.ontimeout; -- called when fatal socket timeout occurs
+                       onreadtimeout = listener.onreadtimeout; -- called when socket inactivity timeout occurs
 +                      ondrain = listener.ondrain; -- called when writebuffer is empty
                        onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS)
                        eventread = false, eventwrite = false, eventclose = false,
                        eventhandshake = false, eventstarthandshake = false;  -- event handler