diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-12 22:28:31 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-12 22:28:31 +0400 |
| commit | f29b68306d457ebc157254a7af186e5a4fd6db80 (patch) | |
| tree | ea3b0faa7e23c5e1d556f67f351589093579d1ac /ext/phar/tar.c | |
| parent | dda41400105f6c99192d864083aed33818b16e4f (diff) | |
| download | php-git-f29b68306d457ebc157254a7af186e5a4fd6db80.tar.gz | |
Support for ext/phar (all tests passed)
Diffstat (limited to 'ext/phar/tar.c')
| -rw-r--r-- | ext/phar/tar.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/phar/tar.c b/ext/phar/tar.c index 861ae23409..6d210cbf5d 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -180,7 +180,6 @@ static int phar_tar_process_metadata(phar_entry_info *entry, php_stream *fp TSRM if (entry->filename_len == sizeof(".phar/.metadata.bin")-1 && !memcmp(entry->filename, ".phar/.metadata.bin", sizeof(".phar/.metadata.bin")-1)) { entry->phar->metadata = entry->metadata; ZVAL_UNDEF(&entry->metadata); -// ??? len ??? } else if (entry->filename_len >= sizeof(".phar/.metadata/") + sizeof("/.metadata.bin") - 1 && NULL != (mentry = zend_hash_str_find_ptr(&(entry->phar->manifest), entry->filename + sizeof(".phar/.metadata/") - 1, entry->filename_len - (sizeof("/.metadata.bin") - 1 + sizeof(".phar/.metadata/") - 1)))) { /* transfer this metadata to the entry it refers */ mentry->metadata = entry->metadata; @@ -878,7 +877,6 @@ static int phar_tar_setupmetadata(zval *zv, void *argument TSRMLS_DC) /* {{{ */ return phar_tar_setmetadata(&entry->phar->metadata, entry, error TSRMLS_CC); } /* search for the file this metadata entry references */ -//??? len ??? if (entry->filename_len >= sizeof(".phar/.metadata/") + sizeof("/.metadata.bin") - 1 && !zend_hash_str_exists(&(entry->phar->manifest), entry->filename + sizeof(".phar/.metadata/") - 1, entry->filename_len - (sizeof("/.metadata.bin") - 1 + sizeof(".phar/.metadata/") - 1))) { /* this is orphaned metadata, erase it */ return ZEND_HASH_APPLY_REMOVE; |