mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-08 06:06:40 +02:00
Code Issues Releases Wiki Activity

Merge pull request #151 from ryanathasoffers/prevent_erroneosly_sent_FirePHP_and_ChromePHP_header_logs

Browse Source 
Fix issue where ChromePHP and FirePHP handlers sent logs to ineligible browsers when >1 handler is instantiated
This commit is contained in:
Jordi Boggiano
2013-01-22 01:54:40 -08:00
parent 47eb599b4a e0d18f454b
commit d8d5f96760
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Monolog/Handler/ChromePHPHandler.php
View File

@@ -38,7 +38,7 @@ class ChromePHPHandler extends AbstractProcessingHandler
'rows' => array(), 'rows' => array(),
); );
protected $sendHeaders = true; protected static $sendHeaders = true;
/** /**
* {@inheritdoc} * {@inheritdoc}
@@ -91,7 +91,7 @@ class ChromePHPHandler extends AbstractProcessingHandler
protected function send() protected function send()
{ {
if (!self::$initialized) { if (!self::$initialized) {
$this->sendHeaders = $this->headersAccepted(); self::$sendHeaders = $this->headersAccepted();
self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
self::$initialized = true; self::$initialized = true;
@@ -108,7 +108,7 @@ class ChromePHPHandler extends AbstractProcessingHandler
*/ */
protected function sendHeader($header, $content) protected function sendHeader($header, $content)
{ {
if (!headers_sent() && $this->sendHeaders) { if (!headers_sent() && self::$sendHeaders) {
header(sprintf('%s: %s', $header, $content)); header(sprintf('%s: %s', $header, $content));
} }
} }

6
src/Monolog/Handler/FirePHPHandler.php
View File

@@ -51,7 +51,7 @@ class FirePHPHandler extends AbstractProcessingHandler
*/ */
protected static $messageIndex = 1; protected static $messageIndex = 1;
protected $sendHeaders = true; protected static $sendHeaders = true;
/** /**
* Base header creation function used by init headers & record headers * Base header creation function used by init headers & record headers
@@ -117,7 +117,7 @@ class FirePHPHandler extends AbstractProcessingHandler
*/ */
protected function sendHeader($header, $content) protected function sendHeader($header, $content)
{ {
if (!headers_sent() && $this->sendHeaders) { if (!headers_sent() && self::$sendHeaders) {
header(sprintf('%s: %s', $header, $content)); header(sprintf('%s: %s', $header, $content));
} }
} }
@@ -133,7 +133,7 @@ class FirePHPHandler extends AbstractProcessingHandler
{ {
// WildFire-specific headers must be sent prior to any messages // WildFire-specific headers must be sent prior to any messages
if (!self::$initialized) { if (!self::$initialized) {
$this->sendHeaders = $this->headersAccepted(); self::$sendHeaders = $this->headersAccepted();
foreach ($this->getInitHeaders() as $header => $content) { foreach ($this->getInitHeaders() as $header => $content) {
$this->sendHeader($header, $content); $this->sendHeader($header, $content);