Merge branch 'PHP-5.6'

Conflicts:
	NEWS
	ext/opcache/Optimizer/pass1_5.c

diff --cc ext/phar/phar_internal.h
Simple merge

diff --cc ext/phar/tar.c
index cab6455ffcba0e552d43c223895d93c50d316cbe,42b51686f07583cc2f058d3d0aaa06050c7f67f5..9c72b273e7bda849a356ba9766301aa66a96faa6
--- 1/ext/phar/tar.c
--- 2/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@@ -255,8 -255,14 +255,14 @@@ int phar_parse_tarfile(php_stream* fp, 
                size = entry.uncompressed_filesize = entry.compressed_filesize =
                        phar_tar_number(hdr->size, sizeof(hdr->size));
  
+               /* skip global/file headers (pax) */
+               if (!old && (hdr->typeflag == TAR_GLOBAL_HDR || hdr->typeflag == TAR_FILE_HDR)) {
+                       size = (size+511)&~511;
+                       goto next;
+               }
+ 
                if (((!old && hdr->prefix[0] == 0) || old) && strlen(hdr->name) == sizeof(".phar/signature.bin")-1 && !strncmp(hdr->name, ".phar/signature.bin", sizeof(".phar/signature.bin")-1)) {
 -                      off_t curloc;
 +                      zend_off_t curloc;
  
                        if (size > 511) {
                                if (error) {