Fixed SMTP mail sender.

petersirka · petersirka · commit 30efed390c53 · 2016-04-17T20:35:36.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -43,6 +43,7 @@
 - fixed: problem with `websocket.destroy()`
 - fixed: `F.cors()`
 - fixed: WebSocket initialization (critical)
+- fixed: Mail sender (problem with ZOHO SMTP)
 
 - renamed: event `route-add` to `route`
 - renamed: `F.versionNode` to `F.version_node`
diff --git a/index.js b/index.js
@@ -424,7 +424,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 2000;
-	this.version_header = '2.0.0-20';
+	this.version_header = '2.0.0-21';
 	this.version_node = process.version.toString().replace('v', '').replace(/\./g, '').parseFloat();
 
 	this.config = {
diff --git a/mail.js b/mail.js
@@ -482,6 +482,7 @@ Message.prototype._send = function(socket, options, autosend) {
 	var err = null;
 	var ending = null;
 	var isTLS = false;
+	var response = '';
 
 	var write = function(line) {
 		if (self.closed)
@@ -607,15 +608,23 @@ Message.prototype._send = function(socket, options, autosend) {
 		if (self.closed)
 			return;
 
-		var response = data.toString().split(CRLF);
-		var length = response.length;
+		data = data.toString();
 
-		for (var i = 0; i < length; i++) {
+		if (!data.endsWith(CRLF)) {
+			response += data;
+			return;
+		}
 
-			var line = response[i];
-			if (line === '')
-				continue;
+		var res = (response + data).split(CRLF);
 
+		if (response)
+			response = '';
+
+		var length = res.length;
+		for (var i = 0; i < length; i++) {
+			var line = res[i];
+			if (!line)
+				continue;
 			if (socket)
 				socket.emit('line', line);
 		}
@@ -628,6 +637,7 @@ Message.prototype._send = function(socket, options, autosend) {
 			console.log('<---', line);
 
 		var code = +line.match(/\d+/)[0];
+
 		if (code === 250 && !isAuthorization) {
 			if ((line.indexOf('AUTH LOGIN PLAIN') !== -1 || line.indexOf('AUTH PLAIN LOGIN') !== -1) || (options.user && options.password)) {
 				authType = 'plain';
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
         "name": "Сковорода Никита Андреевич",
         "email": "chalkerx@gmail.com"
     }],
-    "version": "2.0.0-20",
+    "version": "2.0.0-21",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
