Merge pull request #1253 from minrk/linger-timeout

use more conservative 30 second default timeout for LINGER

doc/zmq_setsockopt.txt

@@ -323,7 +323,7 @@ following outlines the different behaviours:
 [horizontal]
 Option value type:: int
 Option value unit:: milliseconds
-Default value:: 2000 (two seconds)
+Default value:: 30000 (thirty seconds)
 Applicable socket types:: all
 
 

src/options.cpp

@@ -35,7 +35,7 @@ zmq::options_t::options_t () :
     rcvbuf (0),
     tos (0),
     type (-1),
-    linger (2000),
+    linger (30000),
     reconnect_ivl (100),
     reconnect_ivl_max (0),
     backlog (100),