removing the NEWS entry for #41631 as we reverted the fix for now

Revert "Merge branch 'PHP-5.5' into PHP-5.6"
This reverts commit 98e67add15, reversing changes made to 2cdc1a2b74.
2026-11-12 11:40:50 +00:00 · 2014-08-27 15:31:35 +02:00 · 2014-08-27 15:28:06 +02:00 · 2014-08-27 15:27:57 +02:00 · 2014-08-27 10:55:37 +02:00 · 2014-08-27 05:16:41 +02:00
1578 changed files with 130222 additions and 223282 deletions
@@ -19,7 +19,6 @@
 *.tgz
 *.tar.gz
 *.tar.bz2
-*.tar.xz
 .FBCIndex
 .FBCLockFolder
 .deps
@@ -1,13 +1,12 @@
-language: c
+language: php
+
+php:
+    # We only specify one version so we only get one worker
+    - 5.4

 notifications:
    email: 
       on_failure: change
-    irc:
-      channels:
-        - "irc.efnet.org#php.pecl"
-      on_success: change
-      on_failure: always

 cache: 
    - apt
@@ -30,7 +29,6 @@ before_install:
    - sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
    - sudo cp ./travis/de /var/lib/locales/supported.d/de
    - sudo dpkg-reconfigure locales
-    - ./travis/install.sh

 before_script:
    # Compile PHP
@@ -44,5 +42,5 @@ before_script:

 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
    - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg
@@ -42,7 +42,7 @@ Exceptions:

 4.  When writing functions that deal with strings, be sure to remember
    that PHP holds the length property of each string, and that it
-    shouldn't be calculated with strlen().  Write your functions in such
+    shouldn't be calculated with strlen().  Write your functions in a such
    a way so that they'll take advantage of the length property, both
    for efficiency and in order for them to be binary-safe.
    Functions that change strings and obtain their new lengths while
@@ -385,12 +385,6 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           hash
-PRIMARY MAINTAINER:  Sara Golemon <pollita@php.net>, Mike Wallner <mike@php.net>, Anatol Belski <ab@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.1.2
-------------------------------------------------------------------------------
 EXTENSION:           iconv
 PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
 MAINTENANCE:         Maintained
@@ -444,12 +438,6 @@ PRIMARY MAINTAINER:  Frank M. Kromann
 MAINTENANCE:         Unknown
 STATUS:              Experimental
 -------------------------------------------------------------------------------
-EXTENSION:           opcache
-PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               5.5.0
-------------------------------------------------------------------------------
 EXTENSION:           openssl
 PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
 MAINTENANCE:         Maintained
@@ -155,7 +155,7 @@ Table of Contents
   a  list  of all available options along with short explanations running
   ./configure   --help.   Our  manual  documents  the  different  options
   separately.  You  will find the core options in the appendix, while the
-   different  extension  specific  options  are  described on the reference
+   different  extension  specific  options  are  descibed on the reference
   pages.

   When  PHP  is  configured,  you  are  ready  to build the module and/or
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                  The PHP License, version 3.01
-Copyright (c) 1999 - 2015 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2014 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 

 Redistribution and use in source and binary forms, with or without
