Merge branch 'dev'
This commit is contained in:
@@ -131,6 +131,7 @@ wtv-open-isp-disabled: false
|
|||||||
wtv-offline-mail-enable: false
|
wtv-offline-mail-enable: false
|
||||||
wtv-demo-mode: 0
|
wtv-demo-mode: 0
|
||||||
wtv-wink-deferrer-retries: 3
|
wtv-wink-deferrer-retries: 3
|
||||||
|
wtv-name-server: 8.8.8.8
|
||||||
wtv-visit: ${home_url}
|
wtv-visit: ${home_url}
|
||||||
Content-Type: text/html`;
|
Content-Type: text/html`;
|
||||||
}
|
}
|
||||||
@@ -575,10 +575,14 @@ async function sendToClient(socket, headers_obj, data) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add last modified if not a dynamic script
|
// Add last modified if not a dynamic script
|
||||||
|
if (socket_sessions[socket.id]) {
|
||||||
|
if (socket_sessions[socket.id].request_headers) {
|
||||||
if (wtvshared.getFileExt(socket_sessions[socket.id].request_headers.service_file_path).toLowerCase() !== "js") {
|
if (wtvshared.getFileExt(socket_sessions[socket.id].request_headers.service_file_path).toLowerCase() !== "js") {
|
||||||
var last_modified = wtvshared.getFileLastModifiedUTCString(socket_sessions[socket.id].request_headers.service_file_path);
|
var last_modified = wtvshared.getFileLastModifiedUTCString(socket_sessions[socket.id].request_headers.service_file_path);
|
||||||
if (last_modified) headers_obj["Last-Modified"] = last_modified;
|
if (last_modified) headers_obj["Last-Modified"] = last_modified;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// if box can do compression, see if its worth enabling
|
// if box can do compression, see if its worth enabling
|
||||||
// small files actually get larger, so don't compress them
|
// small files actually get larger, so don't compress them
|
||||||
@@ -586,7 +590,7 @@ async function sendToClient(socket, headers_obj, data) {
|
|||||||
if (content_length >= 256) compression_type = wtvmime.shouldWeCompress(ssid_sessions[socket.ssid], headers_obj);
|
if (content_length >= 256) compression_type = wtvmime.shouldWeCompress(ssid_sessions[socket.ssid], headers_obj);
|
||||||
|
|
||||||
// disk service hack before further processing :)
|
// disk service hack before further processing :)
|
||||||
if (socket_sessions[socket.id].wtv_request_type == "download" && content_length < 0) {
|
if (socket_sessions[socket.id].wtv_request_type == "download" && content_length > 0) {
|
||||||
if (headers_obj['Content-Type'] == "application/gzip") {
|
if (headers_obj['Content-Type'] == "application/gzip") {
|
||||||
var gunzipped = zlib.gunzipSync(data);
|
var gunzipped = zlib.gunzipSync(data);
|
||||||
headers_obj['wtv-checksum'] = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
|
headers_obj['wtv-checksum'] = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
|
||||||
|
|||||||
Reference in New Issue
Block a user