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

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_execute.c
Simple merge

diff --cc ext/opcache/ZendAccelerator.c
index 3835d8b9ab8238fb4a2034aafaa5280ce81d359a,a546a77cb6b927389240b75fa0e9c41885349498..5c3f651a90b95c602f940b80d8ef461028a341ce
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -36,8 -36,7 +36,8 @@@
  #include "main/php_open_temporary_file.h"
  #include "zend_API.h"
  #include "zend_ini.h"
- #include "TSRM/tsrm_virtual_cwd.h"
+ #include "zend_virtual_cwd.h"
 +#include "ext/phar/php_phar.h"
  #include "zend_accelerator_util_funcs.h"
  #include "zend_accelerator_hash.h"
  

diff --cc ext/opcache/zend_accelerator_module.c
Simple merge

diff --cc ext/soap/php_sdl.c
Simple merge

diff --cc ext/zip/php_zip.c
Simple merge

diff --cc sapi/cgi/cgi_main.c
Simple merge