@@ -1,627 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-14 May 2015, PHP 5.6.9
-
- Core:
-  . Fixed bug #69467 (Wrong checked for the interface by using Trait). 
-    (Laruence)
-  . Fixed bug #69420 (Invalid read in zend_std_get_method). (Laruence)
-  . Fixed bug #60022 ("use statement [...] has no effect" depends on leading
-    backslash). (Nikita)
-  . Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer).
-    (Dmitry)
-  . Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
-  . Fixed bug #69419 (Returning compatible sub generator produces a warning).
-    (Nikita)
-  . Fixed bug #69472 (php_sys_readlink ignores misc errors from
-       GetFinalPathNameByHandleA). (Jan Starke)
-  . Fixed bug #69364 (PHP Multipart/form-data remote dos Vulnerability). (Stas)
-  . Fixed bug #69403 (str_repeat() sign mismatch based memory corruption).
-    (Stas)
-  . Fixed bug #69418 (CVE-2006-7243 fix regressions in 5.4+). (Stas)
-  . Fixed bug #69522 (heap buffer overflow in unpack()). (Stas)
-
- FTP:
-  . Fixed bug #69545 (Integer overflow in ftp_genlist() resulting in heap
-    overflow). (Stas)
-
- ODBC:
-  . Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
-    (Anatol)
-  . Fixed bug #69474 (ODBC: Query with same field name from two tables returns
-    incorrect result). (Anatol)
-  . Fixed bug #69381 (out of memory with sage odbc driver). (Frederic Marchall,
-      Anatol Belski)
-
- OpenSSL:
-  . Fixed bug #69402 (Reading empty SSL stream hangs until timeout).
-    (Daniel Lowrey)
-
- PCNTL:
-  . Fixed bug #68598 (pcntl_exec() should not allow null char). (Stas)
-
- PCRE
-  . Upgraded pcrelib to 8.37.
-
- Phar:
-  . Fixed bug #69453 (Memory Corruption in phar_parse_tarfile when entry
-    filename starts with null). (Stas)
-
-16 Apr 2015, PHP 5.6.8
-
- Core:
-  . Fixed bug #66609 (php crashes with __get() and ++ operator in some cases).
-    (Dmitry, Laruence)
-  . Fixed bug #68021 (get_browser() browser_name_regex returns non-utf-8
-    characters). (Tjerk)
-  . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
-  . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
-    configuration options). (Anatol Belski)
-  . Additional fix for bug #69152 (Type confusion vulnerability in
-    exception::getTraceAsString). (Stas)
-  . Fixed bug #69210 (serialize function return corrupted data when sleep has
-    non-string values). (Juan Basso)
-  . Fixed bug #69212 (Leaking VIA_HANDLER func when exception thrown in
-    __call/... arg passing). (Nikita)
-  . Fixed bug #69221 (Segmentation fault when using a generator in combination
-    with an Iterator). (Nikita)
-  . Fixed bug #69337 (php_stream_url_wrap_http_ex() type-confusion
-    vulnerability). (Stas)
-  . Fixed bug #69353 (Missing null byte checks for paths in various PHP
-    extensions). (Stas)
-
- Apache2handler:
-  . Fixed bug #69218 (potential remote code execution with apache 2.4
-    apache2handler). (Gerrit Venema)
-
- cURL:
-  . Implemented FR#69278 (HTTP2 support). (Masaki Kagaya)
-  . Fixed bug #68739 (Missing break / control flow). (Laruence)
-  . Fixed bug #69316 (Use-after-free in php_curl related to
-    CURLOPT_FILE/_INFILE/_WRITEHEADER). (Laruence)
-
- Date:
-  . Fixed bug #69336 (Issues with "last day of <monthname>"). (Derick Rethans)
-
- Enchant:
-  . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
-    builds). (Anatol)
-
- Ereg:
-  . Fixed bug #68740 (NULL Pointer Dereference). (Laruence)
-
- Fileinfo:
-  . Fixed bug #68819 (Fileinfo on specific file causes spurious OOM and/or
-    segfault). (Anatol Belski)
-
- Filter:
-  . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other
-    flags are used). (Jeff Welch)
-  . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff
-    Welch)
-
- Mbstring:
-  . Fixed bug #68846 (False detection of CJK Unified Ideographs Extension E).
-    (Masaki Kagaya)
-
- OPCache:
-  . Fixed bug #69297 (function_exists strange behavior with OPCache on
-    disabled function). (Laruence)
-  . Fixed bug #69281 (opcache_is_script_cached no longer works). (danack)
-  . Fixed bug #68677 (Use After Free). (CVE-2015-1351) (Laruence)
-
- OpenSSL:
-  . Fixed bugs #68853, #65137 (Buffered crypto stream data breaks IO polling
-    in stream_select() contexts) (Chris Wright)
-  . Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
-    (Daniel Lowrey)
-  . Fixed bug #69215 (Crypto servers should send client CA list)
-    (Daniel Lowrey)
-  . Add a check for RAND_egd to allow compiling against LibreSSL (Leigh)
-
- Phar:
-  . Fixed bug #64343 (PharData::extractTo fails for tarball created by BSD tar).
-    (Mike)
-  . Fixed bug #64931 (phar_add_file is too restrictive on filename). (Mike)
-  . Fixed bug #65467 (Call to undefined method cli_arg_typ_string). (Mike)
-  . Fixed bug #67761 (Phar::mapPhar fails for Phars inside a path containing 
-    ".tar"). (Mike)
-  . Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar). (Stas)
-  . Fixed bug #69441 (Buffer Overflow when parsing tar/zip/phar in
-    phar_set_inode). (Stas)
-
- Postgres:
-  . Fixed bug #68741 (Null pointer dereference). (CVE-2015-1352) (Laruence)
-
- SOAP:
-  . Fixed bug #69152 (Type Confusion Infoleak Vulnerability in unserialize()
-    with SoapFault). (Dmitry)
-  . Fixed bug #69293 (NEW segfault when using SoapClient::__setSoapHeader 
-     (bisected, regression)). (Laruence)
-
- SPL:
-  . Fixed bug #69227 (Use after free in zval_scan caused by
-     spl_object_storage_get_gc). (adam dot scarr at 99designs dot com)
-
- Sqlite3:
-  . Fixed bug #68760 (SQLITE segfaults if custom collator throws an exception).
-     (Dan Ackroyd)
-  . Fixed bug #69287 (Upgrade bundled libsqlite to 3.8.8.3). (Anatol)
-  . Fixed bug #66550 (SQLite prepared statement use-after-free). (Sean Heelan)
-
-19 Mar 2015, PHP 5.6.7
-
- Core:
-  . Fixed bug #69174 (leaks when unused inner class use traits precedence).
-    (Laruence)
-  . Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize).
-    (Laruence)
-  . Fixed bug #69121 (Segfault in get_current_user when script owner is not
-    in passwd with ZTS build). (dan at syneto dot net)
-  . Fixed bug #65593 (Segfault when calling ob_start from output buffering 
-    callback). (Mike)
-  . Fixed bug #68986 (pointer returned by php_stream_fopen_temporary_file
-    not validated in memory.c). (nayana at ddproperty dot com)
-  . Fixed bug #68166 (Exception with invalid character causes segv). (Rasmus)
-  . Fixed bug #69141 (Missing arguments in reflection info for some builtin
-    functions). (kostyantyn dot lysyy at oracle dot com)
-  . Fixed bug #68976 (Use After Free Vulnerability in unserialize()).
-    (CVE-2015-2787) (Stas)
-  . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
-    configuration options). (Anatol Belski)
-  . Fixed bug #69207 (move_uploaded_file allows nulls in path). (CVE-2015-2348)
-    (Stas)
-
- CGI:
-  . Fixed bug #69015 (php-cgi's getopt does not see $argv). (Laruence)
-
- CLI:
-  . Fixed bug #67741 (auto_prepend_file messes up __LINE__). (Reeze Xia)
-
- cURL:
-  . Fixed bug #69088 (PHP_MINIT_FUNCTION does not fully initialize cURL on
-    Win32). (Grant Pannell)
-  . Add CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5_HOSTNAME constants if supported
-    by libcurl. (Linus Unneback)
-
- Ereg:
-  . Fixed bug #69248 (heap overflow vulnerability in regcomp.c). (CVE-2015-2305)
-    (Stas)
-
- FPM:
-  . Fixed bug #68822 (request time is reset too early). (honghu069 at 163 dot com)
-
- ODBC:
-  . Fixed bug #68964 (Allowed memory size exhausted with odbc_exec). (Anatol)
-
- Opcache:
-  . Fixed bug #69159 (Opcache causes problem when passing a variable variable 
-    to a function). (Dmitry, Laruence)
-  . Fixed bug #69125 (Array numeric string as key). (Laruence)
-  . Fixed bug #69038 (switch(SOMECONSTANT) misbehaves). (Laruence)
-
- OpenSSL:
-  . Fixed bug #68912 (Segmentation fault at openssl_spki_new). (Laruence)
-  . Fixed bug #61285, #68329, #68046, #41631 (encrypted streams don't observe
-    socket timeouts). (Brad Broerman)
-  . Fixed bug #68920 (use strict peer_fingerprint input checks)
-    (Daniel Lowrey)
-  . Fixed bug #68879 (IP Address fields in subjectAltNames not used)
-    (Daniel Lowrey)
-  . Fixed bug #68265 (SAN match fails with trailing DNS dot) (Daniel Lowrey)
-  . Fixed bug #67403 (Add signatureType to openssl_x509_parse) (Daniel Lowrey)
-  . Fixed bug (#69195 Inconsistent stream crypto values across versions)
-    (Daniel Lowrey)
-
- pgsql:
-  . Fixed bug #68638 (pg_update() fails to store infinite values).
-    (william dot welter at 4linux dot com dot br, Laruence)
-
- Readline:
-  . Fixed bug #69054 (Null dereference in readline_(read|write)_history() without
-    parameters). (Laruence)
-
- SOAP:
-  . Fixed bug #69085 (SoapClient's __call() type confusion through
-    unserialize()). (andrea dot palazzo at truel dot it, Laruence)
-
- SPL:
-  . Fixed bug #69108 ("Segmentation fault" when (de)serializing
-    SplObjectStorage). (Laruence)
-  . Fixed bug #68557 (RecursiveDirectoryIterator::seek(0) broken after 
-    calling getChildren()). (Julien)
-
- ZIP:
-  . Fixed bug #69253 (ZIP Integer Overflow leads to writing past heap
-    boundary). (CVE-2015-2331) (Stas)
-
-19 Feb 2015, PHP 5.6.6
-
- Core:
-  . Removed support for multi-line headers, as the are deprecated by RFC 7230.
-    (Stas)
-  . Fixed bug #67068 (getClosure returns somethings that's not a closure).
-    (Danack at basereality dot com)
-  . Fixed bug #68942 (Use after free vulnerability in unserialize() with
-    DateTimeZone). (CVE-2015-0273) (Stas)
-  . Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname
-    buffer overflow). (Stas)
-  . Fixed Bug #67988 (htmlspecialchars() does not respect default_charset
-    specified by ini_set) (Yasuo)
-  . Added NULL byte protection to exec, system and passthru. (Yasuo)
-
- Dba:
-  . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info)
-
- Enchant:
-  . Fixed bug #68552 (heap buffer overflow in enchant_broker_request_dict()).
-    (CVE-2014-9705) (Antony)
-
- Fileinfo:
-  . Fixed bug #68827 (Double free with disabled ZMM). (Joshua Rogers)
-  . Fixed bug #67647 (Bundled libmagic 5.17 does not detect quicktime files
-    correctly). (Anatol)
-  . Fixed bug #68731 (finfo_buffer doesn't extract the correct mime with some
-    gifs). (Anatol)
-
- FPM:
-  . Fixed bug #66479 (Wrong response to FCGI_GET_VALUES). (Frank Stolle)
-  . Fixed bug #68571 (core dump when webserver close the socket).
-    (redfoxli069 at gmail dot com, Laruence)
-
- JSON:
-  . Fixed bug #50224 (json_encode() does not always encode a float as a float)
-    by adding JSON_PRESERVE_ZERO_FRACTION. (Juan Basso)
-
- LIBXML:
-  . Fixed bug #64938 (libxml_disable_entity_loader setting is shared
-    between threads). (Martin Jansen)
-
- Mysqli:
-  . Fixed bug #68114 (linker error on some OS X machines with fixed
-    width decimal support) (Keyur Govande)
-  . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
-    has rounding errors) (Keyur Govande)
-
- Opcache:
-  . Fixed bug with try blocks being removed when extended_info opcode
-    generation is turned on. (Laruence)
-
- PDO_mysql:
-  . Fixed bug #68750 (PDOMysql with mysqlnd does not allow the usage of
-    named pipes). (steffenb198 at aol dot com)
-
- Phar:
-  . Fixed bug #68901 (use after free). (CVE-2015-2301)
-    (bugreports at internot dot info)
-
- Pgsql:
-  . Fixed Bug #65199 (pg_copy_from() modifies input array variable) (Yasuo)
-
- Session:
-  . Fixed bug #68941 (mod_files.sh is a bash-script) (bugzilla at ii.nl, Yasuo)
-  . Fixed Bug #66623 (no EINTR check on flock) (Yasuo)
-  . Fixed bug #68063 (Empty session IDs do still start sessions) (Yasuo)
-
- Sqlite3:
-  . Fixed bug #68260 (SQLite3Result::fetchArray declares wrong 
-    required_num_args). (Julien)
-
- Standard:
-  . Fixed bug #65272 (flock() out parameter not set correctly in windows).
-    (Daniel Lowrey)
-  . Fixed bug #69033 (Request may get env. variables from previous requests
-    if PHP works as FastCGI). (Anatol)
-
- Streams:
-  . Fixed bug which caused call after final close on streams filter. (Bob)
-
-22 Jan 2015, PHP 5.6.5
-
- Core:
-  . Upgraded crypt_blowfish to version 1.3. (Leigh)
-  . Fixed bug #60704 (unlink() bug with some files path).
-  . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
-  . Fixed bug #68536 (pack for 64bits integer is broken on bigendian). (Remi)
-  . Fixed bug #55541 (errors spawn MessageBox, which blocks test automation).
-    (Anatol)
-  . Fixed bug #68297 (Application Popup provides too few information). (Anatol)
-  . Fixed bug #65769 (localeconv() broken in TS builds). (Anatol)
-  . Fixed bug #65230 (setting locale randomly broken). (Anatol)
-  . Fixed bug #66764 (configure doesn't define EXPANDED_DATADIR / PHP_DATADIR
-    correctly). (Ferenc)
-  . Fixed bug #68583 (Crash in timeout thread). (Anatol)
-  . Fixed bug #65576 (Constructor from trait conflicts with inherited
-    constructor). (dunglas at gmail dot com)
-  . Fixed bug #68676 (Explicit Double Free). (CVE-2014-9425) (Kalle)
-  . Fixed bug #68710 (Use After Free Vulnerability in PHP's unserialize()).
-    (CVE-2015-0231) (Stefan Esser)
-
- CGI:
-  . Fixed bug #68618 (out of bounds read crashes php-cgi). (CVE-2014-9427)
-    (Stas)
-
- CLI server:
-  . Fixed bug #68745 (Invalid HTTP requests make web server segfault). (Adam)
-
- cURL:
-  . Fixed bug #67643 (curl_multi_getcontent returns '' when
-    CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
-
- Date:
-  . Implemented FR #68268 (DatePeriod: Getter for start date, end date and 
-    interval). (Marc Bennewitz)
-
- EXIF:
-  . Fixed bug #68799: Free called on uninitialized pointer. (CVE-2015-0232)
-    (Stas)
-
- Fileinfo:
-  . Fixed bug #68398 (msooxml matches too many archives). (Anatol)
-  . Fixed bug #68665 (invalid free in libmagic). (Joshua Rogers, Anatol Belski)
-  . Fixed bug #68671 (incorrect expression in libmagic).
-    (Joshua Rogers, Anatol Belski)
-  . Removed readelf.c and related code from libmagic sources
-    (Remi, Anatol)
-  . Fixed bug #68735 (fileinfo out-of-bounds memory access). (CVE-2014-9652)
-    (Anatol)
-
- FPM:
-  . Fixed request #68526 (Implement POSIX Access Control List for UDS). (Remi)
-  . Fixed bug #68751 (listen.allowed_clients is broken). (Remi)
-
- GD:
-  . Fixed bug #68601 (buffer read overflow in gd_gif_in.c). (CVE-2014-9709)
-    (Jan Bee, Remi)
-  . Fixed request #68656 (Report gd library version). (Remi)
-
- mbstring:
-  . Fixed bug #68504 (--with-libmbfl configure option not present on Windows).
-    (Ashesh Vashi)
-
- Opcache:
-  . Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8
-    + Opcache). (Laruence)
-  . Fixed bug #67111 (Memory leak when using "continue 2" inside two foreach
-    loops). (Nikita)
-
- OpenSSL:
-  . Improved handling of OPENSSL_KEYTYPE_EC keys. (Dominic Luechinger)
-
- pcntl:
-  . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
-    when setting SIG_DFL). (Julien)
-
- PCRE:
-  . Fixed bug #66679 (Alignment Bug in PCRE 8.34 upstream).
-    (Rainer Jung, Anatol Belski)
-
- pgsql:
-  . Fixed bug #68697 (lo_export return -1 on failure). (Ondřej Surý)
-
- PDO:
-  . Fixed bug #68371 (PDO#getAttribute() cannot be called with platform-specifi
-    attribute names). (Matteo)
-
- PDO_mysql:
-  . Fixed bug #68424 (Add new PDO mysql connection attr to control multi
-    statements option). (peter dot wolanin at acquia dot com)
-
- SPL:
-  . Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
-    breaks the RecursiveIterator). (Paul Garvin)
-  . Fixed bug #68479 (Added escape parameter to SplFileObject::fputcsv). (Salathe)
-
- SQLite:
-  . Fixed bug #68120 (Update bundled libsqlite to 3.8.7.2). (Anatol)
-
- Streams:
-  . Fixed bug #68532 (convert.base64-encode omits padding bytes).
-    (blaesius at krumedia dot de)
-
-18 Dec 2014, PHP 5.6.4
-
- Core:
-  . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks).
-    (Adam)
-  . Fixed bug #68104 (Segfault while pre-evaluating a disabled function).
-    (Laruence)
-  . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly 
-    triggered). (Julien)
-  . Fixed bug #68355 (Inconsistency in example php.ini comments).
-    (Chris McCafferty)
-  . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
-  . Fixed bug #68422 (Incorrect argument reflection info for array_multisort()).
-    (Alexander Lisachenko)
-  . Fixed bug #68545 (NULL pointer dereference in unserialize.c). (Anatol)
-  . Fixed bug #68446 (Array constant not accepted for array parameter default).
-    (Bob, Dmitry)
-  . Fixed bug #68594 (Use after free vulnerability in unserialize()).
-    (CVE-2014-8142) (Stefan Esser)
-
- Date:
-  . Fixed day_of_week function as it could sometimes return negative values
-    internally. (Derick)
-
- FPM:
-  . Fixed bug #68381 (fpm_unix_init_main ignores log_level).
-    (David Zuelke, Remi)
-  . Fixed bug #68420 (listen=9000 listens to ipv6 localhost instead of all
-    addresses). (Remi)
-  . Fixed bug #68421 (access.format='%R' doesn't log ipv6 address). (Remi)
-  . Fixed bug #68423 (PHP-FPM will no longer load all pools). (Remi)
-  . Fixed bug #68428 (listen.allowed_clients is IPv4 only). (Remi)
-  . Fixed bug #68452 (php-fpm man page is oudated). (Remi)
-  . Fixed request #68458 (Change pm.start_servers default warning to
-    notice). (David Zuelke, Remi)
-  . Fixed bug #68463 (listen.allowed_clients can silently result
-    in no allowed access). (Remi)
-  . Fixed request #68391 (php-fpm conf files loading order).
-    (Florian Margaine, Remi)
-  . Fixed bug #68478 (access.log don't use prefix). (Remi)
-
- Mcrypt:
-  . Fixed possible read after end of buffer and use after free. (Dmitry)
-
- GMP:
-  . Fixed bug #68419 (build error with gmp 4.1). (Remi)
-
- PDO_pgsql:
-  . Fixed bug #67462 (PDO_PGSQL::beginTransaction() wrongly throws exception
-  when not in transaction) (Matteo)
-  . Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
-  (Matteo)
-
- Session:
-  . Fixed bug #68331 (Session custom storage callable functions not being called) 
-    (Yasuo Ohgaki)
-
- SOAP:
-  . Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes).
-    (Laruence)
-
- zlib:
-  . Fixed bug #53829 (Compiling PHP with large file support will replace
-    function gzopen by gzopen64) (Sascha Kettler, Matteo)
-
-13 Nov 2014, PHP 5.6.3
-
- Core:
-  . Implemented 64-bit format codes for pack() and unpack(). (Leigh)
-  . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
-  . Fixed bug #67633 (A foreach on an array returned from a function not doing
-    copy-on-write). (Nikita)
-  . Fixed bug #67739 (Windows 8.1/Server 2012 R2 OS build number reported
-    as 6.2 (instead of 6.3)). (Christian Wenz)
-  . Fixed bug #67949 (DOMNodeList elements should be accessible through
-    array notation) (Florian)
-  . Fixed bug #68095 (AddressSanitizer reports a heap buffer overflow in
-    php_getopt()). (Stas)
-  . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
-  . Fixed bug #68129 (parse_url() - incomplete support for empty usernames 
-    and passwords) (Tjerk)
-  . Fixed bug #68365 (zend_mm_heap corrupted after memory overflow in
-    zend_hash_copy). (Dmitry)
-
- CURL:
-  . Add CURL_SSLVERSION_TLSv1_0, CURL_SSLVERSION_TLSv1_1, and 
-    CURL_SSLVERSION_TLSv1_2 constants if supported by libcurl (Rasmus)
-
- Fileinfo:
-  . Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)
-  . Fixed bug #68224 (buffer-overflow in libmagic/readcdf.c caught by
-    AddressSanitizer). (Remi)
-  . Fixed bug #68283 (fileinfo: out-of-bounds read in elf note headers).
-    (CVE-2014-3710) (Remi)
-
- FPM:
-  . Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable
-    when using Apache, mod_proxy-fcgi and ProxyPass). (Remi)
-  . Implemented FR #55508 (listen and listen.allowed_clients should take IPv6
-    addresses). (Robin Gloster)
-
- GD:
-  . Fixed bug #65171 (imagescale() fails without height param). (Remi)
-
- GMP:
-  . Implemented gmp_random_range() and gmp_random_bits(). (Leigh)
-  . Fixed bug #63595 (GMP memory management conflicts with other libraries
-    using GMP). (Remi)
-
- Mysqli:
-  . Fixed bug #68114 (linker error on some OS X machines with fixed width
-    decimal support) (Keyur Govande)
-
- ODBC:
-  . Fixed bug #68087 (ODBC not correctly reading DATE column when preceded by
-    a VARCHAR column) (Keyur Govande)
-
- OpenSSL:
-  . Fixed bug #68074 (Allow to use system cipher list instead of hardcoded
-    value). (Remi)
-
- PDO_pgsql:
-  . Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
-    (Matteo, Alain Laporte)
-  . Fixed bug #66584 (Segmentation fault on statement deallocation) (Matteo)
-
- OpenSSL:
-  . Revert regression introduced by fix of bug #41631
-
- Reflection:
-  . Fixed bug #68103 (Duplicate entry in Reflection for class alias). (Remi)
-
- SPL:
-  . Fixed bug #68128 (Regression in RecursiveRegexIterator) (Tjerk)
-
-16 Oct 2014, PHP 5.6.2
-
- Core:
-  . Fixed bug #68044 (Integer overflow in unserialize() (32-bits only)).
-    (CVE-2014-3669) (Stas)
-
- cURL:
-  . Fixed bug #68089 (NULL byte injection - cURL lib). (Stas)
-
- EXIF:
-  . Fixed bug #68113 (Heap corruption in exif_thumbnail()). (CVE-2014-3670)
-    (Stas)
-
- XMLRPC:
-  . Fixed bug #68027 (Global buffer overflow in mkgmtime() function).
-    (CVE-2014-3668) (Stas)
-
-02 Oct 2014, PHP 5.6.1
-
- Core:
-  . Implemented FR #38409 (parse_ini_file() looses the type of booleans). (Tjerk)
-  . Fixed bug #65463 (SIGSEGV during zend_shutdown()). (Keyur Govande)
-  . Fixed bug #66036 (Crash on SIGTERM in apache process). (Keyur Govande)
-  . Fixed bug #67878 (program_prefix not honoured in man pages). (Remi)
-  . Fixed bug #67938 (Segfault when extending interface method with variadic).
-    (Nikita)
-  . Fixed bug #67985 (Incorrect last used array index copied to new array after
-    unset). (Tjerk)
-  . Fixed bug #68088 (New Posthandler Potential Illegal efree() vulnerability).
-    (Mike) (CVE-2014-3622)
-
- DOM:
-  . Made DOMNode::textContent writeable. (Tjerk)
-
- Fileinfo:
-  . Fixed bug #67731 (finfo::file() returns invalid mime type
-    for binary files). (Anatol)
-
- GD:
-  . Made fontFetch's path parser thread-safe. (Sara)
-
- GMP:
-  . Fixed bug #67917 (Using GMP objects with overloaded operators can cause
-    memory exhaustion). (Nikita)
-  . Fixed bug #50175 (gmp_init() results 0 on given base and number starting
-    with 0x or 0b). (Nikita)
-  . Implemented gmp_import() and gmp_export(). (Leigh, Nikita)
-
- MySQLi:
-  . Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
-
- OpenSSL:
-  . Fixed bug #67850 (extension won't build if openssl compiled without SSLv3).
-    (Daniel Lowrey)
-
- phpdbg:
-  . Fixed issue krakjoe/phpdbg#111 (compile error without ZEND_SIGNALS). (Bob)
-
- SOAP:
-  . Fixed bug #67955 (SoapClient prepends 0-byte to cookie names). (Philip Hofstetter)
-
- Session:
-  . Fixed bug #67972 (SessionHandler Invalid memory read create_sid()). (Adam)
-
- Sysvsem:
-  . Implemented FR #67990 (Add optional nowait argument to sem_acquire).
-    (Matteo)
-
 28 Aug 2014, PHP 5.6.0

 - Apache2 Handler SAPI:
