Changeset 2623 for trunk/wp-blog-header.php

Timestamp:

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

Author:

matt

Message:

Better headers for CGI enviroments

File:

• trunk/wp-blog-header.php (modified) (4 diffs)

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 );
 }