File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ task :test do
3333end
3434
3535task :integration do
36- if ENV [ "TRAVIS_PHP_VERSION" ] > 5.3 then
36+ if ENV [ "TRAVIS_PHP_VERSION" ] . to_f > 5.3 then
3737 sh "phpenv config-add tests/integration/protocolbuffers.ini"
3838 sh "sudo make install"
3939 sh "sudo cp tests/integration/php-fpm.conf ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf"
Original file line number Diff line number Diff line change @@ -294,7 +294,11 @@ static void php_protocolbuffers_cleanup_global_handles(TSRMLS_D)
294294
295295static PHP_GSHUTDOWN_FUNCTION (protocolbuffers )
296296{
297+ #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 2 ) || (PHP_MAJOR_VERSION < 5 )
298+ #ifndef ZTS
297299 php_protocolbuffers_cleanup_global_handles (TSRMLS_C );
300+ #endif
301+ #endif
298302}
299303
300304static void php_protocolbuffers_init_globals () {
You can’t perform that action at this time.
0 commit comments