@@ -647,7 +25,6 @@ PHP                                                                        NEWS
  . Fixed bug #66431 (Special Character via COM Interface (CP_UTF8)). (Anatol)

 - Core:
-  . Improved phpinfo() stylesheets. (Colin Viebrock)
  . Fixed bug #67693 (incorrect push to the empty array). (Tjerk)
  . Removed inconsistency regarding behaviour of array in constants at
    run-time. (Bob)
@@ -756,8 +133,6 @@ PHP                                                                        NEWS
    (Freek Lijten)

 - Date:
-  . Fixed bug #66060 (Heap buffer over-read in DateInterval). (CVE-2013-6712)
-    (Remi)
  . Fixed bug #66091 (memory leaks in DateTime constructor) (Tjerk).
  . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
    (Adam)
@@ -783,26 +158,24 @@ PHP                                                                        NEWS
  . Fixed bug #67705 (extensive backtracking in rule regular expression).
    (CVE-2014-3538) (Remi)
  . Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS).
-   (CVE-2014-0238)
  . Fixed bug #67328 (fileinfo: fileinfo: numerous file_printf calls resulting in
-    performance degradation). (CVE-2014-0237)
+    performance degradation).
  . Fixed bug #67326 (fileinfo: cdf_read_short_sector insufficient boundary check).
-    (CVE-2014-0207)
  . Fixed bug #67329 (fileinfo: NULL pointer deference flaw by processing certain
-    CDF files). (CVE-2014-0236)
+    CDF files).
  . Fixed bug #67410 (fileinfo: mconvert incorrect handling of truncated pascal
-    string size). (CVE-2014-3478) (Francisco Alonso, Jan Kaluza, Remi)
+    string size). (Francisco Alonso, Jan Kaluza, Remi)
  . Fixed bug #67411 (fileinfo: cdf_check_stream_offset insufficient boundary
-    check). (CVE-2014-3479) (Francisco Alonso, Jan Kaluza, Remi)
+    check). (Francisco Alonso, Jan Kaluza, Remi)
  . Fixed bug #67412 (fileinfo: cdf_count_chain insufficient boundary check).
-    (CVE-2014-3480) (Francisco Alonso, Jan Kaluza, Remi)
+    (Francisco Alonso, Jan Kaluza, Remi)
  . Fixed bug #67413 (fileinfo: cdf_read_property_info insufficient boundary
-    check). (CVE-2014-3487) (Francisco Alonso, Jan Kaluza, Remi)
+    check). (Francisco Alonso, Jan Kaluza, Remi)
  . Upgraded to libmagic-5.17 (Anatol)
  . Fixed bug #66731 (file: infinite recursion). (CVE-2014-1943) (Remi)
-  . Fixed bug #66820 (out-of-bounds memory access in fileinfo).
+  . Fixed bug #66820 (out-of-bounds memory access in fileinfo)
    (CVE-2014-2270). (Remi)
-  . Fixed bug #66946 (fileinfo: extensive backtracking in awk rule regular
+  . Fixed bug #66946i (fileinfo: extensive backtracking in awk rule regular
    expression). (CVE-2013-7345) (Remi)
  . Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian).
    (Remi)
@@ -811,12 +184,12 @@ PHP                                                                        NEWS
  . Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol)

 - FPM:
-  . Fixed bug #67606 (revised fix 67541, broke mod_fastcgi BC). (David Zuelke)
+  . Fix bug #67606 (revised fix 67541, broke mod_fastcgi BC). (David Zuelke)
  . Fixed bug #67530 (error_log=syslog ignored). (Remi)
  . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
-    (pacho at gentoo dot org, Remi)
-  . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)
-  . Fixed bug #67541 (Fix Apache 2.4.10+ SetHandler proxy:fcgi://
+    (pacho@gentoo.org, Remi)
+  . Fix bug #67531 (syslog cannot be set in pool configuration). (Remi)
+  . Fix bug #67541 (Fix Apache 2.4.10+ SetHandler proxy:fcgi://
    incompatibilities). (David Zuelke)
  . Included apparmor support in fpm
    (RFC: https://wiki.php.net/rfc/fpm_change_hat). (Gernot Vormayr)
@@ -836,11 +209,10 @@ PHP                                                                        NEWS
  . Fixed bug #67248 (imageaffinematrixget missing check of parameters). (Stas)
  . Fixed imagettftext to load the correct character map rather than the last one.
    (Scott)
-  . Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()).
-    (CVE-2013-7226)
-  . Fixed bug #66815 (imagecrop(): insufficient fix for NULL defer).
-    (CVE-2013-7327). (Tomas Hoger, Remi).
-  . Fixed bug #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre)
+  . Fixed bug #66714 ( imageconvolution breakage). (Brad Daily)
+  . Fixed bug #66815 (imagecrop(): insufficient fix for NULL defer
+    CVE-2013-7327). (Tomas Hoger, Remi).
+  . Fixed #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre)
  . Fixed bug #66887 (imagescale - poor quality of scaled image). (Remi)
  . Fixed bug #66890 (imagescale segfault). (Remi)
  . Fixed bug #66893 (imagescale ignore method argument). (Remi)
@@ -887,7 +259,6 @@ PHP                                                                        NEWS
  . Fixed issue with null bytes in LDAP bindings. (Matthew Daley)

 - litespeed
-  . Updated LiteSpeed SAPI code to V6.6 (George Wang)
  . Fixed bug #63228 (-Werror=format-security error in lsapi code).
    (Elan Ruusamäe, George)

@@ -934,8 +305,6 @@ PHP                                                                        NEWS
    fields). (Keyur Govande)

 - OpenSSL:
-  . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
-    (Daniel Lowrey).
  . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
  . Fixed bug #67609 (TLS connections fail behind HTTP proxy). (Daniel Lowrey)
  . Fixed broken build against OpenSSL older than 0.9.8 where ECDH unavailable.
@@ -1016,9 +385,9 @@ PHP                                                                        NEWS
  . Encrypted TLS servers now support the server name indication TLS extension
    via the new  "SNI_server_certs" SSL context option. (Daniel Lowrey)
  . Fixed bug #66833 (Default disgest algo is still MD5, switch to SHA1). (Remi)
-  . Fixed bug #66942 (memory leak in openssl_seal()). (Chuan Ma)
-  . Fixed bug #66952 (memory leak in openssl_open()). (Chuan Ma)
-  . Fixed bug #66840 (Fix broken build when extension built separately).
+  . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)
+  . Fix bug #66952 (memory leak in openssl_open()). (Chuan Ma)
+  . Fix bug #66840 (Fix broken build when extension built separately).
    (Daniel Lowrey)

 - OPcache:
@@ -1041,7 +410,7 @@ PHP                                                                        NEWS
  . Added support for (*MARK) backtracking verbs. (Nikita)

 - pgsql:
-  . Fixed bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
+  . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
    which affected builds against libpq < 7.3. (Adam)
  . pg_insert()/pg_select()/pg_update()/pg_delete() are no longer EXPERIMENTAL.
    (Yasuo)
@@ -1069,7 +438,7 @@ PHP                                                                        NEWS
 - phpdbg
  . Fixed bug #67575 (Compilation fails for phpdbg when the
    build directory != src directory). (Andy Thompson)
-  . Fixed Bug #67499 (readline feature not enabled when build with libedit). (Remi)
+  . Fix Bug #67499 (readline feature not enabled when build with libedit). (Remi)
  . Fix issue krakjoe/phpdbg#94 (List behavior is inconsistent). (Bob)
  . Fix issue krakjoe/phpdbg#97 (The prompt should always ensure it is on a
    newline). (Bob)
@@ -1113,7 +482,7 @@ PHP                                                                        NEWS
  . Fixed Bug #66071 (memory corruption in error handling) (Popa)

 - Phar:
-  . Fixed bug #64498 ($phar->buildFromDirectory can't compress file with an accent
+  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent
    in its name). (PR #588)
  . Fixed bug #67587 (Redirection loop on nginx with FPM). (Christian Weiske)

@@ -1216,7 +585,7 @@ PHP                                                                        NEWS

 - FPM:
  . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
-    (pacho at gentoo dot org, Remi)
+    (pacho@gentoo.org, Remi)

 - GD:
  . Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference).
@@ -54,7 +54,9 @@ Currently we have the following branches in use::
  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
            stable version and is open for bugfixes only.

-  PHP-5.3   This branch is closed.
+  PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
+            in extended support and open forsecurity fixes only. Triaged
+            via security@php.net

  PHP-5.2   This branch is closed.

@@ -67,7 +69,7 @@ Currently we have the following branches in use::

 The next few rules are more of a technical nature::

-   1. All changes should first go to the lowest branch (i.e. 5.4) and then
+   1. All changes should first go to the lowest branch (i.e. 5.3) and then 
      get merged up to all other branches. If a change is not needed for
      later branches (i.e. fixes for features which where dropped from later
      branches) an empty merge should be done.
@@ -196,11 +196,11 @@ last commit id to web/php.git, then, mirrors will now sync
 Getting the stable release announced
 ------------------------------------

-1. Update phpweb/include/releases.inc with the old release info
-  (updates the download archives)
+1. Run the bumpRelease script for phpweb on your local checkout

- a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
-    highest branch, otherwise you have to do this manually, see point 1.b
+ a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
+    The release announcement file should list in detail security fixes and
+    changes in behavior (whether due to a bug fix or not).

 b. In case multiple PHP minor versions are in active development you have
    to manually copy the old information to include/releases.inc
@@ -213,18 +213,15 @@ Getting the stable release announced

 c. ``$PHP_X_MD5`` array and update all the md5 sums

- d. ``$PHP_X_SHA256`` array and update all the SHA256 sums
+ d. set ``$PHP_X_RC`` to false!

- e. set ``$PHP_X_RC`` to false!
-
- f. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

- g. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
+ f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

-3. Create the release file (releases/x_y_z.php)
-   Usually we use the same content as for point 6, but included in php template
-   instead of the release xml.
+3. Update phpweb/include/releases.php with the old release info
+  (updates the download archives)

 4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
   (prepare for next RC)
@@ -269,9 +266,6 @@ to upgrade.
 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 http://news.php.net/php.internals/17222.
-Please make sure that the mail to php-announce@ is its own completely seperate email.
-This is to make sure that repiles to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.

 Re-releasing the same version (or -pl)
 --------------------------------------
@@ -288,9 +282,7 @@ Re-releasing the same version (or -pl)

 d. ``$PHP_X_MD5`` array and update all the md5 sums

- e. ``$PHP_X_SHA256`` array and update all the SHA256 sums
-
- f. Make sure there are no outdated "notes" or edited "date" keys in the
+ e. Make sure there are no outdated "notes" or edited "date" keys in the
 ``$RELEASES[X][$PHP_X_VERSION]["source"]`` array

 3. Add a short notice to phpweb stating that there is a new release, and
@@ -307,6 +299,3 @@ to upgrade.
 5. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
 the news entry.
-Please make sure that the mail to php-announce@ is its own completely seperate email.
-This is to make sure that repiles to the announcement on php-general@ or internals@
-will not accidentally hit the php-announce@ mailinglist.
@@ -8,7 +8,7 @@ the original run-tests.php script.  server-tests is *not* used by
 'make test'.  server-tests was developed to provide support for
 testing PHP under it's primary environment, HTTP, and can run the
 PHP tests under any of the SAPI modules that are direct executables, 
-or are accessible via HTTP.
+or are accessable via HTTP.

 [New features]
 ----------------
@@ -95,7 +95,7 @@ include:
  $filename     full native path to file, will become PATH_TRANSLATED
  $filepath     =dirname($filename)
  $scriptname   this is what will become SCRIPT_NAME unless you override it
-  $docroot      the equivalent of DOCUMENT_ROOT under Apache
+  $docroot      the equivelant of DOCUMENT_ROOT under Apache
  $cwd          the directory that the test is being initiated from
  $this->conf   all server-tests configuration vars
  $this->env    all environment variables that will get passed to the test
@@ -105,7 +105,7 @@ include:
 This section is also eval'd, and is similar in nature to --ENV--.  However,
 this section is used to build the url used in an HTTP request.  Valid values
 to set in this section would include:
