From: Reini U. <ru...@us...> - 2006-04-16 11:42:19
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16692 Modified Files: Request.php Log Message: php url-rewriting miscalculates the ob length. fixes bug #1376007 do not flush a not existing buffer to avoid Pragma: no-cache on @ error. fixes bug #1438448 Index: Request.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v retrieving revision 1.103 retrieving revision 1.104 diff -u -2 -b -p -d -r1.103 -r1.104 --- Request.php 15 Apr 2006 12:23:32 -0000 1.103 +++ Request.php 16 Apr 2006 11:42:16 -0000 1.104 @@ -453,4 +453,6 @@ class Request { // the uncompressed length, not the gzip'ed as required. if (!headers_sent() and !$this->_is_compressing_output) { + // php url-rewriting miscalculates the ob length. fixes bug #1376007 + if (ini_get('use_trans_sid') == 'off') { if (empty($this->_do_chunked_output)) { $this->_ob_get_length = ob_get_length(); @@ -458,8 +460,10 @@ class Request { header(sprintf("Content-Length: %d", $this->_ob_get_length)); } + } $this->_is_buffering_output = false; + while (@ob_end_flush()); + } elseif (function_exists('ob_get_level') and @ob_get_level()) { + while (@ob_end_flush()); } - - while (@ob_end_flush()); // hmm. there's some error in redirect session_write_close(); if (!empty($this->_dbi)) { @@ -1347,4 +1351,10 @@ class HTTP_ValidatorSet { // $Log$ +// Revision 1.104 2006/04/16 11:42:16 rurban +// php url-rewriting miscalculates the ob length. fixes bug #1376007 +// +// do not flush a not existing buffer to avoid Pragma: no-cache on @ error. +// fixes bug #1438448 +// // Revision 1.103 2006/04/15 12:23:32 rurban // silence $this->_is_buffering_output warning |