Commit 57d30de648a35454744f727cc6be126ef43d45ad
1 parent
86851a62
Exists in
master
and in
7 other branches
Otimização nos cabeçalhos que afetam o cache de dados no navegador (header) nos …
…casos de transferência dos tiles
Showing
3 changed files
with
28 additions
and
10 deletions
Show diff stats
admin/admin.db
No preview for this file type
classesphp/mapa_googlemaps.php
@@ -300,6 +300,8 @@ else{ | @@ -300,6 +300,8 @@ else{ | ||
300 | $nomer = salvaCacheImagem(); | 300 | $nomer = salvaCacheImagem(); |
301 | if($_SESSION["i3georendermode"] == 2){ | 301 | if($_SESSION["i3georendermode"] == 2){ |
302 | ob_clean(); | 302 | ob_clean(); |
303 | + header('Cache-Control: public, max-age=22222222'); | ||
304 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
303 | header("X-Sendfile: $nomer"); | 305 | header("X-Sendfile: $nomer"); |
304 | header("Content-type: image/png"); | 306 | header("Content-type: image/png"); |
305 | } | 307 | } |
@@ -307,9 +309,11 @@ else{ | @@ -307,9 +309,11 @@ else{ | ||
307 | ob_clean(); | 309 | ob_clean(); |
308 | header('Content-Length: '.filesize($nomer)); | 310 | header('Content-Length: '.filesize($nomer)); |
309 | header('Content-Type: image/png'); | 311 | header('Content-Type: image/png'); |
310 | - header('Cache-Control: max-age=3600, must-revalidate'); | ||
311 | - header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT'); | ||
312 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nomer)).' GMT', true, 200); | 312 | + //header('Cache-Control: max-age=3600, must-revalidate'); |
313 | + //header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT'); | ||
314 | + //header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nomer)).' GMT', true, 200); | ||
315 | + header('Cache-Control: public, max-age=22222222'); | ||
316 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
313 | fpassthru(fopen($nomer, 'rb')); | 317 | fpassthru(fopen($nomer, 'rb')); |
314 | } | 318 | } |
315 | } | 319 | } |
@@ -335,6 +339,8 @@ else{ | @@ -335,6 +339,8 @@ else{ | ||
335 | $nomer = ($img->imagepath)."temp".nomeRand().".png"; | 339 | $nomer = ($img->imagepath)."temp".nomeRand().".png"; |
336 | $img->saveImage($nomer); | 340 | $img->saveImage($nomer); |
337 | ob_clean(); | 341 | ob_clean(); |
342 | + header('Cache-Control: public, max-age=22222222'); | ||
343 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
338 | header("X-Sendfile: $nomer"); | 344 | header("X-Sendfile: $nomer"); |
339 | header("Content-type: image/png"); | 345 | header("Content-type: image/png"); |
340 | } | 346 | } |
@@ -373,9 +379,13 @@ function carregaCacheImagem(){ | @@ -373,9 +379,13 @@ function carregaCacheImagem(){ | ||
373 | if($i3georendermode = 0 || $i3georendermode = 1 || empty($i3georendermode)){ | 379 | if($i3georendermode = 0 || $i3georendermode = 1 || empty($i3georendermode)){ |
374 | header('Content-Length: '.filesize($nome)); | 380 | header('Content-Length: '.filesize($nome)); |
375 | header('Content-Type: image/png'); | 381 | header('Content-Type: image/png'); |
382 | + header('Cache-Control: public, max-age=22222222'); | ||
383 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
376 | fpassthru(fopen($nome, 'rb')); | 384 | fpassthru(fopen($nome, 'rb')); |
377 | } | 385 | } |
378 | else{ | 386 | else{ |
387 | + header('Cache-Control: public, max-age=22222222'); | ||
388 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
379 | header("X-Sendfile: $nome"); | 389 | header("X-Sendfile: $nome"); |
380 | header("Content-type: image/png"); | 390 | header("Content-type: image/png"); |
381 | } | 391 | } |
classesphp/mapa_openlayers.php
@@ -287,7 +287,9 @@ else{ | @@ -287,7 +287,9 @@ else{ | ||
287 | //cache ativo. Salva a imagem em cache | 287 | //cache ativo. Salva a imagem em cache |
288 | $nomer = salvaCacheImagem($cachedir,$map_fileX,$_GET["tms"]); | 288 | $nomer = salvaCacheImagem($cachedir,$map_fileX,$_GET["tms"]); |
289 | if($_SESSION["i3georendermode"] == 2){ | 289 | if($_SESSION["i3georendermode"] == 2){ |
290 | - ob_clean(); | 290 | + ob_clean(); |
291 | + header('Cache-Control: public, max-age=22222222'); | ||
292 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
291 | header("X-Sendfile: $nomer"); | 293 | header("X-Sendfile: $nomer"); |
292 | header("Content-type: image/png"); | 294 | header("Content-type: image/png"); |
293 | } | 295 | } |
@@ -295,9 +297,10 @@ else{ | @@ -295,9 +297,10 @@ else{ | ||
295 | ob_clean(); | 297 | ob_clean(); |
296 | header('Content-Length: '.filesize($nomer)); | 298 | header('Content-Length: '.filesize($nomer)); |
297 | header('Content-Type: image/png'); | 299 | header('Content-Type: image/png'); |
298 | - header('Cache-Control: max-age=3600, must-revalidate'); | ||
299 | - header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT'); | ||
300 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nomer)).' GMT', true, 200); | 300 | + //header('Cache-Control: max-age=3600, must-revalidate'); |
301 | + //header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT'); | ||
302 | + header('Cache-Control: public, max-age=22222222'); | ||
303 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
301 | fpassthru(fopen($nomer, 'rb')); | 304 | fpassthru(fopen($nomer, 'rb')); |
302 | } | 305 | } |
303 | } | 306 | } |
@@ -326,6 +329,8 @@ else{ | @@ -326,6 +329,8 @@ else{ | ||
326 | $nomer = ($img->imagepath)."temp".nomeRand().".png"; | 329 | $nomer = ($img->imagepath)."temp".nomeRand().".png"; |
327 | $img->saveImage($nomer); | 330 | $img->saveImage($nomer); |
328 | ob_clean(); | 331 | ob_clean(); |
332 | + header('Cache-Control: public, max-age=22222222'); | ||
333 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
329 | header("X-Sendfile: $nomer"); | 334 | header("X-Sendfile: $nomer"); |
330 | header("Content-type: image/png"); | 335 | header("Content-type: image/png"); |
331 | } | 336 | } |
@@ -358,12 +363,15 @@ function carregaCacheImagem($cachedir,$map,$tms,$i3georendermode=0){ | @@ -358,12 +363,15 @@ function carregaCacheImagem($cachedir,$map,$tms,$i3georendermode=0){ | ||
358 | if($i3georendermode = 0 || $i3georendermode = 1 || empty($i3georendermode)){ | 363 | if($i3georendermode = 0 || $i3georendermode = 1 || empty($i3georendermode)){ |
359 | header('Content-Length: '.filesize($nome)); | 364 | header('Content-Length: '.filesize($nome)); |
360 | header('Content-Type: image/png'); | 365 | header('Content-Type: image/png'); |
361 | - header('Cache-Control: max-age=3600, must-revalidate'); | ||
362 | - header('Expires: ' . gmdate('D, d M Y H:i:s', time()+24*60*60) . ' GMT'); | ||
363 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nome)).' GMT', true, 200); | 366 | + //header('Cache-Control: max-age=3600, must-revalidate'); |
367 | + header('Cache-Control: public, max-age=22222222'); | ||
368 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
369 | + //header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($nome)).' GMT', true, 200); | ||
364 | fpassthru(fopen($nome, 'rb')); | 370 | fpassthru(fopen($nome, 'rb')); |
365 | } | 371 | } |
366 | else{ | 372 | else{ |
373 | + header('Cache-Control: public, max-age=22222222'); | ||
374 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+48*60*60) . ' GMT'); | ||
367 | header("X-Sendfile: $nome"); | 375 | header("X-Sendfile: $nome"); |
368 | header("Content-type: image/png"); | 376 | header("Content-type: image/png"); |
369 | } | 377 | } |