github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #207 from loran750/patch-1 

If pattern is set up, you cannot catch server problems
pull/247/merge
Pep 2016-01-30 21:13:47 +01:00
parent c0b4264959 a02ea03399
commit b1647d2c3f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/psm/Util/Server/Updater/StatusUpdater.php
View File

@ -191,7 +191,7 @@ class StatusUpdater {
if(empty($code_matches[0])) {
// somehow we dont have a proper response.
$this->error = 'no response from server';
$this->error = 'TIMEOUT ERROR: no response from server';
$result = false;
} else {
$code = $code_matches[1][0];
@ -199,17 +199,19 @@ class StatusUpdater {
// All status codes starting with a 4 or higher mean trouble!
if(substr($code, 0, 1) >= '4') {
$this->error = $code . ' ' . $msg;
$this->error = "HTTP STATUS ERROR: ".$code . ' ' . $msg;
$result = false;
} else {
$result = true;
}
}
if($this->server['pattern'] != '') {
// Check to see if the pattern was found.
if(!preg_match("/{$this->server['pattern']}/i", $curl_result)) {
$this->error = 'Pattern not found.';
$result = false;
//Okay, the HTTP status is good : 2xx or 3xx. Now we have to test the pattern if it's set up
if($this->server['pattern'] != '') {
// Check to see if the pattern was found.
if(!preg_match("/{$this->server['pattern']}/i", $curl_result)) {
$this->error = 'TEXT ERROR : Pattern not found.';
$result = false;
}
}
}
}