Fixed problem with Expires header.

petersirka · petersirka · commit 56eb2dcb763c · 2016-02-16T15:14:44.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -28,6 +28,7 @@
 - updated: NoSQL embeddded version
 - updated: `U.ls()` --> [filter] can be `string` or `RegExp`
 
+- fixed: (IMPORTANT) Expires headers (problem with Russian timezone)
 - fixed: (IMPORTANT) SchemaBuilder validation
 - fixed: (IMPORTANT) view caching
 - fixed: (IMPORTANT) U.keywords()
diff --git a/index.js b/index.js
@@ -428,7 +428,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 1970;
-	this.version_header = '1.9.7-26';
+	this.version_header = '1.9.7-27';
 
 	var version = process.version.toString().replace('v', '').replace(/\./g, '');
 	if (version[0] !== '0' || version[1] !== '0')
@@ -4381,7 +4381,7 @@ Framework.prototype.responseStatic = function(req, res, done) {
 
 		if (RELEASE) {
 			headers['Etag'] = etag;
-			headers['Expires'] = new Date().add('y', 1);
+			headers['Expires'] = prepare_date(new Date().add('y', 1));
 			headers[RESPONSE_HEADER_CACHECONTROL] = 'public, max-age=' + framework.config['default-response-maxage'];
 		}
 
@@ -4634,7 +4634,7 @@ Framework.prototype.responseFile = function(req, res, filename, downloadName, he
 			delete returnHeaders.ETag;
 
 		if (!res.getHeader('Expires'))
-			returnHeaders.Expires = new Date().add('y', 1);
+			returnHeaders.Expires = prepare_date(new Date().add('y', 1));
 		else if (returnHeaders.Expires)
 			delete returnHeaders.Expires;
 
@@ -4724,7 +4724,7 @@ Framework.prototype.responseFile = function(req, res, filename, downloadName, he
 	if (canCache && !res.getHeader('Expires')) {
 		var dt = new Date();
 		dt.setFullYear(dt.getFullYear() + 1);
-		returnHeaders.Expires = dt;
+		returnHeaders.Expires = prepare_date(dt);
 	} else if (returnHeaders.Expires)
 		delete returnHeaders.Expires;
 
@@ -5240,7 +5240,7 @@ Framework.prototype.responseStream = function(req, res, contentType, stream, dow
 	if (RELEASE) {
 		var dt = new Date();
 		dt.setFullYear(dt.getFullYear() + 1);
-		returnHeaders.Expires = dt;
+		returnHeaders.Expires = prepare_date(dt);
 		returnHeaders['Last-Modified'] = 'Mon, 01 Jan 2001 08:00:00 GMT';
 	}
 
@@ -15109,6 +15109,10 @@ function isGZIP(req) {
 	return ua.lastIndexOf('Firefox') !== -1;
 }
 
+function prepare_date(dt) {
+	return dt.toUTCString();
+}
+
 function prepare_viewname(value) {
 	// Cleans theme name
 	return value.substring(value.indexOf('/', 2) + 1);
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
         "name": "Сковорода Никита Андреевич",
         "email": "chalkerx@gmail.com"
     }],
-    "version": "1.9.7-26",
+    "version": "1.9.7-27",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
