diff options
| author | Anatol Belski <ab@php.net> | 2014-11-26 08:17:35 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-26 08:17:35 +0100 |
| commit | 3ca0ca1548324e8993e0707dfaf67a8cb58a0fb2 (patch) | |
| tree | ed14da274390f69bc4235a1f21121cfe8b370144 /ext/zip/php_zip.c | |
| parent | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (diff) | |
| parent | 108b2c4bb993f7bd3855a801f71175fd65c6828a (diff) | |
| download | php-git-3ca0ca1548324e8993e0707dfaf67a8cb58a0fb2.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (102 commits)
fix dir separator in test
fix TS build
fix TS build
Better fix for bug #68446
Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
Revert NEWS and set test to XFAIL
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
Improved zend_hash_clean() and added new optimized zend_symtable_clean()
Use inline version of zval_ptr_dtor()
Added new optimized zend_array_destroy() function
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
fix REGISTER_NS_*_CONSTANT macros
Removed useless assert. EG(uninitialized_zval) can't be refcounted.
Use specialized destructors when types of zvals are known.
move tests into proper place
Improved assignment to object property
Reuse zend_assign_to_variable() in zend_std_write_property()
cleanup comments from svn/cvs era
fix dir separator in test
fork test for windows
...
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 4accc22e30..b50e240656 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -556,7 +556,7 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v array_init(return_value); for (n = 0; n < globbuf.gl_pathc; n++) { - /* we need to do this everytime since GLOB_ONLYDIR does not guarantee that + /* we need to do this every time since GLOB_ONLYDIR does not guarantee that * all directories will be filtered. GNU libc documentation states the * following: * If the information about the type of the file is easily available |