From b24b6acde8360a1a0f8ac23b64c19a8dc61cc3ba Mon Sep 17 00:00:00 2001 From: gggeek Date: Sun, 12 Jul 2015 01:25:54 +0100 Subject: [PATCH] Try to make hhvm test runs faster --- .travis.yml | 4 ++-- src/Helper/XMLParser.php | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6033065..7bf9067 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,8 +42,8 @@ after_failure: # Save as much info as we can to help developers - cat apache_error.log - cat apache_access.log - - cat /var/log/hhvm/error.log - - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then php -i; fi + #- cat /var/log/hhvm/error.log + #- if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then php -i; fi after_script: # Upload code-coverage to Scrutinizer diff --git a/src/Helper/XMLParser.php b/src/Helper/XMLParser.php index d8790c5..b62bf48 100644 --- a/src/Helper/XMLParser.php +++ b/src/Helper/XMLParser.php @@ -446,6 +446,11 @@ class XMLParser * NB: according to the spec (RFC 3023), if text/xml content-type is received over HTTP without a content-type, * we SHOULD assume it is strictly US-ASCII. But we try to be more tolerant of non conforming (legacy?) clients/servers, * which will be most probably using UTF-8 anyway... + * In order of importance checks: + * 1. http headers + * 2. BOM + * 3. XML declaration + * 4. guesses using mb_detect_encoding() * * @param string $httpHeader the http Content-type header * @param string $xmlChunk xml content buffer -- 2.43.0