Merge branch 'master' into master

sqmk · Dec 1, 2017 · ca0975c · ca0975c
2 parents 38a9e84 + e97bbf7
commit ca0975c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 Software License Agreement (The BSD 3-Clause License)
 
-Copyright (c) 2012, Michael K. Squires
+Copyright (c) 2017, Michael K. Squires
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/library/Phue/Transport/Http.php b/library/Phue/Transport/Http.php
@@ -227,7 +227,7 @@ protected function getJsonResponse($address, $method = self::METHOD_GET, \stdCla
         $contentType = $this->getAdapter()->getContentType();
 
         // Throw connection exception if status code isn't 200 or wrong content type
-        if ($status != 200 || $contentType != 'application/json') {
+        if ($status != 200 || explode(';', $contentType)[0] != 'application/json') {
             throw new ConnectionException('Connection failure');
         }