Changeset 2623

Timestamp:

06/09/2005 12:17:43 AM (20 years ago)

Author:

matt

Message:

Better headers for CGI enviroments

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-blog-header.php (modified) (4 diffs)
• wp-comments-post.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/pluggable-functions.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)

trunk/wp-admin/admin.php

@@ -8 +8 @@
 auth_redirect();
 
-header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-header('Cache-Control: no-cache, must-revalidate, max-age=0');
-header('Pragma: no-cache');
+nocache_headers();
 
 update_category_cache();

trunk/wp-blog-header.php

@@ -108 +108 @@
 
 // Sending HTTP headers
+@header('X-Pingback: '. get_bloginfo('pingback_url'));
 
 if ( !empty($error) && '404' == $error ) {
-    if ( preg_match('/cgi/', php_sapi_name()) )
-        @header('Status: 404 Not Found');
-    else
-        @header('HTTP/1.x 404 Not Found');
+    status_header( 404 );
  } else if ( empty($feed) ) {
-    @header('X-Pingback: '. get_bloginfo('pingback_url'));
     @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 } else {
@@ -126 +123 @@
     @header("Last-Modified: $wp_last_modified");
     @header("ETag: $wp_etag");
-    @header('X-Pingback: ' . get_bloginfo('pingback_url'));
 
     // Support for Conditional GET
@@ -142 +138 @@
         (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
         (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
-        if ( preg_match('/cgi/',php_sapi_name()) ) {
-            header('Status: 304 Not Modified');
-            echo "\r\n\r\n";
-            exit;
-        } else {
-            if ( version_compare(phpversion(), '4.3.0', '>=') )
-                header('Not Modified', TRUE, 304);
-            else
-                header('HTTP/1.x 304 Not Modified');
-            exit;
-        }
+        status_header( 304 );
+        exit;
     }
 }
@@ -192 +179 @@
         (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
     $wp_query->is_404 = true;
-    if ( preg_match('/cgi/', php_sapi_name()) )
-        @header('Status: 404 Not Found');
-    else
-        @header('HTTP/1.x 404 Not Found');
+    status_header( 404 );
+} else {
+    status_header( 200 );
 }
 

trunk/wp-comments-post.php

@@ -53 +53 @@
 setcookie('comment_author_url_' . COOKIEHASH, stripslashes($comment_author_url), time() + 30000000, COOKIEPATH);
 
-header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-header('Cache-Control: no-cache, must-revalidate, max-age=0');
-header('Pragma: no-cache');
+nocache_headers();
 
 $location = (empty($_POST['redirect_to'])) ? $_SERVER["HTTP_REFERER"] : $_POST['redirect_to']; 

trunk/wp-includes/functions.php

@@ -1850 +1850 @@
 }
 
+function status_header( $header ) {
+    if ( 200 == $header ) {
+        $text = 'OK';
+    } elseif ( 301 == $header ) {
+        $text = 'Moved Permanently';
+    } elseif ( 302 == $header ) {
+        $text = 'Moved Temporarily';
+    } elseif ( 304 == $header ) {
+        $text = 'Not Modified';
+    } elseif ( 404 == $header ) {
+        $text = 'Not Found';
+    } elseif ( 410 == $header ) {
+        $text = 'Gone';
+    }
+    if ( preg_match('/cgi/',php_sapi_name()) ) {
+        @header("Status: $header $text");
+        echo "\r\n\r\n";
+    } else {
+        if ( version_compare(phpversion(), '4.3.0', '>=') )
+            @header($text, TRUE, $header);
+        else
+            @header("HTTP/1.x $header $text");
+    }
+}
+
+function nocache_headers() {
+    @ header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
+    @ header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+    @ header('Cache-Control: no-cache, must-revalidate, max-age=0');
+    @ header('Pragma: no-cache');
+}
+
 ?>

trunk/wp-includes/pluggable-functions.php

@@ -107 +107 @@
                 !wp_login($_COOKIE['wordpressuser_' . COOKIEHASH], $_COOKIE['wordpresspass_' . COOKIEHASH], true)) ||
              (empty($_COOKIE['wordpressuser_' . COOKIEHASH])) ) {
-        header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-        header('Cache-Control: no-cache, must-revalidate, max-age=0');
-        header('Pragma: no-cache');
+        nocache_headers();
     
         header('Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));

trunk/wp-login.php

@@ -5 +5 @@
 $error = '';
 
-header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-header('Cache-Control: no-cache, must-revalidate');
-header('Pragma: no-cache');
+nocache_headers();
+
 header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
 
@@ -25 +23 @@
     wp_clearcookie();
     do_action('wp_logout');
-    header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('Cache-Control: no-cache, must-revalidate, max-age=0');
-    header('Pragma: no-cache');
+    nocache_headers();
     wp_redirect('wp-login.php');
     exit();