Allways send text/html content type.

This commit is contained in:
Michal Čihař
2005-11-15 11:02:08 +00:00
parent 471f11fe0d
commit 0ccc8c8611
2 changed files with 9 additions and 14 deletions

View File

@@ -8,6 +8,7 @@ $Source$
2005-11-15 Michal Čihař <michal@cihar.com> 2005-11-15 Michal Čihař <michal@cihar.com>
* css/phpmyadmin.css.php: Do not use common header file, as there is * css/phpmyadmin.css.php: Do not use common header file, as there is
nothing common at all. nothing common at all.
* libraries/header_http.inc.php: Allways send text/html content type.
2005-11-14 Michal Čihař <michal@cihar.com> 2005-11-14 Michal Čihař <michal@cihar.com>
* libraries/sql_query_form.lib.php: Fix %f expansion (bug #1355776). * libraries/sql_query_form.lib.php: Fix %f expansion (bug #1355776).

View File

@@ -5,19 +5,13 @@
/** /**
* Sends http headers * Sends http headers
*/ */
// Don't use cache (required for Opera) $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
$ctype = (isset($ctype) ? $ctype : 'html'); header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
if ($ctype == 'css') { header('Last-Modified: ' . $GLOBALS['now']);
header('Content-Type: text/css; charset=ISO-8859-1'); header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
} else { header('Pragma: no-cache'); // HTTP/1.0
$GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; if (!isset($is_transformation_wrapper)) {
header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
header('Last-Modified: ' . $GLOBALS['now']);
header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
header('Pragma: no-cache'); // HTTP/1.0
if (!isset($is_transformation_wrapper)) {
// Define the charset to be used // Define the charset to be used
header('Content-Type: text/' . $ctype . '; charset=' . $GLOBALS['charset']); header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
}
} }
?> ?>