diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
| commit | e63a8540a60e95aa5bd8e269add1b02afcc1b79b (patch) | |
| tree | b83a144eec24cc81adab0b9a778f7a730d8df79e /ext/zlib | |
| parent | 7a4cc73641bb3eb878f7184bcbd026ee663cf2a9 (diff) | |
| parent | 53071e647049f099f7f7a0771ddb63fc2cdd621c (diff) | |
| download | php-git-e63a8540a60e95aa5bd8e269add1b02afcc1b79b.tar.gz | |
Merge branch 'openssl_error_store' into openssl_aead
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/tests/gzfilegzreadfile.phpt | 2 | ||||
| -rw-r--r-- | ext/zlib/tests/gzreadgzwrite.phpt | 2 | ||||
| -rw-r--r-- | ext/zlib/tests/gzreadgzwriteplain.phpt | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ext/zlib/tests/gzfilegzreadfile.phpt b/ext/zlib/tests/gzfilegzreadfile.phpt index 2d6843ddd4..ef6378de25 100644 --- a/ext/zlib/tests/gzfilegzreadfile.phpt +++ b/ext/zlib/tests/gzfilegzreadfile.phpt @@ -25,7 +25,7 @@ blah blah blah blah blah blah blah EOD; -$filename = tempnam("/tmp", "phpt"); +$filename = tempnam(sys_get_temp_dir(), "phpt"); $fp = gzopen($filename, "wb"); gzwrite($fp, $original); diff --git a/ext/zlib/tests/gzreadgzwrite.phpt b/ext/zlib/tests/gzreadgzwrite.phpt index 71d728b6ed..d52f12a4ac 100644 --- a/ext/zlib/tests/gzreadgzwrite.phpt +++ b/ext/zlib/tests/gzreadgzwrite.phpt @@ -6,7 +6,7 @@ if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php $original = str_repeat(b"hallo php",4096); -$filename = tempnam("/tmp", "phpt"); +$filename = tempnam(sys_get_temp_dir(), "phpt"); $fp = gzopen($filename, "wb"); gzwrite($fp, $original); diff --git a/ext/zlib/tests/gzreadgzwriteplain.phpt b/ext/zlib/tests/gzreadgzwriteplain.phpt index 6a752b6212..7a5a5025aa 100644 --- a/ext/zlib/tests/gzreadgzwriteplain.phpt +++ b/ext/zlib/tests/gzreadgzwriteplain.phpt @@ -6,7 +6,7 @@ if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php $original = str_repeat(b"hallo php",4096); -$filename = tempnam("/tmp", "phpt"); +$filename = tempnam(sys_get_temp_dir(), "phpt"); $fp = fopen($filename, "wb"); fwrite($fp, $original); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index bfca0f42f7..d9d6be1638 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1187,7 +1187,7 @@ PHP_FUNCTION(deflate_add) #ifdef COMPILE_DL_ZLIB #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif ZEND_GET_MODULE(php_zlib) #endif |