diff options
| author | Anatol Belski <ab@php.net> | 2013-11-05 19:23:23 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-11-05 19:23:23 +0100 |
| commit | c67598004670f170a02a582342d72b4d4ad9425c (patch) | |
| tree | 06d7adb251ad2956ca11902c68e205104a7a60f0 /ext/phar | |
| parent | 6c8ff0031cadb3164bfa77939fd07e4689520f44 (diff) | |
| parent | 699f07ba446c931af9480aba29a601df25c9490d (diff) | |
| download | php-git-c67598004670f170a02a582342d72b4d4ad9425c.tar.gz | |
Merge branch 'pull-request/500'
* pull-request/500:
limit virtual_cwd_activate() duplicated call to ZTS only
reverted the previous commit, both calls are needed in TS mode
virtual_cwd_activate() should be called only in one place
back to do_alloca()
removed unnecessary call
simplify the state free macros
compact the code to preserve the error info after state freeing
back to do_alloca(), reverted the wrong replacement
enabled windows to use stack in both ts/nts mode, some more fixes
moved to do_alloca() usage where appropriate
fixed invalid free
fixed virtual cwd header in phar
updated NEWS
fixed all the places where last error could be lost
preserve the error code
applied and fixed the original patch
initial move on renaming files and fixing includes
Conflicts:
ext/opcache/ZendAccelerator.c
Diffstat (limited to 'ext/phar')
| -rw-r--r-- | ext/phar/phar_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index 64953f66b7..359f25b4c6 100644 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -54,7 +54,7 @@ #ifndef PHP_WIN32 #include "TSRM/tsrm_strtok_r.h" #endif -#include "TSRM/tsrm_virtual_cwd.h" +#include "Zend/zend_virtual_cwd.h" #if HAVE_SPL #include "ext/spl/spl_array.h" #include "ext/spl/spl_directory.h" |