Merge branch 'Clever-set-keepalive'

README.md

@@ -192,6 +192,7 @@ every command on a client.
 * `socket_nodelay`: defaults to `true`. Whether to call setNoDelay() on the TCP stream, which disables the
 Nagle algorithm on the underlying socket.  Setting this option to `false` can result in additional throughput at the
 cost of more latency.  Most applications will want this set to `true`.
+* `socket_keepalive` defaults to `false`. Whether the keep-alive functionality is enabled on the underlying socket. 
 * `no_ready_check`: defaults to `false`. When a connection is established to the Redis server, the server might still
 be loading the database from disk.  While loading, the server not respond to any commands.  To work around this,
 `node_redis` has a "ready check" which sends the `INFO` command to the server.  The response from the `INFO` command

index.js

@@ -43,6 +43,9 @@ function RedisClient(stream, options) {
     if (this.options.socket_nodelay === undefined) {
         this.options.socket_nodelay = true;
     }
+    if (this.options.socket_keepalive === undefined) {
+        this.options.socket_keepalive = false;
+    }
     this.should_buffer = false;
     this.command_queue_high_water = this.options.command_queue_high_water || 1000;
     this.command_queue_low_water = this.options.command_queue_low_water || 0;
@@ -253,6 +256,7 @@ RedisClient.prototype.on_connect = function () {
     if (this.options.socket_nodelay) {
         this.stream.setNoDelay();
     }
+    this.stream.setKeepAlive(this.options.socket_keepalive);
     this.stream.setTimeout(0);
 
     this.init_parser();