-  SCRIPT_NAME   The initial part of the request url
+  SCRIPT_NAME   The inital part of the request url
  PATH_INFO     The pathinfo part of a request url
  FRAGMENT      The fragment section of a url (after #)
  QUERY_STRING  The query part of a url (after ?)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -217,7 +217,6 @@ PHP 5.6 UPGRADE NOTES

 - Strings:
  substr_compare() now allows $length to be zero.
-  pack() and unpack() now support 64-bit format specifiers: q, Q, J and P.

 - Crypt:
  crypt() will now raise an E_NOTICE error if the salt parameter is omitted.
@@ -257,26 +256,12 @@ PHP 5.6 UPGRADE NOTES
  Manipulated serialization strings for objects implementing Serializable by
  replacing "C:" with "O:" at the start will now produce an error.

- parse_ini_file():
- parse_ini_string():
-  Added scanner mode INI_SCANNER_TYPED to yield typed .ini values. 
-  For PHP >= 5.6.1
-
- JSON:
-  Added JSON_PRESERVE_ZERO_FRACTION option (PHP >= 5.6.5)
-
 ========================================
 6. New Functions
 ========================================

- Datetime:
-  Added DatePeriod::getStartDate(), DatePeriod::getEndDate(), DatePeriod::getDateInterval() in 5.6.5.
-
 - GMP:
  Added gmp_root($a, $nth) and gmp_rootrem($a, $nth) for calculating nth roots.
-  Added gmp_import($data, $word_size = 1, $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN) in PHP 5.6.1.
-  Added gmp_export($gmpnumber, $word_size = 1, $options = GMP_MSW_FIRST | GMP_NATIVE_ENDIAN) in PHP 5.6.1.
-  Added gmp_random_range() and gmp_random_bits() in PHP 5.6.3.

 - Hash
  Added hash_equals($known_string, $user_string)
@@ -304,15 +289,12 @@ PHP 5.6 UPGRADE NOTES
  Added PDO::pgsqlGetNotify($result_type = PDO::FETCH_USE_DEFAULT, $ms_timeout = 0)
  Added PDO::pgsqlGetPid()

- Reflection
-  Added ReflectionFunction::isVariadic() and ReflectionParameter::isVariadic().
+- Zip:
+  Added ZipArchive::setPassword($password)

 - SPL
  Added SplFileObject::fread($length) to complement fwrite() method (>= 5.5.11)

- Zip:
-  Added ZipArchive::setPassword($password)
-
 ========================================
 7. New Classes and Interfaces
 ========================================
@@ -387,16 +369,10 @@ PHP 5.6 UPGRADE NOTES
  - Added LISTEN/NOTIFY support via PDO::pgsqlGetNotify / PDO::pgsqlGetPid()
    as described in https://bugs.php.net/bug.php?id=42614.

- DOM:
-  - DOMNode::textContent is now a writeable property. (>= 5.6.1)
-
 ========================================
 10. New Global Constants
 ========================================

- CURL:
-  CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 (>= 5.6.8)
-
 - LDAP:
  LDAP_ESCAPE_FILTER int(1)
  LDAP_ESCAPE_DN     int(2)
@@ -1,5 +1,5 @@
 --TEST--
-Bug #43201 (Crash on using uninitialized vals and __get/__set)
+Bug #43201 (Crash on using unitialized vals and __get/__set)
 --FILE--
 <?php
 class Foo {
@@ -1,5 +1,7 @@
 --TEST--
 Bug #63336 (invalid E_NOTICE error occur)
+--XFAIL--
+Bug is not fixed yet
 --FILE--
 <?php
 error_reporting(E_ALL | E_NOTICE );
@@ -16,7 +18,7 @@ class Child extends Base {
    public function bar($var, $more=self::DUMMY) { return true; }
 }
 ?>
--EXPECTF--
-Strict Standards: Declaration of Child::foo() should be compatible with Base::foo($var = TEST, $more = NULL) in %sbug63336.php on line %d
+--EXPECT--
+Strict Standards: Declaration of Child::foo() should be compatible with Base::foo($var = '123', $more = NULL) in %sbug63336.php on line %d

-Strict Standards: Declaration of Child::bar() should be compatible with Base::bar($more = self::DUMMY) in %sbug63336.php on line %d
+Strict Standards: Declaration of Child::bar() should be compatible with Base::bar($var, $more = 'XXX') in %sbug63336.php on line %d
@@ -1,23 +0,0 @@
--TEST--
-Bug #65419 (Inside trait, self::class != __CLASS__)
--FILE--
-<?php
-trait abc
-{
-  static function def()
-  {
-    echo self::class, "\n";
-    echo __CLASS__, "\n";
-  }
-}
-
-class ghi
-{
-  use abc;
-}
-
-ghi::def();
-?>
--EXPECTF--
-ghi
-ghi
@@ -1,28 +0,0 @@
--TEST--
-Bug #66609 (php crashes with __get() and ++ operator in some cases)
--FILE--
-<?php
-$bar = new Bar;
-$foo = new Foo;
-class Bar {
-	public function __get($x) {
-		global $foo;
-		return $foo->foo;
-	}
-}
-class Foo {
-	public function __get($x) {
-		global $bar;
-		return $bar->bar;
-	}
-}
-$foo->blah += 1; //crash
-++$foo->blah;    //crash
-$foo->blah++;    //crash
-$foo->blah--;    //crash
--$foo->blah;    //crash
-echo "okey";
-?>
--EXPECTF--
-Notice: Undefined property: Bar::$bar in %sbug66609.php on line %d
-okey
@@ -1,20 +0,0 @@
--TEST--
-Bug #67111: Memory leak when using "continue 2" inside two foreach loops
--FILE--
-<?php
-
-$array1 = [1, 2, 3];
-$array2 = [1, 2, 3];
-
-foreach ($array1 as $x) {
-    foreach ($array2 as $y) {
-        echo "$x.$y\n";
-        continue 2;
-    }
-}
-
-?>
--EXPECT--
-1.1
-2.1
-3.1
@@ -1,22 +0,0 @@
--TEST--
-Bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
--FILE--
-<?php
-function crash()
-{
-    $notDefined[$i] = 'test';
-}
-
-function error_handler() { return false; }
-
-set_error_handler('error_handler');
-crash();
-echo "made it once\n";
-crash();
-echo "ok\n";
--EXPECTF--
-Notice: Undefined variable: i in %sbug67314.php on line 4
-made it once
-
-Notice: Undefined variable: i in %sbug67314.php on line 4
-ok
@@ -2,14 +2,14 @@
 bug67436: Autoloader isn't called if user defined error handler is present

 --INI--
-error_reporting=-1
+error_reporting=

 --FILE--
 <?php

 spl_autoload_register(function($classname) {
 	if (in_array($classname, array('a','b','c'))) {
-		require_once __DIR__ . "/{$classname}.php";
+		require_once ($classname . '.php');
 	}
 });

@@ -9,7 +9,7 @@ error_reporting=-1

 spl_autoload_register(function($classname) {
 	if (in_array($classname, array('a','b','c'))) {
-		require_once __DIR__ . "/{$classname}.php";
+		require_once ($classname . '.php');
 	}
 });

@@ -19,6 +19,6 @@ $b = new b();
 $b->test();

 --EXPECTF--
-Strict Standards: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s%ebug67436%eb.php on line %d
+Strict Standards: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s/bug67436/b.php on line %d
 b::test()
 a::test(c::TESTCONSTANT)
@@ -1,44 +0,0 @@
--TEST--
-Bug #67633: A foreach on an array returned from a function not doing copy-on-write
--FILE--
-<?php
-
-function id($x) {
-    return $x;
-}
-
-function &ref_id(&$x) {
-    return $x;
-}
-
-$c = 'c';
-$array = ['a', 'b', $c];
-
-foreach(id($array) as &$v) {
-    $v .= 'q';
-}
-var_dump($array);
-
-foreach(ref_id($array) as &$v) {
-    $v .= 'q';
-}
-var_dump($array);
-
-?>
--EXPECT--
-array(3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(3) {
-  [0]=>
-  string(2) "aq"
-  [1]=>
-  string(2) "bq"
-  [2]=>
-  &string(2) "cq"
-}
@@ -1,27 +0,0 @@
--TEST--
-Bug #67938: Segfault when extending interface method with variadic
--FILE--
-<?php
-
-interface TestInterface {
-    public function foo();
-    public function bar(array $bar);
-}
-
-class Test implements TestInterface {
-    public function foo(...$args) {
-        echo __METHOD__, "\n";
-    }
-    public function bar(array $bar, ...$args) {
-        echo __METHOD__, "\n";
-    }
-}
-
-$obj = new Test;
-$obj->foo();
-$obj->bar([]);
-
-?>
--EXPECT--
-Test::foo
-Test::bar
@@ -1,16 +0,0 @@
--TEST--
-Bug #67985 - Last used array index not copied to new array at assignment
--FILE--
-<?php
-
-$a = ['zero', 'one', 'two'];
-unset($a[2]);
-$b = $a;
-$a[] = 'three';
-$b[] = 'three';
-
-var_dump($a === $b);
-
-?>
--EXPECT--
-bool(true)
@@ -1,21 +0,0 @@
--TEST--
-Bug #68118: $a->foo .= 'test'; can leave $a->foo undefined
--FILE--
-<?php
-
-set_error_handler(function() {
-    $obj = new stdClass;
-    $obj->test = 'meow';
-    return true;
-});
- 
-$a = new stdClass;
-$a->undefined .= 'test';
-var_dump($a);
-
-?>
--EXPECT--
-object(stdClass)#2 (1) {
-  ["undefined"]=>
-  string(4) "test"
-}
@@ -1,18 +0,0 @@
--TEST--
-Bug #68370 "unset($this)" can make the program crash
--FILE--
-<?php
-class C {
-	public function test() {
-		unset($this);
-		return get_defined_vars();
-	}
-}
-$c = new C();
-$x = $c->test();
-print_r($x);
-unset($c, $x);
--EXPECTF--
-Array
-(
-)
@@ -1,36 +0,0 @@
--TEST--
-Bug #68446 (Array constant not accepted for array parameter default)
--FILE--
-<?php
-const FOO = [1];
-const BAR = null;
-
-function a(array $a = FOO) {
-	var_dump($a);
-}
-
-function b(array $b = BAR) {
-	var_dump($b);
-}
-
-b(null);
-b([]);
-b();
-a([]);
-a();
-a(null);
-?>
--EXPECTF--
-NULL
-array(0) {
-}
-NULL
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-
-Catchable fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d
-
@@ -1,40 +0,0 @@
--TEST--
-Bug #68652 (segmentation fault in destructor)
--FILE--
-<?php
-class Foo {
-
-    private static $instance;
-    public static function getInstance() {
-        if (isset(self::$instance)) {
-            return self::$instance;
-        }
-        return self::$instance = new self();
-    }
-
-    public function __destruct() {
-        Bar::getInstance();
-    }
-}
-
-class Bar {
-
-    private static $instance;
-    public static function getInstance() {
-        if (isset(self::$instance)) {
-            return self::$instance;
-        }
-        return self::$instance = new self();
-    }
-
-    public function __destruct() {
-        Foo::getInstance();
-    }
-}
-
-
-$foo = new Foo();
-?>
--EXPECTF--
-Fatal error: Access to undeclared static property: Bar::$instance in %sbug68652.php on line %d
-
@@ -1,42 +0,0 @@
--TEST--
-#69017 (Fail to push to the empty array with the constant value defined in class scope)
--FILE--
-<?php
-
-class c1
-{
-	const ZERO = 0;
-	const ONE = 1;
-	const MAX = PHP_INT_MAX;
-	public static $a1 = array(self::ONE => 'one');
-	public static $a2 = array(self::ZERO => 'zero');
-	public static $a3 = array(self::MAX => 'zero');
-}
-
-
-c1::$a1[] = 1;
-c1::$a2[] = 1;
-c1::$a3[] = 1;
-
-var_dump(c1::$a1);
-var_dump(c1::$a2);
-var_dump(c1::$a3);
-?>
--EXPECTF--
-Warning: Cannot add element to the array as the next element is already occupied in %sbug69017.php on line %d
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(1)
-}
-array(2) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  int(1)
-}
-array(1) {
-  [%d]=>
-  string(4) "zero"
-}
@@ -1,16 +0,0 @@
--TEST--
-Bug #69174 (leaks when unused inner class use traits precedence)
--FILE--
-<?php
-function test() {
-	class C1 {
-		use T1, T2 {
-			T1::foo insteadof T2;
-			T1::bar insteadof T2;
-		}
-	}
-}
-?>
-==DONE==
--EXPECT--
-==DONE==
@@ -1,43 +0,0 @@
--TEST--
-Bug #69212: Leaking VIA_HANDLER func when exception thrown in __call/... arg passing
--FILE--
-<?php
-
-class Test {
-    public static function __callStatic($method, $args) {}
-    public function __call($method, $args) {}
-}
-
-function do_throw() { throw new Exception; }
-
-try {
-    Test::foo(do_throw());
-} catch (Exception $e) {
-    echo "Caught!\n";
-}
-try {
-    (new Test)->bar(do_throw());
-} catch (Exception $e) {
-    echo "Caught!\n";
-}
-
-try {
-	$f = function () {};
-	$f->__invoke(do_throw());
-} catch (Exception $e) {
-	echo "Caught!\n";
-}
-
-try {
-	$t = new Test;
-	$f->__invoke($t->bar(Test::foo(do_throw())));
-} catch (Exception $e) {
-	echo "Caught!\n";
-}
-
-?>
--EXPECT--
-Caught!
-Caught!
-Caught!
-Caught!
@@ -1,24 +0,0 @@
--TEST--
-Bug #69221: Segmentation fault when using a generator in combination with an Iterator
--FILE--
-<?php
-
-function gen() {
-	yield 1;
-};
-
-$gen1 = gen();
-$gen2 = (object) $gen1;
-
-foreach ($gen1 as $v1) {
-    foreach ($gen2 as $v2) {
-        break 2;
-    }
-}
-
-unset($gen1);
-foreach ($gen2 as $v) { var_dump($v); }
-
-?>
--EXPECTF--
-int(1)
@@ -1,20 +0,0 @@
--TEST--
-Bug #69221: Segmentation fault when using a generator in combination with an Iterator (2)
--FILE--
-<?php
-
-$gen = function() {
-    yield 1;
-};
-
-$iter = new IteratorIterator($gen());
-$ngen = $iter->getInnerIterator();
-
-var_dump(iterator_to_array($ngen, false));
-
-?>
--EXPECT--
-array(1) {
-  [0]=>
-  int(1)
-}
@@ -1,30 +0,0 @@
--TEST--
-Bug #69420 (Invalid read in zend_std_get_method)
--FILE--
-<?php
-
-trait T {
-	protected function test() {
-		echo "okey";
-	}
-}
-
-
-class A {
-	protected function test() {
-	}
-}
-
-class B extends A {
-	use T;
-	public function foo() {
-		$this->test();
-	}
-}
-
-
-$b = new B();
-$b->foo();
-?>
--EXPECT--
-okey
@@ -1,21 +0,0 @@
--TEST--
-Bug #69467 (Wrong checked for the interface by using Trait)
--FILE--
-<?php
-interface Baz {
-    public function bad();
-}
-
-trait Bar{
-    protected function bad(){}
-}
-
-class Foo implements Baz{
-    use Bar;
-}
-
-$test = new Foo();
-var_dump($test instanceof Baz);
-?>
--EXPECTF--
-Fatal error: Access level to Bar::bad() must be public (as in class Baz) in %sbug69467.php on line %d
@@ -1,22 +0,0 @@
--TEST--
-Bug #69419: Returning compatible sub generator produces a warning
--FILE--
-<?php
-
-function & genRefInner() {
-    $var = 1;
-    yield $var;
-}
-
-function & genRefOuter() {
-    return genRefInner();
-}
-
-foreach(genRefOuter() as $i) {
-    var_dump($i);
-}
-
-?>
--EXPECTF--
-Notice: Only variable references should be returned by reference in %s on line %d
-int(1)
@@ -3,8 +3,6 @@
 --FILE--
 <?php
 use A;
