From: gggeek <giunta.gaetano@gmail.com>
Date: Fri, 20 Mar 2015 11:34:13 +0000 (+0000)
Subject: One more travis fix
X-Git-Tag: 4.0.0-alpha^2~153
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2aa7311f9f86db1115264936be4587fd6c86a813;p=plcapi.git

One more travis fix
---

diff --git a/src/Server.php b/src/Server.php
index 1669e17d..e1035d3d 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -180,7 +180,6 @@ class Server
     public function service($data = null, $return_payload = false)
     {
         if ($data === null) {
-            // workaround for a known bug in php ver. 5.2.2 that broke $HTTP_RAW_POST_DATA
             $data = file_get_contents('php://input');
         }
         $raw_data = $data;
diff --git a/tests/ci/travis/setup_apache.sh b/tests/ci/travis/setup_apache.sh
index 0f2d4e9e..f3caeb70 100755
--- a/tests/ci/travis/setup_apache.sh
+++ b/tests/ci/travis/setup_apache.sh
@@ -8,6 +8,7 @@ sudo a2enmod rewrite actions fastcgi alias
 # enable php-fpm
 sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
 echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
 
 # configure apache virtual hosts