From 73dddac4e0aa49e70a7db8d15e0ddda8032d2c18 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 25 Dec 2014 20:39:31 +0100 Subject: [PATCH 1/2] [HttpFoundation] removed wrong HTTP header --- src/Symfony/Component/HttpFoundation/BinaryFileResponse.php | 1 - .../Component/HttpFoundation/Tests/BinaryFileResponseTest.php | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php index 089cdc4c14..164414a323 100644 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -170,7 +170,6 @@ class BinaryFileResponse extends Response { $this->headers->set('Content-Length', $this->file->getSize()); $this->headers->set('Accept-Ranges', 'bytes'); - $this->headers->set('Content-Transfer-Encoding', 'binary'); if (!$this->headers->has('Content-Type')) { $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream'); diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php index cef037fd9b..1afd98759a 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php @@ -77,7 +77,6 @@ class BinaryFileResponseTest extends ResponseTestCase $response->sendContent(); $this->assertEquals(206, $response->getStatusCode()); - $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding')); $this->assertEquals($responseRange, $response->headers->get('Content-Range')); } @@ -113,7 +112,6 @@ class BinaryFileResponseTest extends ResponseTestCase $response->sendContent(); $this->assertEquals(200, $response->getStatusCode()); - $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding')); } public function provideFullFileRanges() @@ -144,7 +142,6 @@ class BinaryFileResponseTest extends ResponseTestCase $response->sendContent(); $this->assertEquals(416, $response->getStatusCode()); - $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding')); #$this->assertEquals('', $response->headers->get('Content-Range')); } From b1d47e94df04afe13b63d5d82e8104c33833edf9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 26 Dec 2014 10:21:27 +0100 Subject: [PATCH 2/2] [travis] reorder matrix + prevent "Killed" jobs --- .travis.yml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a1f81496a..df3568fd02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,20 @@ language: php -php: - - 5.3.3 - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - hhvm-nightly - matrix: - allow_failures: - - php: hhvm-nightly include: - - php: 5.5 - env: components=high - php: 5.3.3 env: components=low + - php: 5.6 + env: components=high + - php: 5.3.3 + - php: 5.3 + - php: 5.4 + - php: 5.5 + - php: 5.6 + - php: hhvm-nightly + allow_failures: + - php: hhvm-nightly + fast_finish: true services: mongodb @@ -26,12 +25,12 @@ env: before_install: - travis_retry sudo apt-get install parallel - composer self-update - - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi; - - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi; + - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then phpenv config-rm xdebug.ini; fi; - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi; - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi; - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then pecl install -f memcached-2.1.0; fi; - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi; + - if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then php -i; fi; - sudo locale-gen fr_FR.UTF-8 && sudo update-locale # - if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi; @@ -42,4 +41,4 @@ script: - if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark,intl-data {};'; fi; - if [ "$components" = "no" ]; then echo "Running tests requiring tty"; phpunit --group tty; fi; - if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark,intl-data;'; fi; - - if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data;'; fi; + - if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j50% 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data;'; fi;