Merge branch 'v0.6'

Conflicts:
	ChangeLog
	doc/template.html
	lib/cluster.js
	lib/http.js
	lib/tls.js
	src/node.h
	src/node_version.h
	test/simple/test-cluster-kill-workers.js

1 files changed, 12 insertions, 8 deletions

diff --git a/lib/zlib.js b/lib/zlib.js
index 339f1e713..349c5c64d 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -122,18 +122,18 @@ function zlibBuffer(engine, buffer, callback) {
   var buffers = [];
   var nread = 0;
 
-  engine.on('error', function(err) {
-    engine.removeListener('end');
-    engine.removeListener('error');
+  function onError(err) {
+    engine.removeListener('end', onEnd);
+    engine.removeListener('error', onError);
     callback(err);
-  });
+  }
 
-  engine.on('data', function(chunk) {
+  function onData(chunk) {
     buffers.push(chunk);
     nread += chunk.length;
-  });
+  }
 
-  engine.on('end', function() {
+  function onEnd() {
     var buffer;
     switch(buffers.length) {
       case 0:
@@ -153,7 +153,11 @@ function zlibBuffer(engine, buffer, callback) {
         break;
     }
     callback(null, buffer);
-  });
+  }
+
+  engine.on('error', onError);
+  engine.on('data', onData);
+  engine.on('end', onEnd);
 
   engine.write(buffer);
   engine.end();