if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then
sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
fi
+
+# NB: the following does not seem to work with php 5.3...
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
echo "include_path = '.:$(pwd)/lib'" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+
~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
function testHttps()
{
- global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER;
+ global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER, $HTTPSVERIFYHOST;
if(!function_exists('curl_init'))
{
$this->fail('CURL missing: cannot test https functionality');
$this->method = 'https';
$this->client->method = 'https';
$this->client->path = $HTTPSURI;
- $this->client->setSSLVerifyPeer( !$HTTPSIGNOREPEER );
- // silence warning with newish php versions
- $this->client->setSSLVerifyHost(2);
+ $this->client->setSSLVerifyPeer(!$HTTPSIGNOREPEER);
+ $this->client->setSSLVerifyHost($HTTPSVERIFYHOST);
$this->_runtests();
}
function testHttpsProxy()
{
- global $HTTPSSERVER, $HTTPSURI, $PROXYSERVER, $PROXYPORT, $NOPROXY;
+ global $HTTPSSERVER, $HTTPSURI, $HTTPSIGNOREPEER, $HTTPSVERIFYHOST, $PROXYSERVER, $PROXYPORT, $NOPROXY;
if(!function_exists('curl_init'))
{
$this->fail('CURL missing: cannot test https functionality');
$this->client->method = 'https';
$this->client->setProxy($PROXYSERVER, $PROXYPORT);
$this->client->path = $HTTPSURI;
+ $this->client->setSSLVerifyPeer(!$HTTPSIGNOREPEER);
+ $this->client->setSSLVerifyHost($HTTPSVERIFYHOST);
$this->_runtests();
}
$m=new xmlrpcmsg('dummy');
$r=$m->parseResponse($response);
$v=$r->faultString();
- $this->assertEquals('���àüè', $v);
+ $this->assertEquals('������', $v);
}
function testValidNumbers()