diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-26 10:52:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-26 10:52:43 +0400 |
| commit | 9dd66e4d537073ea311929a65622d898193618c8 (patch) | |
| tree | c1a205487d4156c439d1b4f8e8e9f82b425fa9eb /ext/zip/php_zip.c | |
| parent | 066c1d5451a33c652e23a59e6455dca331007919 (diff) | |
| parent | 347b430a03a394f31048ad16b2bbc22e29f3baf5 (diff) | |
| download | php-git-9dd66e4d537073ea311929a65622d898193618c8.tar.gz | |
Merge branch 'master' into phpng
* master:
Fixed issue #183 (TMP_VAR is not only used once)
Fix broken Junit output with --disable-cgi
Added folder mark
Further test fixes for the fdb2709 breakage.
Fix broken test caused by fdb2709.
Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
Fix run-tests.php with Valgrind >= 3.10.0.
Add microseconds to the serialised form of DateTime objects.
Improved test for bug #62479
fix typo in ODBC code
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
5.5.14 now
Fix bug #67060: use default mode of 660
Conflicts:
ext/date/php_date.c
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 9f5d9d03ca..053cc68058 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -328,7 +328,7 @@ static int php_zip_parse_options(zval *options, long *remove_all_path, char **re } /* If I add more options, it would make sense to create a nice static struct and loop over it. */ - if ((options = zend_hash_str_find(HASH_OF(options), "remove_path", sizeof("remove_path") - 1)) != NULL) { + if ((option = zend_hash_str_find(HASH_OF(options), "remove_path", sizeof("remove_path") - 1)) != NULL) { if (Z_TYPE_P(option) != IS_STRING) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "remove_path option expected to be a string"); return -1; |