[wp-cvs] wordpress wp-blog-header.php,1.129,1.130

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18038

Modified Files:
	wp-blog-header.php 
Log Message:
Send headers in a CGI friendly way

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** wp-blog-header.php	14 Feb 2005 09:17:18 -0000	1.129
--- wp-blog-header.php	14 Feb 2005 21:05:15 -0000	1.130
***************
*** 110,114 ****
  
  if ( !empty($error) && '404' == $error ) {
! 	@header('HTTP/1.x 404 Not Found');
   } else if ( empty($feed) ) {
  	@header('X-Pingback: '. get_bloginfo('pingback_url'));
--- 110,117 ----
  
  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');
   } else if ( empty($feed) ) {
  	@header('X-Pingback: '. get_bloginfo('pingback_url'));
***************
*** 135,139 ****
  	    (($client_last_modified == $wp_last_modified) || ($client_etag == $wp_etag)) ) {
  		if ( preg_match('/cgi/',php_sapi_name()) ) {
! 		    header('HTTP/1.1 304 Not Modified');
  		    echo "\r\n\r\n";
  		    exit;
--- 138,142 ----
  	    (($client_last_modified == $wp_last_modified) || ($client_etag == $wp_etag)) ) {
  		if ( preg_match('/cgi/',php_sapi_name()) ) {
! 		    header('Status: 304 Not Modified');
  		    echo "\r\n\r\n";
  		    exit;
***************
*** 184,188 ****
  		 (false === strpos($_SERVER['REQUEST_URI'], '?')) ) {
  	$wp_query->is_404 = true;
! 	header('HTTP/1.x 404 Not Found');
  }
  
--- 187,194 ----
  		 (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');
  }