-use \B;
 --EXPECTF--
 Warning: The use statement with non-compound name 'A' has no effect in %sns_033.php on line 2

-Warning: The use statement with non-compound name 'B' has no effect in %sns_033.php on line 3
@@ -1,31 +0,0 @@
--TEST--
-Bug #65576 (Constructor from trait conflicts with inherited constructor)
--FILE--
-<?php
-
-trait T
-{
-  public function __construct()
-  {
-    echo "Trait contructor\n";
-  }
-}
-
-class A
-{
-  public function __construct()
-  {
-    echo "Parent constructor\n";
-  }
-}
-
-class B extends A
-{
-  use T;
-}
-
-new B();
-
--EXPECT--
-Trait contructor
-
@@ -1,33 +0,0 @@
--TEST--
-Bug #65576 (Constructor from trait conflicts with inherited constructor)
--FILE--
-<?php
-
-trait T
-{
-  public function __construct()
-  {
-    parent::__construct();
-    echo "Trait contructor\n";
-  }
-}
-
-class A
-{
-  public function __construct()
-  {
-    echo "Parent constructor\n";
-  }
-}
-
-class B extends A
-{
-  use T;
-}
-
-new B();
-
--EXPECT--
-Parent constructor
-Trait contructor
-
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -128,7 +128,7 @@ ZEND_API zval zval_used_for_init; /* True global variable */
 /* version information */
 static char *zend_version_info;
 static uint zend_version_info_length;
-#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2015 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2014 Zend Technologies\n"
 #define PRINT_ZVAL_INDENT 4

 static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object TSRMLS_DC) /* {{{ */
@@ -817,22 +817,11 @@ void zend_shutdown(TSRMLS_D) /* {{{ */
 {
 #ifdef ZEND_SIGNALS
 	zend_signal_shutdown(TSRMLS_C);
+#endif
+#ifdef ZEND_WIN32
+	zend_shutdown_timeout_thread();
 #endif
 	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
-
-	if (EG(active))
-	{
-		/*
-		 * The order of destruction is important here.
-		 * See bugs #65463 and 66036.
-		 */
-		zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) zend_cleanup_function_data_full TSRMLS_CC);
-		zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) zend_cleanup_user_class_data TSRMLS_CC);
-		zend_cleanup_internal_classes(TSRMLS_C);
-		zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) clean_non_persistent_function_full TSRMLS_CC);
-		zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) clean_non_persistent_class_full TSRMLS_CC);
-	}
-
 	zend_destroy_modules();

 	virtual_cwd_deactivate(TSRMLS_C);
@@ -898,7 +887,7 @@ ZEND_API void _zend_bailout(char *filename, uint lineno) /* {{{ */
 /* }}} */
 END_EXTERN_C()

-ZEND_API void zend_append_version_info(const zend_extension *extension) /* {{{ */
+void zend_append_version_info(const zend_extension *extension) /* {{{ */
 {
 	char *new_info;
 	uint new_info_length;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2499,7 +2499,7 @@ ZEND_API void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */
 /* }}} */

 /* return the next free module number */
-ZEND_API int zend_next_free_module(void) /* {{{ */
+int zend_next_free_module(void) /* {{{ */
 {
 	return zend_hash_num_elements(&module_registry) + 1;
 }
@@ -2635,15 +2635,18 @@ ZEND_API ZEND_FUNCTION(display_disabled_function)
 }
 /* }}} */

+static zend_function_entry disabled_function[] = {
+	ZEND_FE(display_disabled_function,			NULL)
+	ZEND_FE_END
+};
+
 ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /* {{{ */
 {
-	zend_internal_function *func;
-	if (zend_hash_find(CG(function_table), function_name, function_name_length+1, (void **)&func)==SUCCESS) {
-		func->arg_info = NULL;
-		func->handler = ZEND_FN(display_disabled_function);
-		return SUCCESS;
+	if (zend_hash_del(CG(function_table), function_name, function_name_length+1)==FAILURE) {
+		return FAILURE;
 	}
-	return FAILURE;
+	disabled_function[0].fname = function_name;
+	return zend_register_functions(NULL, disabled_function, CG(function_table), MODULE_PERSISTENT TSRMLS_CC);
 }
 /* }}} */

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -233,7 +233,7 @@ typedef struct _zend_fcall_info_cache {

 #define ZEND_FCI_INITIALIZED(fci) ((fci).size != 0)

-ZEND_API int zend_next_free_module(void);
+int zend_next_free_module(void);

 BEGIN_EXTERN_C()
 ZEND_API int zend_get_parameters(int ht, int param_count, ...);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -984,7 +984,7 @@ static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
 	int has_context = 0;

 	if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
-		/* Could mean that the key container does not exist, let try
+		/* Could mean that the key container does not exist, let try 
 		   again by asking for a new one */
 		if (GetLastError() == NTE_BAD_KEYSET) {
 			if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
@@ -1348,7 +1348,7 @@ static int zend_mm_check_ptr(zend_mm_heap *heap, void *ptr, int silent ZEND_FILE
 	}
 	if (!silent) {
 		TSRMLS_FETCH();
-
+		
 		zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC);
 		zend_debug_alloc_output("---------------------------------------\n");
 		zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr);
@@ -2175,7 +2175,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
 #if ZEND_MM_CACHE
 	if (ZEND_MM_SMALL_SIZE(true_size)) {
 		size_t index = ZEND_MM_BUCKET_INDEX(true_size);
-
+		
 		if (heap->cache[index] != NULL) {
 			zend_mm_free_block *best_fit;
 			zend_mm_free_block **cache;
@@ -2188,7 +2188,7 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
 			heap->cache[index] = best_fit->prev_free_block;
 			ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
 			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
-
+	
 			ptr = ZEND_MM_DATA_OF(best_fit);

 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
@@ -2470,7 +2470,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 	     : "%0"(res),
 	       "rm"(size),
 	       "rm"(offset));
-
+	
 	if (UNEXPECTED(overflow)) {
 		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
 		return 0;
@@ -2619,7 +2619,7 @@ ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LI

 ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
-	size_t length;
+	int length;
 	char *p;
 #ifdef ZEND_SIGNALS
 	TSRMLS_FETCH();
@@ -2627,13 +2627,13 @@ ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

 	HANDLE_BLOCK_INTERRUPTIONS();

-	length = strlen(s);
-	p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	length = strlen(s)+1;
+	p = (char *) _emalloc(length ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
 	}
-	memcpy(p, s, length+1);
+	memcpy(p, s, length);
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	return p;
 }
@@ -2647,7 +2647,7 @@ ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC ZEND_FILE_

 	HANDLE_BLOCK_INTERRUPTIONS();

-	p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	p = (char *) _emalloc(length+1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
@@ -2668,7 +2668,7 @@ ZEND_API char *zend_strndup(const char *s, uint length)

 	HANDLE_BLOCK_INTERRUPTIONS();

-	p = (char *) malloc(safe_address(length, 1, 1));
+	p = (char *) malloc(length+1);
 	if (UNEXPECTED(p == NULL)) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return p;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -443,7 +443,6 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent

 	closure->func = *func;
 	closure->func.common.prototype = NULL;
-	closure->func.common.fn_flags |= ZEND_ACC_CLOSURE;

 	if ((scope == NULL) && (this_ptr != NULL)) {
 		/* use dummy scope if we're binding an object without specifying a scope */
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -1931,11 +1931,8 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 			if (class_type->u.constant.type == IS_ARRAY) {
 				cur_arg_info->type_hint = IS_ARRAY;
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
 						cur_arg_info->allow_null = 1;
-					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
-						/* delay constant resolution and check to run-time */
-						cur_arg_info->allow_null = 0;
 					} else if (Z_TYPE(initialization->u.constant) != IS_ARRAY) {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with array type hint can only be an array or NULL");
 					}
@@ -1943,11 +1940,8 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 			} else if (class_type->u.constant.type == IS_CALLABLE) {
 				cur_arg_info->type_hint = IS_CALLABLE;
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
 						cur_arg_info->allow_null = 1;
-					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
-						/* delay constant resolution and check to run-time */
-						cur_arg_info->allow_null = 0;
 					} else {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with callable type hint can only be NULL");
 					}
@@ -1961,11 +1955,8 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 				cur_arg_info->class_name = Z_STRVAL(class_type->u.constant);
 				cur_arg_info->class_name_len = Z_STRLEN(class_type->u.constant);
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
 						cur_arg_info->allow_null = 1;
-					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
-						/* delay constant resolution and check to run-time */
-						cur_arg_info->allow_null = 0;
 					} else {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with a class type hint can only be NULL");
 					}
@@ -2214,12 +2205,6 @@ void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static
 			if (!CG(active_class_entry)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot access self::class when no class scope is active");
 			}
-			if (CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) {
-				constant_name.op_type = IS_CONST;
-				ZVAL_STRINGL(&constant_name.u.constant, "class", sizeof("class")-1, 1);
-				zend_do_fetch_constant(result, class_name, &constant_name, ZEND_RT, 1 TSRMLS_CC);
-				break;
-			}
 			zval_dtor(&class_name->u.constant);
 			class_name->op_type = IS_CONST;
 			ZVAL_STRINGL(&class_name->u.constant, CG(active_class_entry)->name, CG(active_class_entry)->name_length, 1);
@@ -3273,7 +3258,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 	 * go through all the parameters of the function and not just those present in the
 	 * prototype. */
 	num_args = proto->common.num_args;
-	if ((proto->common.fn_flags & ZEND_ACC_VARIADIC)
+	if ((fe->common.fn_flags & ZEND_ACC_VARIADIC)
 		&& fe->common.num_args > proto->common.num_args) {
 		num_args = fe->common.num_args;
 	}
@@ -3979,7 +3964,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 	if (!strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
 		ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE;
 	} else if (!strncmp(mname, ZEND_CONSTRUCTOR_FUNC_NAME, mname_len)) {
-		if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
+		if (ce->constructor) {
 			zend_error_noreturn(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 		}
 		ce->constructor = fe; fe->common.fn_flags |= ZEND_ACC_CTOR;
@@ -4006,7 +3991,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 		zend_str_tolower_copy(lowercase_name, ce->name, ce->name_length);
 		lowercase_name = (char*)zend_new_interned_string(lowercase_name, ce->name_length + 1, 1 TSRMLS_CC);
 		if (!memcmp(mname, lowercase_name, mname_len)) {
-			if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
+			if (ce->constructor) {
 				zend_error_noreturn(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 			}
 			ce->constructor = fe;
@@ -4051,8 +4036,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 			}
 			zend_hash_quick_update(*overriden, arKey, nKeyLength, h, fn, sizeof(zend_function), (void**)&fn);
 			return;
-		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT &&
-				(existing_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) == 0) {
+		} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
 			/* Make sure the trait method is compatible with previosly declared abstract method */
 			if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s",
@@ -4082,7 +4066,6 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 			/* inherited members are overridden by members inserted by traits */
 			/* check whether the trait method fulfills the inheritance requirements */
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
-			fn->common.prototype = NULL;
 		}
 	}

@@ -4213,7 +4196,6 @@ static void zend_check_trait_usage(zend_class_entry *ce, zend_class_entry *trait
 static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* {{{ */
 {
 	size_t i, j = 0;
-	zend_trait_precedence **precedences;
 	zend_trait_precedence *cur_precedence;
 	zend_trait_method_reference *cur_method_ref;
 	char *lcname;
@@ -4222,9 +4204,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 	/* resolve class references */
 	if (ce->trait_precedences) {
 		i = 0;
-		precedences = ce->trait_precedences;
-		ce->trait_precedences = NULL;
-		while ((cur_precedence = precedences[i])) {
+		while ((cur_precedence = ce->trait_precedences[i])) {
 			/** Resolve classes for all precedence operations. */
 			if (cur_precedence->exclude_from_classes) {
 				cur_method_ref = cur_precedence->trait_method;
@@ -4266,8 +4246,8 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*

 					/* make sure that the trait method is not from a class mentioned in
 					 exclude_from_classes, for consistency */
-					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[j]) {
-						zend_error(E_COMPILE_ERROR,
+					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[i]) {
+						zend_error_noreturn(E_COMPILE_ERROR,
 								   "Inconsistent insteadof definition. "
 								   "The method %s is to be used from %s, but %s is also on the exclude list",
 								   cur_method_ref->method_name,
@@ -4281,7 +4261,6 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 			}
 			i++;
 		}
-		ce->trait_precedences = precedences;
 	}

 	if (ce->trait_aliases) {
@@ -4349,20 +4328,16 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{
 	for (i = 0; i < ce->num_traits; i++) {
 		if (ce->trait_precedences) {
 			HashTable exclude_table;
-			zend_trait_precedence **precedences;

 			/* TODO: revisit this start size, may be its not optimal */
 			zend_hash_init_ex(&exclude_table, 2, NULL, NULL, 0, 0);

-			precedences = ce->trait_precedences;
-			ce->trait_precedences = NULL;
-			zend_traits_compile_exclude_table(&exclude_table, precedences, ce->traits[i]);
+			zend_traits_compile_exclude_table(&exclude_table, ce->trait_precedences, ce->traits[i]);

 			/* copies functions, applies defined aliasing, and excludes unused trait methods */
 			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, &exclude_table);

 			zend_hash_destroy(&exclude_table);
-			ce->trait_precedences = precedences;
 		} else {
 			zend_hash_apply_with_arguments(&ce->traits[i]->function_table TSRMLS_CC, (apply_func_args_t)zend_traits_copy_functions, 3, ce, &overriden, NULL);
 		}
@@ -4370,17 +4345,6 @@ static void zend_do_traits_method_binding(zend_class_entry *ce TSRMLS_DC) /* {{{

    zend_hash_apply_with_argument(&ce->function_table, (apply_func_arg_t)zend_fixup_trait_method, ce TSRMLS_CC);

-	if (ce->trait_precedences) {
-		i = 0;
-		while (ce->trait_precedences[i]) {
-			if (ce->trait_precedences[i]->exclude_from_classes) {
-				efree(ce->trait_precedences[i]->exclude_from_classes);
-				ce->trait_precedences[i]->exclude_from_classes = NULL;
-			}
-			i++;
-		}
-	}
-
 	if (overriden) {
 		zend_hash_destroy(overriden);
 		FREE_HASHTABLE(overriden);
@@ -6373,15 +6337,6 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
 		/* save the location of FETCH_W instruction(s) */
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
 		zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC);
-
-		if (zend_is_function_or_method_call(array)) {
-			opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-			opline->opcode = ZEND_SEPARATE;
-			SET_NODE(opline->op1, array);
-			SET_UNUSED(opline->op2);
-			opline->result_type = IS_VAR;
-			opline->result.var = opline->op1.var;
-		}
 	} else {
 		is_variable = 0;
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
@@ -7143,7 +7098,7 @@ void zend_do_begin_namespace(const znode *name, zend_bool with_bracket TSRMLS_DC
 }
 /* }}} */

-void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	char *lcname;
 	zval *name, *ns, tmp;
@@ -7170,7 +7125,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 			ZVAL_STRING(name, p+1, 1);
 		} else {
 			ZVAL_ZVAL(name, ns, 1, 0);
-			warn = !CG(current_namespace);
+			warn = !is_global && !CG(current_namespace);
 		}
 	}

@@ -7226,7 +7181,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 }
 /* }}} */

-void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC) /* {{{ */
+void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC) /* {{{ */
 {
 	char *lookup_name;
 	zval *name, *ns, tmp;
@@ -7247,7 +7202,7 @@ void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zen
 			ZVAL_STRING(name, p+1, 1);
 		} else {
 			ZVAL_ZVAL(name, ns, 1, 0);
-			warn = !CG(current_namespace);
+			warn = !is_global && !CG(current_namespace);
 		}
 	}

@@ -7311,25 +7266,25 @@ void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zen
 }
 /* }}} */

-void zend_do_use_function(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use_function(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	if (!CG(current_import_function)) {
 		CG(current_import_function) = emalloc(sizeof(HashTable));
 		zend_hash_init(CG(current_import_function), 0, NULL, ZVAL_PTR_DTOR, 0);
 	}

-	zend_do_use_non_class(ns_name, new_name, 1, 0, CG(current_import_function), CG(function_table) TSRMLS_CC);
+	zend_do_use_non_class(ns_name, new_name, is_global, 1, 0, CG(current_import_function), CG(function_table) TSRMLS_CC);
 }
 /* }}} */

-void zend_do_use_const(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
+void zend_do_use_const(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /* {{{ */
 {
 	if (!CG(current_import_const)) {
 		CG(current_import_const) = emalloc(sizeof(HashTable));
 		zend_hash_init(CG(current_import_const), 0, NULL, ZVAL_PTR_DTOR, 0);
 	}

-	zend_do_use_non_class(ns_name, new_name, 0, 1, CG(current_import_const), &CG(const_filenames) TSRMLS_CC);
+	zend_do_use_non_class(ns_name, new_name, is_global, 0, 1, CG(current_import_const), &CG(const_filenames) TSRMLS_CC);
 }
 /* }}} */

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -651,10 +651,10 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM
 void zend_do_begin_namespace(const znode *name, zend_bool with_brackets TSRMLS_DC);
 void zend_do_end_namespace(TSRMLS_D);
 void zend_verify_namespace(TSRMLS_D);
-void zend_do_use(znode *name, znode *new_name TSRMLS_DC);
-void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC);
-void zend_do_use_function(znode *name, znode *new_name TSRMLS_DC);
-void zend_do_use_const(znode *name, znode *new_name TSRMLS_DC);
+void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC);
+void zend_do_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function, zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC);
+void zend_do_use_function(znode *name, znode *new_name, int is_global TSRMLS_DC);
+void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC);
 void zend_do_end_compilation(TSRMLS_D);
 void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC);

@@ -686,8 +686,6 @@ ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC);
 ZEND_API void zend_cleanup_internal_classes(TSRMLS_D);
 ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
 ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC);
-ZEND_API int clean_non_persistent_function_full(zend_function *function TSRMLS_DC);
-ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC);

 ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
 ZEND_API void zend_function_dtor(zend_function *function);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -587,14 +587,10 @@ ZEND_METHOD(exception, getTraceAsString)

 	DEFAULT_0_PARAMS;
 	
-	trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
-	if (Z_TYPE_P(trace) != IS_ARRAY) {
-		RETURN_FALSE;
-	}
-
 	res = estrdup("");
 	str = &res;

+	trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
 	zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);

 	s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -608,22 +608,7 @@ ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend
 	return 0;
 }

