diff options
author | Jose Luis Duran <jlduran@users.noreply.github.com> | 2015-04-14 19:18:28 -0300 |
---|---|---|
committer | Jose Luis Duran <jlduran@users.noreply.github.com> | 2015-04-14 19:18:28 -0300 |
commit | 2c5fda82fbd37cd8da9cefd415c44176682dcf19 (patch) | |
tree | db695f9bc6753f8b0437c1e334c4845d02a5cae2 /usr/local/www/graph.php | |
parent | 34dced26198480d7b02e80578df40336fef89043 (diff) | |
download | pfsense-2c5fda82fbd37cd8da9cefd415c44176682dcf19.zip pfsense-2c5fda82fbd37cd8da9cefd415c44176682dcf19.tar.gz |
Combine Cache-Control header in one line
Sorted by RFC 2616:
Section 14.9.1 `no-cache`
Section 14.9.2 `no-store`
Section 14.9.4 `must-revalidate`
Combined into one line with IE's `pre-check` and `post-check`. However,
when both set to `0`, both are entirely ignored:
http://blogs.msdn.com/b/ieinternals/archive/2009/07/20/using-post_2d00_check-and-pre_2d00_check-cache-directives.aspx
Diffstat (limited to 'usr/local/www/graph.php')
-rwxr-xr-x | usr/local/www/graph.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/usr/local/www/graph.php b/usr/local/www/graph.php index 478bae4..6bd8a2b 100755 --- a/usr/local/www/graph.php +++ b/usr/local/www/graph.php @@ -2,22 +2,22 @@ /* graph.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2006 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net> and Jonathan Watt <jwatt@jwatt.org>. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -45,8 +45,7 @@ require("guiconfig.inc"); header("Last-Modified: " . gmdate( "D, j M Y H:i:s" ) . " GMT" ); header("Expires: " . gmdate( "D, j M Y H:i:s", time() ) . " GMT" ); -header("Cache-Control: no-store, no-cache, must-revalidate" ); // HTTP/1.1 -header("Cache-Control: post-check=0, pre-check=0", FALSE ); +header("Cache-Control: no-cache, no-store, must-revalidate, pre-check=0, post-check=0" ); // HTTP/1.1 header("Pragma: no-cache"); // HTTP/1.0 header("Content-type: image/svg+xml"); @@ -99,7 +98,7 @@ $fetch_link = "ifstats.php?if=" . htmlspecialchars($ifnum); if(file_exists("/usr/local/www/themes/{$g['theme']}/graph.php")) { $themetxt = file_get_contents("/usr/local/www/themes/{$g['theme']}/graph.php"); eval($themetxt); -} +} /********* Graph DATA **************/ print('<?xml version="1.0" encoding="UTF-8"?>' . "\n");?> @@ -315,7 +314,7 @@ function plot_data(obj) { rmax *= 1.25; else rmax *= 2; - + if (i == 8) rmax *= 1.024; } |