[wp-cvs] wordpress/wp-includes functions.php,1.119,1.120

[Michel Valdrighi]

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

Modified Files:
	functions.php 
Log Message:
prevent double ob_gzhandler error

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** functions.php	11 Jun 2004 19:03:59 -0000	1.119
--- functions.php	14 Jun 2004 22:42:43 -0000	1.120
***************
*** 432,437 ****
  	if ( !get_settings('gzipcompression') ) return false;
  
! 	if( extension_loaded('zlib') )
! 		ob_start('ob_gzhandler'); 
  }
  
--- 432,441 ----
  	if ( !get_settings('gzipcompression') ) return false;
  
! 	if( extension_loaded('zlib') ) {
! 		$ob_status = ob_get_status();
! 		if (empty($ob_status) || $ob_status['name'] != 'ob_gzhandler') {
! 			ob_start('ob_gzhandler');
! 		}
! 	}
  }
  
***************
*** 525,529 ****
  	$http_request  = 'POST ' . $trackback_url['path'] . $trackback_url['query'] . " HTTP/1.0\r\n";
  	$http_request .= 'Host: '.$trackback_url['host']."\r\n";
! 	$http_request .= 'Content-Type: application/x-www-form-urlencoded'."\r\n";
  	$http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
  	$http_request .= "\r\n";
--- 529,533 ----
  	$http_request  = 'POST ' . $trackback_url['path'] . $trackback_url['query'] . " HTTP/1.0\r\n";
  	$http_request .= 'Host: '.$trackback_url['host']."\r\n";
! 	$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='."\r\n";
  	$http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
  	$http_request .= "\r\n";