-static int is_null_constant(zval *default_value TSRMLS_DC)
-{
-	if (IS_CONSTANT_TYPE(Z_TYPE_P(default_value))) {
-		zval constant = *default_value;
-		zval *constant_ptr = &constant;
-
-		zval_update_constant(&constant_ptr, 0 TSRMLS_CC);
-		if (Z_TYPE(constant) == IS_NULL) {
-			return 1;
-		}
-		zval_dtor(&constant);
-	}
-	return 0;
-}
-
-static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, ulong fetch_type, zval *default_value TSRMLS_DC)
+static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, ulong fetch_type TSRMLS_DC)
 {
 	zend_arg_info *cur_arg_info;
 	char *need_msg;
@@ -653,7 +638,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 			if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) {
 				return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name TSRMLS_CC);
 			}
-		} else if (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC)))) {
+		} else if (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null) {
 			need_msg = zend_verify_arg_class_kind(cur_arg_info, fetch_type, &class_name, &ce TSRMLS_CC);
 			return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "" TSRMLS_CC);
 		}
@@ -664,7 +649,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", "none", "" TSRMLS_CC);
 				}

-				if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC))))) {
+				if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "" TSRMLS_CC);
 				}
 				break;
@@ -673,7 +658,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 				if (!arg) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", "none", "" TSRMLS_CC);
 				}
-				if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC))))) {
+				if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "" TSRMLS_CC);
 				}
 				break;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -364,6 +364,13 @@ void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC);

 ZEND_API void zend_fetch_dimension_by_zval(zval **result, zval *container, zval *dim TSRMLS_DC);

+#ifdef ZEND_WIN32
+void zend_init_timeout_thread(void);
+void zend_shutdown_timeout_thread(void);
+#define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
+#define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
+#endif
+
 #define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
 #define zendi_zval_dtor(p) zval_dtor(&(p))

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -46,10 +46,13 @@ ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0
 ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL };

 #ifdef ZEND_WIN32
-#ifdef ZTS
-__declspec(thread)
-#endif
-HANDLE tq_timer = NULL;
+#include <process.h>
+static WNDCLASS wc;
+static HWND timeout_window;
+static HANDLE timeout_thread_event;
+static HANDLE timeout_thread_handle;
+static DWORD timeout_thread_id;
+static int timeout_thread_initialized=0;
 #endif

 #if 0&&ZEND_DEBUG
@@ -106,7 +109,7 @@ static int clean_non_persistent_function(zend_function *function TSRMLS_DC) /* {
 }
 /* }}} */

-ZEND_API int clean_non_persistent_function_full(zend_function *function TSRMLS_DC) /* {{{ */
+static int clean_non_persistent_function_full(zend_function *function TSRMLS_DC) /* {{{ */
 {
 	return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
 }
@@ -118,7 +121,7 @@ static int clean_non_persistent_class(zend_class_entry **ce TSRMLS_DC) /* {{{ */
 }
 /* }}} */

-ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {{{ */
+static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {{{ */
 {
 	return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
 }
@@ -1231,19 +1234,111 @@ ZEND_API void zend_timeout(int dummy) /* {{{ */
 /* }}} */

 #ifdef ZEND_WIN32
-VOID CALLBACK tq_timer_cb(PVOID arg, BOOLEAN timed_out)
+static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) /* {{{ */
 {
-	zend_bool *php_timed_out;
+	switch (message) {
+		case WM_DESTROY:
+			PostQuitMessage(0);
+			break;
+		case WM_REGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer, lParam is the timeout amount in seconds */
+			if (lParam == 0) {
+				KillTimer(timeout_window, wParam);
+			} else {
+#ifdef ZTS
+				void ***tsrm_ls;
+#endif
+				SetTimer(timeout_window, wParam, lParam*1000, NULL);
+#ifdef ZTS
+				tsrm_ls = ts_resource_ex(0, &wParam);
+				if (!tsrm_ls) {
+					/* shouldn't normally happen */
+					break;
+				}
+#endif
+				EG(timed_out) = 0;
+			}
+			break;
+		case WM_UNREGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer */
+			KillTimer(timeout_window, wParam);
+			break;
+		case WM_TIMER: {
+#ifdef ZTS
+				void ***tsrm_ls;

-	/* The doc states it'll be always true, however it theoretically
-		could be FALSE when the thread was signaled. */
-	if (!timed_out) {
+				tsrm_ls = ts_resource_ex(0, &wParam);
+				if (!tsrm_ls) {
+					/* Thread died before receiving its timeout? */
+					break;
+				}
+#endif
+				KillTimer(timeout_window, wParam);
+				EG(timed_out) = 1;
+			}
+			break;
+		default:
+			return DefWindowProc(hWnd, message, wParam, lParam);
+	}
+	return 0;
+}
+/* }}} */
+
+static unsigned __stdcall timeout_thread_proc(void *pArgs) /* {{{ */
+{
+	MSG message;
+
+	wc.style=0;
+	wc.lpfnWndProc = zend_timeout_WndProc;
+	wc.cbClsExtra=0;
+	wc.cbWndExtra=0;
+	wc.hInstance=NULL;
+	wc.hIcon=NULL;
+	wc.hCursor=NULL;
+	wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
+	wc.lpszMenuName=NULL;
+	wc.lpszClassName = "Zend Timeout Window";
+	if (!RegisterClass(&wc)) {
+		return -1;
+	}
+	timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
+	SetEvent(timeout_thread_event);
+	while (GetMessage(&message, NULL, 0, 0)) {
+		SendMessage(timeout_window, message.message, message.wParam, message.lParam);
+		if (message.message == WM_QUIT) {
+			break;
+		}
+	}
+	DestroyWindow(timeout_window);
+	UnregisterClass(wc.lpszClassName, NULL);
+	SetEvent(timeout_thread_handle);
+	return 0;
+}
+/* }}} */
+
+void zend_init_timeout_thread(void) /* {{{ */
+{
+	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+	timeout_thread_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
+	WaitForSingleObject(timeout_thread_event, INFINITE);
+}
+/* }}} */
+
+void zend_shutdown_timeout_thread(void) /* {{{ */
+{
+	if (!timeout_thread_initialized) {
 		return;
 	}
+	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);

-	php_timed_out = (zend_bool *)arg;
-	*php_timed_out = 1;
+	/* Wait for thread termination */
+	WaitForSingleObject(timeout_thread_handle, 5000);
+	CloseHandle(timeout_thread_handle);
+	timeout_thread_initialized = 0;
 }
+/* }}} */
+
 #endif

 /* This one doesn't exists on QNX */
@@ -1261,28 +1356,13 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 	if(!seconds) {
 		return;
 	}
-
-        /* Don't use ChangeTimerQueueTimer() as it will not restart an expired
-		timer, so we could end up with just an ignored timeout. Instead
-		delete and recreate. */
-	if (NULL != tq_timer) {
-		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
-			EG(timed_out) = 0;
-			tq_timer = NULL;
-			zend_error(E_ERROR, "Could not delete queued timer");
-			return;
-		}
-		tq_timer = NULL;
+	if (timeout_thread_initialized == 0 && InterlockedIncrement(&timeout_thread_initialized) == 1) {
+		/* We start up this process-wide thread here and not in zend_startup(), because if Zend
+		 * is initialized inside a DllMain(), you're not supposed to start threads from it.
+		 */
+		zend_init_timeout_thread();
 	}
-
-	/* XXX passing NULL means the default timer queue provided by the system is used */
-	if (!CreateTimerQueueTimer(&tq_timer, NULL, (WAITORTIMERCALLBACK)tq_timer_cb, (VOID*)&EG(timed_out), seconds*1000, 0, WT_EXECUTEONLYONCE)) {
-		EG(timed_out) = 0;
-		tq_timer = NULL;
-		zend_error(E_ERROR, "Could not queue new timer");
-		return;
-	}
-	EG(timed_out) = 0;
+	PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
 #else
 #	ifdef HAVE_SETITIMER
 	{
@@ -1324,16 +1404,9 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 void zend_unset_timeout(TSRMLS_D) /* {{{ */
 {
 #ifdef ZEND_WIN32
-	if (NULL != tq_timer) {
-		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
-			EG(timed_out) = 0;
-			tq_timer = NULL;
-			zend_error(E_ERROR, "Could not delete queued timer");
-			return;
-		}
-		tq_timer = NULL;
+	if(timeout_thread_initialized) {
+		PostThreadMessage(timeout_thread_id, WM_UNREGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) 0);
 	}
-	EG(timed_out) = 0;
 #else
 #	ifdef HAVE_SETITIMER
 	if (EG(timeout_seconds)) {
@@ -1583,12 +1656,15 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */
 				/*printf("Cache miss!  Initialized %x\n", EG(active_symbol_table));*/
 			}
 			ex->symbol_table = EG(active_symbol_table);
+
+			if (ex->op_array->this_var != -1 &&
+			    !*EX_CV_NUM(ex, ex->op_array->this_var) &&
+			    EG(This)) {
+			    *EX_CV_NUM(ex, ex->op_array->this_var) = (zval**)EX_CV_NUM(ex, ex->op_array->last_var + ex->op_array->this_var);
+				**EX_CV_NUM(ex, ex->op_array->this_var) = EG(This);
+ 			}
 			for (i = 0; i < ex->op_array->last_var; i++) {
 				if (*EX_CV_NUM(ex, i)) {
-					if (UNEXPECTED(**EX_CV_NUM(ex, i) == &EG(uninitialized_zval))) {
-						Z_DELREF(EG(uninitialized_zval));
-						ALLOC_INIT_ZVAL(**EX_CV_NUM(ex, i));
-					}
 					zend_hash_quick_update(EG(active_symbol_table),
 						ex->op_array->vars[i].name,
 						ex->op_array->vars[i].name_len + 1,
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -111,7 +111,7 @@ END_EXTERN_C()
 ZEND_API extern zend_llist zend_extensions;

 void zend_extension_dtor(zend_extension *extension);
-ZEND_API void zend_append_version_info(const zend_extension *extension);
+void zend_append_version_info(const zend_extension *extension);
 int zend_startup_extensions_mechanism(void);
 int zend_startup_extensions(void);
 void zend_shutdown_extensions(TSRMLS_D);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -21,8 +21,6 @@
 #ifndef ZEND_FLOAT_H
 #define ZEND_FLOAT_H

-BEGIN_EXTERN_C()
-
 /*
  Define functions for FP initialization and de-initialization.
 */
@@ -30,8 +28,6 @@ extern ZEND_API void zend_init_fpu(TSRMLS_D);
 extern ZEND_API void zend_shutdown_fpu(TSRMLS_D);
 extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D);

-END_EXTERN_C()
-
 /* Copy of the contents of xpfpa.h (which is under public domain)
   See http://wiki.php.net/rfc/rounding for details.

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -147,6 +147,8 @@ ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC)
 	GC_BENCH_INC(zval_possible_root);

 	if (GC_ZVAL_GET_COLOR(zv) != GC_PURPLE) {
+		GC_ZVAL_SET_PURPLE(zv);
+
 		if (!GC_ZVAL_ADDRESS(zv)) {
 			gc_root_buffer *newRoot = GC_G(unused);

@@ -157,6 +159,7 @@ ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC)
 				GC_G(first_unused)++;
 			} else {
 				if (!GC_G(gc_enabled)) {
+					GC_ZVAL_SET_BLACK(zv);
 					return;
 				}
 				zv->refcount__gc++;
@@ -166,10 +169,10 @@ ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC)
 				if (!newRoot) {
 					return;
 				}
+				GC_ZVAL_SET_PURPLE(zv);
 				GC_G(unused) = newRoot->prev;
 			}

-			GC_ZVAL_SET_PURPLE(zv);
 			newRoot->next = GC_G(roots).next;
 			newRoot->prev = &GC_G(roots);
 			GC_G(roots).next->prev = newRoot;
@@ -200,6 +203,7 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC)

 	obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(zv)].bucket.obj;
 	if (GC_GET_COLOR(obj->buffered) != GC_PURPLE) {
+		GC_SET_PURPLE(obj->buffered);
 		if (!GC_ADDRESS(obj->buffered)) {
 			gc_root_buffer *newRoot = GC_G(unused);

@@ -210,6 +214,7 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC)
 				GC_G(first_unused)++;
 			} else {
 				if (!GC_G(gc_enabled)) {
+					GC_ZVAL_SET_BLACK(zv);
 					return;
 				}
 				zv->refcount__gc++;
@@ -220,10 +225,10 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC)
 					return;
 				}
 				obj = &EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(zv)].bucket.obj;
+				GC_SET_PURPLE(obj->buffered);
 				GC_G(unused) = newRoot->prev;
 			}

-			GC_SET_PURPLE(obj->buffered);
 			newRoot->next = GC_G(roots).next;
 			newRoot->prev = &GC_G(roots);
 			GC_G(roots).next->prev = newRoot;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -605,9 +605,9 @@ ZEND_METHOD(Generator, __wakeup)

 static void zend_generator_iterator_dtor(zend_object_iterator *iterator TSRMLS_DC) /* {{{ */
 {
-	zend_generator_iterator *iter = (zend_generator_iterator *) iterator;
+	zval *object = ((zend_generator_iterator *) iterator)->object;

-	zend_objects_store_del_ref_by_handle(iter->handle TSRMLS_CC);
+	zval_ptr_dtor(&object);
 }
 /* }}} */

@@ -699,8 +699,8 @@ zend_object_iterator *zend_generator_get_iterator(zend_class_entry *ce, zval *ob

 	/* We have to keep a reference to the generator object zval around,
 	 * otherwise the generator may be destroyed during iteration. */
-	iterator->handle = Z_OBJ_HANDLE_P(object);
-	zend_objects_store_add_ref_by_handle(iterator->handle TSRMLS_CC);
+	Z_ADDREF_P(object);
+	iterator->object = object;

 	return (zend_object_iterator *) iterator;
 }
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -28,9 +28,9 @@ extern ZEND_API zend_class_entry *zend_ce_generator;
 typedef struct _zend_generator_iterator {
 	zend_object_iterator intern;

-	/* The generator object handle has to be stored, because the
-	 * iterator is holding a ref to it, which has to be dtored. */
-	zend_object_handle handle;
+	/* The generator object zval has to be stored, because the iterator is
+	 * holding a ref to it, which has to be dtored. */
+	zval *object;
 } zend_generator_iterator;

 typedef struct _zend_generator {
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -283,7 +283,7 @@ struct _zend_ini_scanner_globals {
 	char *filename;
 	int lineno;

-	/* Modes are: ZEND_INI_SCANNER_NORMAL, ZEND_INI_SCANNER_RAW, ZEND_INI_SCANNER_TYPED */
+	/* Modes are: ZEND_INI_SCANNER_NORMAL, ZEND_INI_SCANNER_RAW */
 	int scanner_mode;
 };

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -1269,9 +1269,6 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const

 		if (key_type == HASH_KEY_IS_LONG) {
 			p->h = num_index;
-			if ((long)num_index >= (long)ht->nNextFreeElement) {
-				ht->nNextFreeElement = num_index < LONG_MAX ? num_index + 1 : LONG_MAX;
-			}
 		} else {
 			p->h = h;
 			p->nKeyLength = str_length;
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -3,7 +3,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -29,10 +29,6 @@
 #include "zend_ini_scanner.h"
 #include "zend_extensions.h"

-#ifdef PHP_WIN32
-#include "win32/syslog.h"
-#endif
-
 #define YYERROR_VERBOSE
 #define YYSTYPE zval

@@ -183,9 +179,10 @@ static void ini_error(char *msg)

 	if (CG(ini_parser_unbuffered_errors)) {
 #ifdef PHP_WIN32
-		syslog(LOG_ALERT, "PHP: %s (%s)", error_buf, GetCommandLine());
-#endif
+		MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L);
+#else
 		fprintf(stderr, "PHP:  %s", error_buf);
+#endif
 	} else {
 		zend_error(E_WARNING, "%s", error_buf);
 	}
@@ -268,7 +265,6 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 %token TC_QUOTED_STRING
 %token BOOL_TRUE
 %token BOOL_FALSE
-%token NULL_NULL
 %token END_OF_LINE
 %token '=' ':' ',' '.' '"' '\'' '^' '+' '-' '/' '*' '%' '$' '~' '<' '>' '?' '@' '{' '}'
 %left '|' '&' '^'
@@ -295,7 +291,7 @@ statement:
 #endif
 			ZEND_INI_PARSER_CB(&$1, &$3, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC);
 			free(Z_STRVAL($1));
-			zval_internal_dtor(&$3);
+			free(Z_STRVAL($3));
 		}
 	|	TC_OFFSET option_offset ']' '=' string_or_value {
 #if DEBUG_CFG_PARSER
@@ -304,7 +300,7 @@ statement:
 			ZEND_INI_PARSER_CB(&$1, &$5, &$2, ZEND_INI_PARSER_POP_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC);
 			free(Z_STRVAL($1));
 			free(Z_STRVAL($2));
-			zval_internal_dtor(&$5);
+			free(Z_STRVAL($5));
 		}
 	|	TC_LABEL	{ ZEND_INI_PARSER_CB(&$1, NULL, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC); free(Z_STRVAL($1)); }
 	|	END_OF_LINE
@@ -319,7 +315,6 @@ string_or_value:
 		expr							{ $$ = $1; }
 	|	BOOL_TRUE						{ $$ = $1; }
 	|	BOOL_FALSE						{ $$ = $1; }
-	|	NULL_NULL						{ $$ = $1; }
 	|	END_OF_LINE						{ zend_ini_init_string(&$$); }
 ;

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -25,7 +25,6 @@
 /* Scanner modes */
 #define ZEND_INI_SCANNER_NORMAL 0 /* Normal mode. [DEFAULT] */
 #define ZEND_INI_SCANNER_RAW    1 /* Raw mode. Option values are not parsed */
-#define ZEND_INI_SCANNER_TYPED  2 /* Typed mode. */

 BEGIN_EXTERN_C()
 int zend_ini_scanner_get_lineno(TSRMLS_D);
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -24,7 +24,6 @@

 #include <errno.h>
 #include "zend.h"
-#include "zend_API.h"
 #include "zend_globals.h"
 #include <zend_ini_parser.h>
 #include "zend_ini_scanner.h"
@@ -138,55 +137,9 @@ ZEND_API zend_ini_scanner_globals ini_scanner_globals;
 	Z_TYPE_P(retval) = IS_STRING;                \
 }

-#define RETURN_TOKEN(type, str, len) {                       \
-	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_TYPED) {      \
-		zend_ini_copy_typed_value(ini_lval, type, str, len); \
-	} else {                                                 \
-		zend_ini_copy_value(ini_lval, str, len);             \
-	}                                                        \
-	return type;                                             \
-}
-
-static inline int convert_to_number(zval *retval, const char *str, const int str_len)
-{
-	zend_uchar type;
-	int overflow;
-	long lval;
-	double dval;
-
-	if ((type = is_numeric_string_ex(str, str_len, &lval, &dval, 0, &overflow)) != 0) {
-		if (type == IS_LONG) {
-			ZVAL_LONG(retval, lval);
-			return SUCCESS;
-		} else if (type == IS_DOUBLE && !overflow) {
-			ZVAL_DOUBLE(retval, dval);
-			return SUCCESS;
-		}
-	}
-
-	return FAILURE;
-}
-
-static void zend_ini_copy_typed_value(zval *retval, const int type, const char *str, int len)
-{
-	switch (type) {
-		case BOOL_FALSE:
-		case BOOL_TRUE:
-			ZVAL_BOOL(retval, type == BOOL_TRUE);
-			break;
-
-		case NULL_NULL:
-			ZVAL_NULL(retval);
-			break;
-
-		case TC_NUMBER:
-			if (convert_to_number(retval, str, len) == SUCCESS) {
-				break;
-			}
-			/* intentional fall-through */
-		default:
-			zend_ini_copy_value(retval, str, len);
-	}
+#define RETURN_TOKEN(type, str, len) {           \
+	zend_ini_copy_value(ini_lval, str, len);     \
+	return type;                                 \
 }

 static void _yy_push_state(int new_state TSRMLS_DC)
@@ -219,7 +172,7 @@ static void yy_scan_buffer(char *str, unsigned int len TSRMLS_DC)
 static int init_ini_scanner(int scanner_mode, zend_file_handle *fh TSRMLS_DC)
 {
 	/* Sanity check */
-	if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW && scanner_mode != ZEND_INI_SCANNER_TYPED) {
+	if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW) {
 		zend_error(E_WARNING, "Invalid scanner mode");
 		return FAILURE;
 	}
@@ -469,14 +422,10 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }

-<INITIAL,ST_VALUE>("false"|"off"|"no"|"none"){TABS_AND_SPACES}* { /* FALSE value (when used outside option value/offset this causes parse error!)*/
+<INITIAL,ST_VALUE>("false"|"off"|"no"|"none"|"null"){TABS_AND_SPACES}* { /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }

-<INITIAL,ST_VALUE>("null"){TABS_AND_SPACES}* {
-	RETURN_TOKEN(NULL_NULL, "", 0);
-}
-
 <INITIAL>{LABEL} { /* Get option name */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -3,7 +3,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -255,10 +255,10 @@ use_declarations:
 ;

 use_declaration:
-		namespace_name 			{ zend_do_use(&$1, NULL TSRMLS_CC); }
-	|	namespace_name T_AS T_STRING	{ zend_do_use(&$1, &$3 TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2, &$4 TSRMLS_CC); }
+		namespace_name 			{ zend_do_use(&$1, NULL, 0 TSRMLS_CC); }
+	|	namespace_name T_AS T_STRING	{ zend_do_use(&$1, &$3, 0 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL, 1 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2, &$4, 1 TSRMLS_CC); }
 ;

 use_function_declarations:
@@ -267,10 +267,10 @@ use_function_declarations:
 ;

 use_function_declaration:
-		namespace_name 			{ zend_do_use_function(&$1, NULL TSRMLS_CC); }
-	|	namespace_name T_AS T_STRING	{ zend_do_use_function(&$1, &$3 TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name { zend_do_use_function(&$2, NULL TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use_function(&$2, &$4 TSRMLS_CC); }
+		namespace_name 			{ zend_do_use_function(&$1, NULL, 0 TSRMLS_CC); }
+	|	namespace_name T_AS T_STRING	{ zend_do_use_function(&$1, &$3, 0 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name { zend_do_use_function(&$2, NULL, 1 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use_function(&$2, &$4, 1 TSRMLS_CC); }
 ;

 use_const_declarations:
@@ -279,10 +279,10 @@ use_const_declarations:
 ;

 use_const_declaration:
-		namespace_name 			{ zend_do_use_const(&$1, NULL TSRMLS_CC); }
-	|	namespace_name T_AS T_STRING	{ zend_do_use_const(&$1, &$3 TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name { zend_do_use_const(&$2, NULL TSRMLS_CC); }
-	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use_const(&$2, &$4 TSRMLS_CC); }
+		namespace_name 			{ zend_do_use_const(&$1, NULL, 0 TSRMLS_CC); }
+	|	namespace_name T_AS T_STRING	{ zend_do_use_const(&$1, &$3, 0 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name { zend_do_use_const(&$2, NULL, 1 TSRMLS_CC); }
+	|	T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use_const(&$2, &$4, 1 TSRMLS_CC); }
 ;

 constant_declaration:
@@ -4,7 +4,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        | 
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | Zend Engine                                                          |
   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
   +----------------------------------------------------------------------+
   | This source file is subject to version 2.00 of the Zend license,     |
   | that is bundled with this package in the file LICENSE, and is        |
Author	SHA1	Message	Date
Ferenc Kovacs	fc1df8e7a6	removing the NEWS entry for #41631 as we reverted the fix for now	2014-08-27 15:31:35 +02:00
Ferenc Kovacs	030a84a3f0	Revert "Merge branch 'PHP-5.5' into PHP-5.6" This reverts commit `98e67add15`, reversing changes made to `2cdc1a2b74`.	2014-08-27 15:28:06 +02:00
Ferenc Kovacs	8553a9f10c	Revert "fix TS build" This reverts commit `84a4041ba4`.	2014-08-27 15:27:57 +02:00
Ferenc Kovacs	8a14180422	reworked NEWS for 5.6.0GA	2014-08-27 10:55:37 +02:00
Ferenc Kovacs	48a9cea762	update the GIT-RULES with the 5.6 and the release branches	2014-08-27 05:16:41 +02:00
Ferenc Kovacs	97f01febca	better heading for UPGRADING.INTERNALS	2014-08-27 05:16:23 +02:00
Ferenc Kovacs	d8db82231e	remove the -dev suffix from the Zend version	2014-08-27 05:15:58 +02:00
Tjerk Meesters	7db10e43ac	Some changes were lost in the merge commit of #66091	2014-08-27 05:10:34 +02:00
Ferenc Kovacs	5a1ff3bf50	bump versions to stable	2014-08-27 05:00:14 +02:00
Ferenc Kovacs	b0cb9341bd	add the final NEWS entry for 5.6.0	2014-08-27 04:56:51 +02:00
Remi Collet	d7d7d23fcf	Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597 Incomplete fix for CVE-2014-4049 Check possible buffer overflow - pass real buffer end to dn_expand calls - check buffer len before each read	2014-08-27 04:36:57 +02:00
Stanislav Malyshev	7325578bba	fix potentially missing NUL termination	2014-08-27 04:36:44 +02:00
Ferenc Kovacs	2c27515409	improve the grammar for my recent UPGRADING note	2014-08-27 04:35:23 +02:00
Ferenc Kovacs	4b3de4dae1	mention the changes regarding ReflectionClass::newInstanceWithoutConstructor in UPGRADING see the discussion on the mailing list and in the pull request for details: https://github.com/php/php-src/pull/733	2014-08-27 04:35:12 +02:00
Remi Collet	77b09bfc35	Fix bug #67716 - Segfault in cdf.c	2014-08-27 04:31:44 +02:00
Lior Kaplan	b6a63b285c	Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>	2014-08-27 04:29:44 +02:00
Stanislav Malyshev	c9da6430d3	Fix bug #67730 - Null byte injection possible with imagexxx functions	2014-08-27 04:29:28 +02:00
Ferenc Kovacs	d18dd11cbd	Revert "Fixed Bug #67724 " This reverts commit `e4ff7f2ee3`.	2014-08-27 04:28:14 +02:00
Tjerk Meesters	e60d39581a	Fixed #67694 : Regression in session_regenerate_id()	2014-08-27 04:27:26 +02:00
Ferenc Kovacs	7ac17d0d79	bump to RC4	2014-08-14 02:54:13 +02:00
Ferenc Kovacs	b6aace4592	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (60 commits) new NEWS block for the next release Updated NEWS for #66091 Updated NEWS for #66091 Fixed #66091 updated NEWS updated NEWS updated NEWS backported the fix for bug #41577 fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) NEWS entry for `e6d93a1` / `d73d44c` restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 Revert "Merge branch 'pull-request/694' into PHP-5.6" Add __debugInfo() to UPGRADING. fix TS build Update NEWS Update NEWS Update NEWS Bug #41631: Observe socket read timeouts in SSL streams wrap int8_t and int16_t with #ifdef to avoid possible clashes ... Conflicts: NEWS	2014-08-14 02:24:20 +02:00
Ferenc Kovacs	cbfc5abc3f	bump to RC3	2014-07-30 11:52:04 +02:00
Ferenc Kovacs	d8116ee400	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (164 commits) add missing entry to NEWS add missing entries to NEWS add NEWS block for the next RC NEWS entry for #67713 update the exception message to better match the actual check ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct() Fixed usage after free Undo inadvertent commit of php_version Corrected patch for bug #60616 Wildcards should only be used in the first name component; fixed comment style Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields) fix SOAP for uninitialzed object fix NEWS Fix missing type checks in various functions Fix SPL objects initialization checks Add object initialization checks for sqlite3 classes Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg. update NEWS Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting) Fixed Bug #67538 (SPL Iterators use-after-free) ... Conflicts: NEWS	2014-07-30 11:50:47 +02:00
Ferenc Kovacs	2d4b95e0e2	bump the version to RC2	2014-07-02 02:23:22 +02:00
Ferenc Kovacs	a0be642ecf	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (70 commits) add some missing NEWS entries NEWS block for 5.6.0RC3 Fix ext/pgsql builds with libpq < 7.3. updated libs_version.txt updated libs_version.txt updated libmagic.patch in 5.6+ updated libmagic.patch Fixed possible crash because of race conditions on modifying constants in shared memory remove the NEWS entry for the reverted fpm fix remove the NEWS entry for the reverted fpm fix remove the NEWS entry for the reverted fpm fix Revert "Fix Bug #67530 error_log=syslog ignored" --enable-fpm for the travis build fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here NEWS NEWS Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0 adding NEWS entry for the fix for bug #65641 Updated NEWS file for recent phpdbg fixes Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent ... Conflicts: NEWS	2014-07-02 02:21:53 +02:00
Ferenc Kovacs	6c80e90e23	5.6.0RC1	2014-06-19 02:42:55 +02:00
Ferenc Kovacs	a4e23ef8a3	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (117 commits) add missing entry to NEWS add missing entry to NEWS add NEWS block for 5.6.0RC2 Add support for gb18030/MySQL 5.7 Fix another problem with MySQL 5.7 new test, missing in `ea466a3` Suppress test failure with MySQL 5.7 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 NEWS Fix Request #67453 Allow to unserialize empty data. Update copyright year to 2014 Update copyright year for re2c generated files Update copyright year to 2014 Update copyright year for re2c files as well Fix patch for bug #67436 ... Conflicts: NEWS	2014-06-19 02:42:32 +02:00
Ferenc Kovacs	69797e81ed	PHP-5.6.0beta4	2014-06-04 03:22:06 +02:00
Ferenc Kovacs	4ed1713789	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (51 commits) Fix tests Fix possible segfault depending on memory location... fix gcov data with some locales (again) Update NEWS Fixed startup segfault in non-debug builds Fixes issue #87 Fixed regression introduced by patch for bug #67072 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files (re)add cve number in NEWS, from 5.4.29 NEWS NEWS NEWS Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check add NEWS block for 5.6.0RC1 Update NEWs Update NEWs Fixed bug #67359 (Segfault in recursiveDirectoryIterator) Check for zero-length keys in spl_array_skip_protected and don't skip them. added CVEs in NEWS updated libmagic.patch for 5.6+ updated libmagic.patch for 5.4+ ... Conflicts: NEWS	2014-06-04 03:22:00 +02:00
Ferenc Kovacs	57e698d582	5.6.0beta3	2014-05-14 09:58:22 +02:00
Ferenc Kovacs	7e35e8b9ef	5.6.0beta3	2014-05-14 09:57:23 +02:00
Ferenc Kovacs	a2edb3e7e4	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (56 commits) adding NEWS block for beta4 5.4.30 next enable email notifications update NEWS update NEWS update NEWS - Updated to version 2014.3 (2014c) fix test - output can be chunked fix test Fixed test for commit `997be125eb` Add bug fix to NEWS Update UPGRADING according to bug fix improve CURL tests to allow testing without separate server Fixed bug #67199 mb_regex_encoding mishmash fix bug #67253: timelib_meridian_with_check out-of-bounds read Fix bug #67252: convert_uudecode out-of-bounds read Fix bug #67251 - date_parse_from_format out-of-bounds read Fix bug #67250 (iptcparse out-of-bounds read) Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow ... Conflicts: NEWS	2014-05-14 09:56:02 +02:00
Ferenc Kovacs	a964242f19	5.6.0beta2	2014-05-01 16:42:03 +02:00
Ferenc Kovacs	ce20287810	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (271 commits) one heading is enough add new NEWS block for alpha3 XFAIL the leaking multibyte tests, we should really get to the bottom of this Fixed numbering in UPGRADING file Updated NEWS for fixed phpdbg issue #85 Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85 add missing NEWS entry to the correct release where it was added 5.5.12 was released yesterday add missing NEWS entry to the correct release where it was added Updated NEWS entry for phpdbg add missing NEWS entry to the correct release where it was added add some missing NEWS entries fix test locality inconsitency BFN fix bug #64247 (CURLOPT_INFILE doesn't allow reset) Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros Fix bug #67060: use default mode of 660 separate travis jobs for debug and non-debug builds separate travis jobs for TS and NTS builds put this test back to XFAIL, as it was before, since it is still leaking memory ... Conflicts: NEWS	2014-05-01 16:40:20 +02:00
Ferenc Kovacs	11d102ebbc	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: fix typo fix typo fix typo	2014-04-10 07:11:48 +02:00
Ferenc Kovacs	eb44463e35	5.6.0beta1	2014-04-10 06:49:31 +02:00
Ferenc Kovacs	b3b1c0b63d	remove the beta2 news block as we don't need that in the release tag	2014-04-10 06:47:25 +02:00
Ferenc Kovacs	8871aa912f	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (240 commits) add a NEWS block for beta2 add missing entries to NEWS abstract namespace for unix sockets is a linux only feature Don't test for specific non-zero substr_compare() return value Add only_integer_keys option to zend_hash_reindex Don't always separate splice replacement array Add zend_hash_splice Add zend_hash_reindex Remove some usages of hashtable internals Updated NEWS fixed bug66702 : regexiterator's invert flag doesn't work as expected Updated NEWS for #67043 Fixed bug 67043 cleanup Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret updated libs versions fixed the test for ICI >= 52.1 Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions... add missing skip to the output, so we actually skip this test fix the test according to how new date code does it ...	2014-04-10 06:45:31 +02:00
Ferenc Kovacs	dae8ff251c	5.6.0alpha3	2014-02-27 02:36:56 +01:00
Ferenc Kovacs	79bfef5ba3	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (136 commits) fix tests broken by `633f898f15` add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry Deprecate CN_match in favor of peer_name in SSL contexts Remove cURL close policy related constants Update stack size in tests/func/010.phpt Don't add num_additional_args in SEND opcodes Disallow use of positional args after unpacking Store arg_num in fcall entry Introduce zend_function_call_entry structure move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged rearrange the NEWS blocks a bit add NEWS block for 5.6.0 beta1 restored that test part in ext/openssl to enable notify/wait remove echo fix stdin reading in new openssl tests ...	2014-02-27 02:35:58 +01:00
Ferenc Kovacs	326ab8b147	5.6.0alpha2	2014-02-12 09:45:18 +01:00
Ferenc Kovacs	99bd2fd9c4	Merge branch 'PHP-5.6' into PHP-5.6.0 * PHP-5.6: (97 commits) update the alpha2 release date Fixed ZTS and added fix to NEWS. Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too. Rename timelib_get_zone to timelib_parse_zone and export. fix regex to detect valgrind version New PCRE version got stricter fix regex to detect valgrind version New PCRE version got stricter Fixed memory leak in pow operator 5.5.9 now released Added information in NEWS and UPGRADING add T_POW (**) operator add NEWS block for 5.6.0alpha3 updated libs_version.txt updated libs_version.txt update libs_version.txt more tests for ICU >= 52.1 compat fix tests for ICU >= 52.1 Fix year adapt test to curl 7.35.0 upgrade move the NEWS entry into the right section Fixed SNI failure from missing Z_STRVAL_PP ...	2014-02-12 06:43:05 +01:00
Ferenc Kovacs	1f148f7ad9	Revert "5.6.0alpha1" This reverts commit `8648f76bac`.	2014-02-06 03:55:53 +01:00
Ferenc Kovacs	8648f76bac	5.6.0alpha1	2014-01-21 02:30:07 +01:00