diff --git a/e107.htaccess b/e107.htaccess index 01603bd34..74b4901be 100644 --- a/e107.htaccess +++ b/e107.htaccess @@ -41,7 +41,7 @@ SetEnv HTTP_MOD_REWRITE On - SetEnv HTTP_MOD_REWRITE_MEDIA Off + SetEnv HTTP_MOD_REWRITE_MEDIA On ### enable rewrites @@ -78,5 +78,27 @@ +### Mod_Expires Settings (when available) +### May be modified if required + + ExpiresActive On + ExpiresDefault "access plus 2 hours" + ExpiresByType image/x-icon "access plus 1 year” + ExpiresByType image/gif "access plus 1 week" + ExpiresByType image/png "access plus 1 week" + ExpiresByType image/jpg "access plus 1 week" + ExpiresByType image/jpeg "access plus 1 week" + ExpiresByType text/css "access plus 1 month" + ExpiresByType application/javascript "access plus 1 month" + ExpiresByType text/javascript "access plus 1 month" + ExpiresByType text/x-javascript "access plus 1 month" + + +### Gzip Compression Module + + AddOutputFilterByType DEFLATE text/text text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript application/xml text/xml application/rss+xml + + + ### Enable when developing locally. ### SetEnv E_DEV true diff --git a/e107_handlers/js_manager.php b/e107_handlers/js_manager.php index 29a0a333a..655afe211 100644 --- a/e107_handlers/js_manager.php +++ b/e107_handlers/js_manager.php @@ -1354,7 +1354,7 @@ class e_jsmanager return false; } - if(e_REQUEST_HTTP == e_ADMIN_ABS."menus.php") // disabled in menu-manager. + if(e_REQUEST_HTTP == e_ADMIN_ABS."menus.php") // disabled in menu-manager. { return false; } diff --git a/e107_handlers/phpthumb/GdThumb.inc.php b/e107_handlers/phpthumb/GdThumb.inc.php index 4e0137174..abf89fa0f 100644 --- a/e107_handlers/phpthumb/GdThumb.inc.php +++ b/e107_handlers/phpthumb/GdThumb.inc.php @@ -986,7 +986,7 @@ class GdThumb extends ThumbBase { header('Content-type: image/png'); } - imagepng($this->oldImage); + imagepng($this->oldImage, null, 9); // modified by e107 break; } @@ -1073,7 +1073,7 @@ class GdThumb extends ThumbBase imagejpeg($this->oldImage, $fileName, $this->options['jpegQuality']); break; case 'PNG': - imagepng($this->oldImage, $fileName); + imagepng($this->oldImage, $fileName, 9); // modified by e107 break; }