summaryrefslogtreecommitdiff
path: root/ext/phar/phar_object.c
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2009-07-29 10:14:04 +0000
committerGreg Beaver <cellog@php.net>2009-07-29 10:14:04 +0000
commite29bccaae2c9bb00fd426d46f504f3c32e9446b8 (patch)
tree6b356745123d3bed5da2852bb5c8dd5d2bc0bf08 /ext/phar/phar_object.c
parent5c4609021fb5555db40dab89543f2717ad4391d7 (diff)
downloadphp-git-e29bccaae2c9bb00fd426d46f504f3c32e9446b8.tar.gz
make phar tests pass in php 5.2, prepare for release of pecl/phar 2.0.0, merge Gwynne's TSRM fix to phar_object.c to other branches
Diffstat (limited to 'ext/phar/phar_object.c')
-rwxr-xr-xext/phar/phar_object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index b4c6e9f045..5159b33037 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -941,7 +941,7 @@ PHP_METHOD(Phar, webPhar)
++ext;
#if PHP_MAJOR_VERSION >= 6
- if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) {
+ if (phar_find_key(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val TSRMLS_CC)) {
#else
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(mimeoverride), ext, strlen(ext)+1, (void **) &val)) {
#endif