Merge lp:~legolas/ubuntu/natty/php5/5.3.5 into lp:ubuntu/natty/php5

[Stas Verberkt]

Please note https://bugs.launchpad.net/ubuntu/+source/php5/+bug/708504

[Artur Rona (ari-tczew)]

Thank you for your time and efforts making Ubuntu better! However, we have php5 already merged from Debian.

review: Disapprove

Unmerged revisions

81. By Stas Verberkt on 2011-02-01

Deprecated mssql fix segfault patch.

80. By Stas Verberkt on 2011-02-01

Created PHP 5.3.5 including all patches

79. By Stas Verberkt on 2011-02-01

Inserted PHP 5.3.5.

=== modified file 'INSTALL'
--- INSTALL	2010-08-01 11:58:54 +0000
+++ INSTALL	2011-02-01 10:04:54 +0000
@@ -279,7 +279,15 @@
     it is your first install then you need to "make install" as well)
 
 13. cd ../php-5.x.y
-14. cp php.ini-dist /usr/local/lib/php.ini
+
+14. The PHP distribution provides two sample php.ini files, you can use them
+    by
+      cp php.ini-development /usr/local/lib/php.ini
+    or
+      cp php.ini-production  /usr/local/lib/php.ini
+
+    If you choose one of these php.ini files be certain to read the list
+    of changes within, as they affect how PHP behaves.
 
 15. You can edit /usr/local/lib/php.ini file to set PHP options.
     Edit your httpd.conf or srm.conf file and add:
@@ -451,15 +459,19 @@
 
 13. Setup your php.ini
 
-    cp php.ini-dist /usr/local/lib/php.ini
+    The PHP distribution provides two sample php.ini files, you can use them
+    by
+      cp php.ini-development /usr/local/lib/php.ini
+    or
+      cp php.ini-production  /usr/local/lib/php.ini
+
+    If you choose one of these php.ini files be certain to read the list
+    of changes within, as they affect how PHP behaves.
 
     You may edit your .ini file to set PHP options.  If you prefer having
     php.ini in another location, use --with-config-file-path=/some/path in
     step 10.
 
-    If you instead choose php.ini-recommended, be certain to read the list
-    of changes within, as they affect how PHP behaves.
-
 14. Edit your httpd.conf to load the PHP module.  The path on the right hand
     side of the LoadModule statement must point to the path of the PHP
     module on your system.  The make install from above may have already
@@ -858,7 +870,7 @@
    Example 2-6. OpenBSD Package Install Example
 # pkg_add php4-core-4.3.8.tgz
 # /usr/local/sbin/phpxs -s
-# cp /usr/local/share/doc/php4/php.ini-recommended /var/www/conf/php.ini
+# cp /usr/local/share/doc/php4/php.ini-development /var/www/conf/php.ini
   (add in mysql)
 # pkg_add php4-mysql-4.3.8.tgz
 # /usr/local/sbin/phpxs -a mysql
@@ -1242,10 +1254,10 @@
        back to the root of the Apache source directory and run the above
        configure command again. That'll bring the link table up to date.
        Run make and make install again.
-    7. Copy and rename the php.ini-dist file to your bin directory from
-       your PHP 4 source directory: cp php.ini-dist /usr/local/bin/php.ini
-       or (if your don't have a local directory) cp php.ini-dist
-       /usr/bin/php.ini.
+    7. Copy and rename the php.ini-development or php.ini-production file to
+       your bin directory from your PHP 4 source directory:
+       cp php.ini-development /usr/local/bin/php.ini or (if your don't have a
+       local directory) cp php.ini-development /usr/bin/php.ini.
      __________________________________________________________________
 
 Compiling for MacOS X Client
@@ -1735,8 +1747,8 @@
    example, set it with something like:
    --with-config-file-path=/etc
 
-   And then you would copy php.ini-dist from the distribution to
-   /etc/php.ini and edit it to make any local changes you want.
+   And then you would copy php.ini-development or php.ini-production from the
+   distribution to /etc/php.ini and edit it to make any local changes you want.
    --with-config-file-scan-dir=PATH
 
    On Windows the default path for the php.ini file is the Windows

=== modified file 'LICENSE'
--- LICENSE	2010-08-01 11:58:54 +0000
+++ LICENSE	2011-02-01 10:04:54 +0000
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
                   The PHP License, version 3.01
-Copyright (c) 1999 - 2009 The PHP Group. All rights reserved.
+Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without

=== modified file 'Makefile.global'
--- Makefile.global	2010-08-01 11:58:54 +0000
+++ Makefile.global	2011-02-01 10:04:54 +0000
@@ -98,6 +98,7 @@
 		TEST_PHP_SRCDIR=$(top_srcdir) \
 		CC="$(CC)" \
 			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+		rm $(top_builddir)/tmp-php.ini; \
 	else \
 		echo "ERROR: Cannot run tests without CLI sapi."; \
 	fi

=== modified file 'NEWS'
--- NEWS	2010-08-01 11:58:54 +0000
+++ NEWS	2011-02-01 10:04:54 +0000
@@ -1,5 +1,361 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+06 Jan 2011, PHP 5.3.5
+- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
+
+09 Dec 2010, PHP 5.3.4
+- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
+- Upgraded bundled PCRE to version 8.10. (Ilia)
+
+- Security enhancements:
+  . Fixed crash in zip extract method (possible CWE-170). 
+    (Maksymilian Arciemowicz, Pierre)
+  . Paths with NULL in them (foo\0bar.txt) are now considered as invalid. (Rasmus)
+  . Fixed a possible double free in imap extension (Identified by Mateusz 
+    Kocielski). (CVE-2010-4150). (Ilia)
+  . Fixed NULL pointer dereference in ZipArchive::getArchiveComment.
+    (CVE-2010-3709). (Maksymilian Arciemowicz)
+  . Fixed possible flaw in open_basedir (CVE-2010-3436). (Pierre)
+  . Fixed MOPS-2010-24, fix string validation. (CVE-2010-2950). (Pierre)
+  . Fixed symbolic resolution support when the target is a DFS share. (Pierre)
+  . Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with
+    large amount of data) (CVE-2010-3710). (Adam)
+
+- General improvements:
+  . Added stat support for zip stream. (Pierre)
+  . Added follow_location (enabled by default) option for the http stream 
+    support. (Pierre)
+  . Improved support for is_link and related functions on Windows. (Pierre)
+  . Added a 3rd parameter to get_html_translation_table. It now takes a charset
+    hint, like htmlentities et al. (Gustavo)
+ 
+- Implemented feature requests:
+  . Implemented FR #52348, added new constant ZEND_MULTIBYTE to detect
+    zend multibyte at runtime. (Kalle)
+  . Implemented FR #52173, added functions pcntl_get_last_error() and 
+     pcntl_strerror(). (nick dot telford at gmail dot com, Arnaud)
+  . Implemented symbolic links support for open_basedir checks. (Pierre)
+  . Implemented FR #51804, SplFileInfo::getLinkTarget on Windows. (Pierre)
+  . Implemented FR #50692, not uploaded files don't count towards
+    max_file_uploads limit. As a side improvement, temporary files are not opened
+    for empty uploads and, in debug mode, 0-length uploads. (Gustavo)
+    
+- Improved MySQLnd:
+  . Added new character sets to mysqlnd, which are available in MySQL 5.5
+    (Andrey)
+
+- Improved PHP-FPM SAPI:
+  . Added '-p/--prefix' to php-fpm to use a custom prefix and run multiple
+    instances. (fat)
+  . Added custom process title for FPM. (fat)
+  . Added '-t/--test' to php-fpm to check and validate FPM conf file. (fat)
+  . Added statistics about listening socket queue length for FPM.
+    (andrei dot nigmatulin at gmail dot com, fat)
+    
+- Core:
+  . Fixed extract() to do not overwrite $GLOBALS and $this when using
+    EXTR_OVERWRITE. (jorto at redhat dot com)
+  . Fixed bug in the Windows implementation of dns_get_record, where the two
+    last parameters wouldn't be filled unless the type were DNS_ANY (Gustavo).
+  . Changed the $context parameter on copy() to actually have an effect. (Kalle)
+  . Fixed htmlentities/htmlspecialchars accepting certain ill-formed UTF-8
+    sequences. (Gustavo)
+  . Fixed bug #53409 (sleep() returns NULL on Windows). (Pierre)
+  . Fixed bug #53319 (strip_tags() may strip '<br />' incorrectly). (Felipe)
+  . Fixed bug #53304 (quot_print_decode does not handle lower-case hex digits).
+    (Ilia, daniel dot mueller at inexio dot net)
+  . Fixed bug #53248 (rawurlencode RFC 3986 EBCDIC support misses tilde char).
+    (Justin Martin)  
+  . Fixed bug #53226 (file_exists fails on big filenames). (Adam)
+  . Fixed bug #53198 (changing INI setting "from" with ini_set did not have any
+    effect). (Gustavo)
+  . Fixed bug #53180 (post_max_size=0 not disabling the limit when the content
+    type is application/x-www-form-urlencoded or is not registered with PHP).
+    (gm at tlink dot de, Gustavo)
+  . Fixed bug #53141 (autoload misbehaves if called from closing session).
+    (ladislav at marek dot su)
+  . Fixed bug #53021 (In html_entity_decode, failure to convert numeric entities
+    with ENT_NOQUOTES and ISO-8859-1). Fixed and extended the fix of ENT_NOQUOTES 
+    in html_entity_decode that had introduced the bug (rev #185591) to other
+    encodings. Additionaly, html_entity_decode() now doesn't decode &#34; if
+    ENT_NOQUOTES is given. (Gustavo)
+  . Fixed bug #52931 (strripos not overloaded with function overloading enabled).
+    (Felipe)
+  . Fixed bug #52772 (var_dump() doesn't check for the existence of 
+    get_class_name before calling it). (Kalle, Gustavo)
+  . Fixed bug #52534 (var_export array with negative key). (Felipe)
+  . Fixed bug #52327 (base64_decode() improper handling of leading padding in
+    strict mode). (Ilia)
+  . Fixed bug #52260 (dns_get_record fails with non-existing domain on Windows).
+    (a_jelly_doughnut at phpbb dot com, Pierre)
+  . Fixed bug #50953 (socket will not connect to IPv4 address when the host has
+    both IPv4 and IPv6 addresses, on Windows). (Gustavo, Pierre)
+  . Fixed bug #50524 (proc_open on Windows does not respect cwd as it does on
+    other platforms). (Pierre)
+  . Fixed bug #49687 (utf8_decode vulnerabilities and deficiencies in the number
+    of reported malformed sequences). (CVE-2010-3870) (Gustavo)
+  . Fixed bug #49407 (get_html_translation_table doesn't handle UTF-8). (Gustavo)
+  . Fixed bug #48831 (php -i has different output to php --ini). (Richard, 
+    Pierre)
+  . Fixed bug #47643 (array_diff() takes over 3000 times longer than php 5.2.4).
+    (Felipe)
+  . Fixed bug #47168 (printf of floating point variable prints maximum of 40 
+    decimal places). (Ilia)
+  . Fixed bug #46587 (mt_rand() does not check that max is greater than min).
+    (Ilia)
+  . Fixed bug #29085 (bad default include_path on Windows). (Pierre)
+  . Fixed bug #25927 (get_html_translation_table calls the ' &#39; instead of
+    &#039;). (Gustavo)
+    
+- Zend engine:
+  . Reverted fix for bug #51176 (Static calling in non-static method behaves
+    like $this->). (Felipe)
+  . Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED. 
+    (Kalle)
+  . Fixed NULL dereference in lex_scan on zend multibyte builds where the script
+    had a flex incompatible encoding and there was no converter. (Gustavo)
+  . Fixed covariance of return-by-ref constraints. (Etienne)
+  . Fixed bug #53305 (E_NOTICE when defining a constant starts with
+    __COMPILER_HALT_OFFSET__). (Felipe)
+  . Fixed bug #52939 (zend_call_function does not respect ZEND_SEND_PREFER_REF).
+    (Dmitry)
+  . Fixed bug #52879 (Objects unreferenced in __get, __set, __isset or __unset
+    can be freed too early). (mail_ben_schmidt at yahoo dot com dot au, Dmitry)
+  . Fixed bug #52786 (PHP should reset section to [PHP] after ini sections).
+    (Fedora at famillecollet dot com)
+  . Fixed bug #52508 (newline problem with parse_ini_file+INI_SCANNER_RAW).
+    (Felipe)
+  . Fixed bug #52484 (__set() ignores setting properties with empty names).
+    (Felipe)
+  . Fixed bug #52361 (Throwing an exception in a destructor causes invalid
+    catching). (Dmitry)
+  . Fixed bug #51008 (Zend/tests/bug45877.phpt fails). (Dmitry)
+  
+- Build issues:
+  . Fixed bug #52436 (Compile error if systems do not have stdint.h)
+    (Sriram Natarajan)
+  . Fixed bug #50345 (nanosleep not detected properly on some solaris versions).
+    (Ulf, Tony)
+  . Fixed bug #49215 (make fails on glob_wrapper). (Felipe)
+
+- Calendar extension:
+  . Fixed bug #52744 (cal_days_in_month incorrect for December 1 BCE).
+   (gpap at internet dot gr, Adam)
+    
+- cURL extension:
+  . Fixed bug #52828 (curl_setopt does not accept persistent streams).
+    (Gustavo, Ilia)
+  . Fixed bug #52827 (cURL leaks handle and causes assertion error
+    (CURLOPT_STDERR)). (Gustavo)
+  . Fixed bug #52202 (CURLOPT_PRIVATE gets corrupted). (Ilia)
+  . Fixed bug #50410 (curl extension slows down PHP on Windows). (Pierre)
+    
+- DateTime extension:
+  . Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return
+    1 million microsecs). (ped at 7gods dot org)
+  . Fixed bug #52668 (Iterating over a dateperiod twice is broken). (Derick)
+  . Fixed bug #52454 (Relative dates and getTimestamp increments by one day).
+    (Derick)
+  . Fixed bug #52430 (date_parse parse 24:xx:xx as valid time). (Derick)
+  . Added support for the ( and ) delimiters/separators to
+    DateTime::createFromFormat(). (Derick)
+
+- DBA extension:
+  . Added Berkeley DB 5.1 support to the DBA extension. (Oracle Corp.)
+
+- DOM extension:
+  . Fixed bug #52656 (DOMCdataSection does not work with splitText). (Ilia)
+
+- Filter extension:
+  . Fixed the filter extension accepting IPv4 octets with a leading 0 as that
+    belongs to the unsupported "dotted octal" representation. (Gustavo)
+  . Fixed bug #53236 (problems in the validation of IPv6 addresses with leading
+    and trailing :: in the filter extension). (Gustavo)
+  . Fixed bug #50117 (problems in the validation of IPv6 addresses with IPv4
+    addresses and ::). (Gustavo)
+
+- GD extension:
+  . Fixed bug #53492 (fix crash if anti-aliasing steps are invalid). (Pierre)
+
+- GMP extension:
+  . Fixed bug #52906 (gmp_mod returns negative result when non-negative is 
+    expected). (Stas)
+  . Fixed bug #52849 (GNU MP invalid version match). (Adam)
+
+- Hash extension:
+  . Fixed bug #51003 (unaligned memory access in ext/hash/hash_tiger.c).
+    (Mike, Ilia)
+
+- Iconv extension:
+  . Fixed bug #52941 (The 'iconv_mime_decode_headers' function is skipping
+    headers). (Adam)
+  . Fixed bug #52599 (iconv output handler outputs incorrect content type
+    when flags are used). (Ilia)
+  . Fixed bug #51250 (iconv_mime_decode() does not ignore malformed Q-encoded 
+    words). (Ilia)
+
+- Intl extension:
+  . Fixed crashes on invalid parameters in intl extension. (CVE-2010-4409). (Stas, Maksymilian
+    Arciemowicz)
+  . Added support for formatting the timestamp stored in a DateTime object.
+    (Stas)
+  . Fixed bug #50590 (IntlDateFormatter::parse result is limited to the integer
+    range). (Stas)
+    
+- Mbstring extension:
+  . Fixed bug #53273 (mb_strcut() returns garbage with the excessive length
+    parameter). (CVE-2010-4156) (Mateusz Kocielski, Pierre, Moriyoshi)
+  . Fixed bug #52981 (Unicode casing table was out-of-date. Updated with
+    UnicodeData-6.0.0d7.txt and included the source of the generator program with
+    the distribution) (Gustavo).
+  . Fixed bug #52681 (mb_send_mail() appends an extra MIME-Version header).
+    (Adam)
+ 
+- MSSQL extension:
+  . Fixed possible crash in mssql_fetch_batch(). (Kalle)
+  . Fixed bug #52843 (Segfault when optional parameters are not passed in to
+    mssql_connect). (Felipe)
+    
+- MySQL extension:
+  . Fixed bug #52636 (php_mysql_fetch_hash writes long value into int). 
+    (Kalle, rein at basefarm dot no)
+    
+- MySQLi extension:
+  . Fixed bug #52891 (Wrong data inserted with mysqli/mysqlnd when using
+    mysqli_stmt_bind_param and value> PHP_INT_MAX). (Andrey)
+  . Fixed bug #52686 (mysql_stmt_attr_[gs]et argument points to incorrect type).
+    (rein at basefarm dot no)
+  . Fixed bug #52654 (mysqli doesn't install headers with structures it uses).
+    (Andrey)
+  . Fixed bug #52433 (Call to undefined method mysqli::poll() - must be static).
+    (Andrey)
+  . Fixed bug #52417 (MySQLi build failure with mysqlnd on MacOS X). (Andrey)
+  . Fixed bug #52413 (MySQLi/libmysql build failure on OS X, FreeBSD). (Andrey)
+  . Fixed bug #52390 (mysqli_report() should be per-request setting). (Kalle)
+  . Fixed bug #52302 (mysqli_fetch_all does not work with MYSQLI_USE_RESULT).
+    (Andrey)
+  . Fixed bug #52221 (Misbehaviour of magic_quotes_runtime (get/set)). (Andrey)
+  . Fixed bug #45921 (Can't initialize character set hebrew). (Andrey)
+  
+- MySQLnd:
+  . Fixed bug #52613 (crash in mysqlnd after hitting memory limit). (Andrey)
+     
+- ODBC extension:
+  - Fixed bug #52512 (Broken error handling in odbc_execute).
+    (mkoegler at auto dot tuwien dot ac dot at)
+
+- Openssl extension:
+  . Fixed possible blocking behavior in openssl_random_pseudo_bytes on Windows.
+    (Pierre)
+  . Fixed bug #53136 (Invalid read on openssl_csr_new()). (Felipe)
+  . Fixed bug #52947 (segfault when ssl stream option capture_peer_cert_chain
+    used). (Felipe)
+
+- Oracle Database extension (OCI8):
+  . Fixed bug #53284 (Valgrind warnings in oci_set_* functions) (Oracle Corp.)
+  . Fixed bug #51610 (Using oci_connect causes PHP to take a long time to
+    exit).  Requires Oracle 11.2.0.2 client libraries (or Oracle bug fix
+    9891199) for this patch to have an effect. (Oracle Corp.)
+      
+- PCNTL extension:
+  . Fixed bug #52784 (Race condition when handling many concurrent signals).
+    (nick dot telford at gmail dot com, Arnaud)
+    
+- PCRE extension:
+  . Fixed bug #52971 (PCRE-Meta-Characters not working with utf-8). (Felipe)
+  . Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it
+    returns int(0)). (slugonamission at gmail dot com)
+
+- PHAR extension:
+  . Fixed bug #50987 (unaligned memory access in phar.c).
+    (geissert at debian dot org, Ilia)
+
+- PHP-FPM SAPI:
+  . Fixed bug #53412 (segfault when using -y). (fat)
+  . Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat)
+  . Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has
+    been removed). (fat)
+  . Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they
+    were not available). (fat)
+  . Fixed bug #52693 (configuration file errors are not logged to stderr). (fat)
+  . Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers).
+    (fat)
+  . Fixed bug #52498 (libevent was not only linked to php-fpm). (fat)
+
+- PDO:
+  . Fixed bug #52699 (PDO bindValue writes long int 32bit enum).
+    (rein at basefarm dot no) 
+  . Fixed bug #52487 (PDO::FETCH_INTO leaks memory). (Felipe)
+  
+- PDO DBLib driver:
+  . Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values).
+    (Felipe)
+    
+- PDO Firebird driver:
+  . Restored firebird support (VC9 builds only). (Pierre)
+  . Fixed bug #53335 (pdo_firebird did not implement rowCount()).
+    (preeves at ibphoenix dot com)
+  . Fixed bug #53323 (pdo_firebird getAttribute() crash).
+    (preeves at ibphoenix dot com)
+    
+- PDO MySQL driver:
+  . Fixed bug #52745 (Binding params doesn't work when selecting a date inside a
+    CASE-WHEN). (Andrey)
+    
+- PostgreSQL extension:
+  . Fixed bug #47199 (pg_delete() fails on NULL). (ewgraf at gmail dot com)
+  
+- Reflection extension:
+  . Fixed ReflectionProperty::isDefault() giving a wrong result for properties
+    obtained with ReflectionClass::getProperties(). (Gustavo)
+- Reflection extension:
+  . Fixed bug #53366 (Reflection doesnt get dynamic property value from
+    getProperty()). (Felipe)
+  . Fixed bug #52854 (ReflectionClass::newInstanceArgs does not work for classes
+    without constructors). (Johannes)
+  
+- SOAP extension:
+  . Fixed bug #44248 (RFC2616 transgression while HTTPS request through proxy
+    with SoapClient object). (Dmitry)
+    
+- SPL extension:
+  . Fixed bug #53362 (Segmentation fault when extending SplFixedArray). (Felipe)
+  . Fixed bug #53279 (SplFileObject doesn't initialise default CSV escape
+    character). (Adam)
+  . Fixed bug #53144 (Segfault in SplObjectStorage::removeAll()). (Felipe)
+  . Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). (Gustavo)
+  . Fixed bug #52573 (SplFileObject::fscanf Segmentation fault). (Felipe)
+  . Fixed bug #51763 (SplFileInfo::getType() does not work symbolic link 
+    and directory). (Pierre)
+  . Fixed bug #50481 (Storing many SPLFixedArray in an array crashes). (Felipe)
+  . Fixed bug #50579 (RegexIterator::REPLACE doesn't work). (Felipe)
+
+- SQLite3 extension:
+  . Fixed bug #53463 (sqlite3 columnName() segfaults on bad column_number).
+    (Felipe)
+    
+- Streams:
+  . Fixed forward stream seeking emulation in streams that don't support seeking
+    in situations where the read operation gives back less data than requested
+    and when there was data in the buffer before the emulation started. Also made
+    more consistent its behavior -- should return failure every time less data
+    than was requested was skipped. (Gustavo)
+  . Fixed bug #53241 (stream casting that relies on fdopen/fopencookie fails
+    with streams opened with, inter alia, the 'xb' mode). (Gustavo)
+  . Fixed bug #53006 (stream_get_contents has an unpredictable behavior when the
+    underlying stream does not support seeking). (Gustavo)
+  . Fixed bug #52944 (Invalid write on second and subsequent reads with an
+    inflate filter fed invalid data). (Gustavo)
+  . Fixed bug #52820 (writes to fopencookie FILE* not commited when seeking the
+    stream). (Gustavo)
+
+- WDDX extension:
+  . Fixed bug #52468 (wddx_deserialize corrupts integer field value when left
+    empty). (Felipe)
+     
+- Zlib extension:
+  . Fixed bug #52926 (zlib fopen wrapper does not use context). (Gustavo)
+
 22 Jul 2010, PHP 5.3.3
 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
 - Upgraded bundled PCRE to version 8.02. (Ilia)
@@ -234,8 +590,6 @@
   com, Pierre)
 - Fixed bug #50578 (incorrect shebang in phar.phar). (Fedora at FamilleCollet
   dot com)
-- Fixed bug #50555 (DateTime::sub() allows 'relative' time modifications).
-  (Derick)
 - Fixed bug #50392 (date_create_from_format enforces 6 digits for 'u' format
   character). (Derick)
 - Fixed bug #50383 (Exceptions thrown in __call / __callStatic do not include
@@ -243,6 +597,8 @@
 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
 - Fixed bug #50101 (name clash between global and local variable).
   (patch by yoarvi at gmail dot com)
+- Fixed bug #50055 (DateTime::sub() allows 'relative' time modifications).
+  (Derick)
 - Fixed bug #51002 (fix possible memory corruption with very long names).
   (Pierre)
 - Fixed bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3).

=== modified file 'TSRM/tsrm_virtual_cwd.c'
--- TSRM/tsrm_virtual_cwd.c	2010-08-01 11:58:54 +0000
+++ TSRM/tsrm_virtual_cwd.c	2011-02-01 10:04:54 +0000
@@ -14,10 +14,11 @@
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <[e-mail]>                                |
    |          Sascha Schumann <[e-mail]>                        |
+   |          Pierre Joye <[e-mail]>                                |
    +----------------------------------------------------------------------+
 */
 
-/* $Id: tsrm_virtual_cwd.c 300276 2010-06-08 13:27:30Z tony2001 $ */
+/* $Id: tsrm_virtual_cwd.c 305070 2010-11-04 01:16:20Z pajoye $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -38,6 +39,18 @@
 # ifndef IO_REPARSE_TAG_SYMLINK
 #  define IO_REPARSE_TAG_SYMLINK 0xA000000C
 # endif
+
+# ifndef VOLUME_NAME_NT
+#  define VOLUME_NAME_NT 0x2
+# endif
+
+# ifndef VOLUME_NAME_DOS
+#  define VOLUME_NAME_DOS 0x0
+# endif
+#endif
+
+#ifndef S_IFLNK
+# define S_IFLNK 0120000
 #endif
 
 #ifdef NETWARE
@@ -83,14 +96,14 @@
 #include <tchar.h>
 #define tsrm_strtok_r(a,b,c) _tcstok((a),(b))
 #define TOKENIZER_STRING "/\\"
-	
-static int php_check_dots(const char *element, int n) 
+
+static int php_check_dots(const char *element, int n)
 {
 	while (n-- > 0) if (element[n] != '.') break;
 
 	return (n != -1);
 }
-	
+
 #define IS_DIRECTORY_UP(element, len) \
 	(len >= 2 && !php_check_dots(element, len))
 
@@ -124,7 +137,7 @@
 
 /* define this to check semantics */
 #define IS_DIR_OK(s) (1)
-	
+
 #ifndef IS_DIR_OK
 #define IS_DIR_OK(state) (php_is_dir_ok(state) == 0)
 #endif
@@ -137,7 +150,7 @@
 
 #define CWD_STATE_FREE(s)			\
 	free((s)->cwd);
-	
+
 #ifdef TSRM_WIN32
 
 #ifdef CTL_CODE
@@ -202,21 +215,98 @@
 	return (time_t)UnixTime;
 }
 
+CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len){ /* {{{ */
+	HINSTANCE kernel32;
+	HANDLE hFile;
+	DWORD dwRet;
+
+	typedef BOOL (WINAPI *gfpnh_func)(HANDLE, LPTSTR, DWORD, DWORD);
+	gfpnh_func pGetFinalPathNameByHandle;
+
+	kernel32 = LoadLibrary("kernel32.dll");
+
+	if (kernel32) {
+		pGetFinalPathNameByHandle = (gfpnh_func)GetProcAddress(kernel32, "GetFinalPathNameByHandleA");
+		if (pGetFinalPathNameByHandle == NULL) {
+			return -1;
+		}
+	} else {
+		return -1;
+	}
+
+	hFile = CreateFile(link,            // file to open
+				 GENERIC_READ,          // open for reading
+				 FILE_SHARE_READ,       // share for reading
+				 NULL,                  // default security
+				 OPEN_EXISTING,         // existing file only
+				 FILE_FLAG_BACKUP_SEMANTICS, // normal file
+				 NULL);                 // no attr. template
+
+	if( hFile == INVALID_HANDLE_VALUE) {
+			return -1;
+	}
+
+	dwRet = pGetFinalPathNameByHandle(hFile, target, MAXPATHLEN, VOLUME_NAME_DOS);
+	if(dwRet >= MAXPATHLEN) {
+		return -1;
+	}
+
+	CloseHandle(hFile);
+
+	if(dwRet > 4) {
+		/* Skip first 4 characters if they are "\??\" */
+		if(target[0] == '\\' && target[1] == '\\' && target[2] == '?' && target[3] ==  '\\') {
+			char tmp[MAXPATHLEN];
+			unsigned int offset = 4;
+			dwRet -= 4;
+
+			/* \??\UNC\ */
+			if (dwRet > 7 && target[4] == 'U' && target[5] == 'N' && target[6] == 'C') {
+				offset += 2;
+				dwRet -= 2;
+				target[offset] = '\\';
+			}
+
+			memcpy(tmp, target + offset, dwRet);
+			memcpy(target, tmp, dwRet);
+		}
+	}
+
+	target[dwRet] = '\0';
+	return dwRet;
+}
+/* }}} */
+
 CWD_API int php_sys_stat(const char *path, struct stat *buf) /* {{{ */
 {
+	return php_sys_stat_ex(path, buf, 0);
+}
+/* }}} */
+
+CWD_API int php_sys_lstat(const char *path, struct stat *buf) /* {{{ */
+{
+	return php_sys_stat_ex(path, buf, 1);
+}
+/* }}} */
+
+CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat) /* {{{ */
+{
 	WIN32_FILE_ATTRIBUTE_DATA data;
 	__int64 t;
+	const size_t path_len = strlen(path);
 
 	if (!GetFileAttributesEx(path, GetFileExInfoStandard, &data)) {
 		return stat(path, buf);
 	}
 
-	if (path[1] == ':') {
+	if (path_len >= 1 && path[1] == ':') {
 		if (path[0] >= 'A' && path[0] <= 'Z') {
 			buf->st_dev = buf->st_rdev = path[0] - 'A';
 		} else {
 			buf->st_dev = buf->st_rdev = path[0] - 'a';
 		}
+	} else if (IS_UNC_PATH(path, path_len)) {
+		buf->st_dev = buf->st_rdev = 0;
 	} else {
 		char  cur_path[MAXPATHLEN+1];
 		DWORD len = sizeof(cur_path);
@@ -245,19 +335,56 @@
 		}
 		if (tmp != cur_path) {
 			free(tmp);
-		}		    	
+		}
 	}
+
 	buf->st_uid = buf->st_gid = buf->st_ino = 0;
-	buf->st_mode = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR|S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6)) : S_IFREG;
-	buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
+
+	if (lstat && data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+		/* File is a reparse point. Get the target */
+		HANDLE hLink = NULL;
+		REPARSE_DATA_BUFFER * pbuffer;
+		unsigned int retlength = 0;
+		TSRM_ALLOCA_FLAG(use_heap_large);
+
+		hLink = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT|FILE_FLAG_BACKUP_SEMANTICS, NULL);
+		if(hLink == INVALID_HANDLE_VALUE) {
+			return -1;
+		}
+
+		pbuffer = (REPARSE_DATA_BUFFER *)tsrm_do_alloca(MAXIMUM_REPARSE_DATA_BUFFER_SIZE, use_heap_large);
+		if(!DeviceIoControl(hLink, FSCTL_GET_REPARSE_POINT, NULL, 0, pbuffer,  MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &retlength, NULL)) {
+			tsrm_free_alloca(pbuffer, use_heap_large);
+			CloseHandle(hLink);
+			return -1;
+		}
+
+		CloseHandle(hLink);
+
+		if(pbuffer->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
+			buf->st_mode = S_IFLNK;
+			buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
+		}
+
+#if 0 /* Not used yet */
+		else if(pbuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) {
+			buf->st_mode |=;
+		}
+#endif
+		tsrm_free_alloca(pbuffer, use_heap_large);
+	} else {
+		buf->st_mode = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (S_IFDIR|S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6)) : S_IFREG;
+		buf->st_mode |= (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)) : (S_IREAD|(S_IREAD>>3)|(S_IREAD>>6)|S_IWRITE|(S_IWRITE>>3)|(S_IWRITE>>6));
+	}
+
 	if ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
 		int len = strlen(path);
 
 		if (path[len-4] == '.') {
 			if (_memicmp(path+len-3, "exe", 3) == 0 ||
-			    _memicmp(path+len-3, "com", 3) == 0 ||
-			    _memicmp(path+len-3, "bat", 3) == 0 ||
-			    _memicmp(path+len-3, "cmd", 3) == 0) {
+				_memicmp(path+len-3, "com", 3) == 0 ||
+				_memicmp(path+len-3, "bat", 3) == 0 ||
+				_memicmp(path+len-3, "cmd", 3) == 0) {
 				buf->st_mode  |= (S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6));
 			}
 		}
@@ -332,7 +459,7 @@
 		}
 	}
 #else
-	result = getcwd(cwd, sizeof(cwd));	
+	result = getcwd(cwd, sizeof(cwd));
 #endif
 	if (!result) {
 		cwd[0] = '\0';
@@ -383,7 +510,7 @@
 		*length = 1;
 		retval = (char *) malloc(2);
 		retval[0] = DEFAULT_SLASH;
-		retval[1] = '\0';	
+		retval[1] = '\0';
 		return retval;
 	}
 
@@ -493,7 +620,7 @@
 
 	while (*bucket != NULL) {
 		if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
-		           memcmp(path, (*bucket)->path, path_len) == 0) {
+					memcmp(path, (*bucket)->path, path_len) == 0) {
 			realpath_cache_bucket *r = *bucket;
 			*bucket = (*bucket)->next;
 			CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
@@ -510,9 +637,9 @@
 {
 	long size = sizeof(realpath_cache_bucket) + path_len + 1;
 	int same = 1;
-	
+
 	if (realpath_len != path_len ||
-	    memcmp(path, realpath, path_len) != 0) {
+		memcmp(path, realpath, path_len) != 0) {
 		size += realpath_len + 1;
 		same = 0;
 	}
@@ -570,7 +697,7 @@
 			CWDG(realpath_cache_size) -= sizeof(realpath_cache_bucket) + r->path_len + 1 + r->realpath_len + 1;
 			free(r);
 		} else if (key == (*bucket)->key && path_len == (*bucket)->path_len &&
-		           memcmp(path, (*bucket)->path, path_len) == 0) {
+					memcmp(path, (*bucket)->path, path_len) == 0) {
 			return *bucket;
 		} else {
 			bucket = &(*bucket)->next;
@@ -582,21 +709,21 @@
 
 CWD_API realpath_cache_bucket* realpath_cache_lookup(const char *path, int path_len, time_t t TSRMLS_DC) /* {{{ */
 {
-    return realpath_cache_find(path, path_len, t TSRMLS_CC);
+	return realpath_cache_find(path, path_len, t TSRMLS_CC);
 }
 /* }}} */
 
-CWD_API int realpath_cache_size(TSRMLS_D) 
+CWD_API int realpath_cache_size(TSRMLS_D)
 {
 	return CWDG(realpath_cache_size);
 }
 
-CWD_API int realpath_cache_max_buckets(TSRMLS_D) 
+CWD_API int realpath_cache_max_buckets(TSRMLS_D)
 {
 	return (sizeof(CWDG(realpath_cache)) / sizeof(CWDG(realpath_cache)[0]));
 }
 
-CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D) 
+CWD_API realpath_cache_bucket** realpath_cache_get_buckets(TSRMLS_D)
 {
 	return CWDG(realpath_cache);
 }
@@ -650,14 +777,14 @@
 				if (!start) {
 					/* leading '..' must not be removed in case of relative path */
 					if (j == 0 && path[0] == '.' && path[1] == '.' &&
-					    IS_SLASH(path[2])) {
+							IS_SLASH(path[2])) {
 						path[3] = '.';
 						path[4] = '.';
 						path[5] = DEFAULT_SLASH;
 						j = 5;
-					} else if (j > 0 && 
-				               path[j+1] == '.' && path[j+2] == '.' &&
-				               IS_SLASH(path[j+3])) {
+					} else if (j > 0 &&
+							path[j+1] == '.' && path[j+2] == '.' &&
+							IS_SLASH(path[j+3])) {
 						j += 4;
 						path[j++] = '.';
 						path[j++] = '.';
@@ -673,7 +800,7 @@
 			}
 			return j;
 		}
-	
+
 		path[len] = 0;
 
 		save = (use_realpath != CWD_EXPAND);
@@ -683,18 +810,18 @@
 			if (!*t) {
 				*t = time(0);
 			}
-		    if ((bucket = realpath_cache_find(path, len, *t TSRMLS_CC)) != NULL) {
-		    	if (is_dir && !bucket->is_dir) {
+			if ((bucket = realpath_cache_find(path, len, *t TSRMLS_CC)) != NULL) {
+				if (is_dir && !bucket->is_dir) {
 					/* not a directory */
 					return -1;
-		    	} else {
-		    		if (link_is_dir) {
-		    			*link_is_dir = bucket->is_dir;
-		    		}
+				} else {
+					if (link_is_dir) {
+						*link_is_dir = bucket->is_dir;
+					}
 					memcpy(path, bucket->realpath, bucket->realpath_len + 1);
-				    return bucket->realpath_len;
+					return bucket->realpath_len;
 				}
-	    	}
+			}
 		}
 
 #ifdef TSRM_WIN32
@@ -706,7 +833,7 @@
 			/* continue resolution anyway but don't save result in the cache */
 			save = 0;
 		}
-		
+
 		if (save) {
 			FindClose(hFind);
 		}
@@ -714,9 +841,9 @@
 		tmp = tsrm_do_alloca(len+1, use_heap);
 		memcpy(tmp, path, len+1);
 
-		if(save && 
-		!(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
-		(data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+		if(save &&
+				!(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
+				(data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
 			/* File is a reparse point. Get the target */
 			HANDLE hLink = NULL;
 			REPARSE_DATA_BUFFER * pbuffer;
@@ -751,7 +878,7 @@
 				reparsetarget = pbuffer->SymbolicLinkReparseBuffer.ReparseTarget;
 				printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
 				isabsolute = (pbuffer->SymbolicLinkReparseBuffer.Flags == 0) ? 1 : 0;
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
 					reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset  / sizeof(WCHAR),
 					printname_len + 1,
 					printname, MAX_PATH, NULL, NULL
@@ -763,7 +890,7 @@
 				printname[printname_len] = 0;
 
 				substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
 					reparsetarget + pbuffer->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
 					substitutename_len + 1,
 					substitutename, MAX_PATH, NULL, NULL
@@ -777,7 +904,7 @@
 				isabsolute = 1;
 				reparsetarget = pbuffer->MountPointReparseBuffer.ReparseTarget;
 				printname_len = pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR);
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
 					reparsetarget + pbuffer->MountPointReparseBuffer.PrintNameOffset  / sizeof(WCHAR),
 					printname_len + 1,
 					printname, MAX_PATH, NULL, NULL
@@ -788,7 +915,7 @@
 				printname[pbuffer->MountPointReparseBuffer.PrintNameLength / sizeof(WCHAR)] = 0;
 
 				substitutename_len = pbuffer->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
-				if (!WideCharToMultiByte(CP_THREAD_ACP, 0, 
+				if (!WideCharToMultiByte(CP_THREAD_ACP, 0,
 					reparsetarget + pbuffer->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR),
 					substitutename_len + 1,
 					substitutename, MAX_PATH, NULL, NULL
@@ -803,20 +930,22 @@
 			}
 
 			if(isabsolute && substitutename_len > 4) {
-				/* Do not resolve volumes (for now). A mounted point can 
+				/* Do not resolve volumes (for now). A mounted point can
 				   target a volume without a drive, it is not certain that
-				   all IO functions we use in php and its deps support 
+				   all IO functions we use in php and its deps support
 				   path with volume GUID instead of the DOS way, like:
 				   d:\test\mnt\foo
 				   \\?\Volume{62d1c3f8-83b9-11de-b108-806e6f6e6963}\foo
 				*/
-				if (strncmp(substitutename, "\\??\\Volume{",11) == 0 
-					|| strncmp(substitutename, "\\\\?\\Volume{",11) == 0) {
-					isVolume = TRUE;					
+				if (strncmp(substitutename, "\\??\\Volume{",11) == 0
+					|| strncmp(substitutename, "\\\\?\\Volume{",11) == 0
+					|| strncmp(substitutename, "\\??\\UNC\\", 8) == 0
+					) {
+					isVolume = TRUE;
 					substitutename_off = 0;
 				} else
 					/* do not use the \??\ and \\?\ prefix*/
-					if (strncmp(substitutename, "\\??\\", 4) == 0 
+					if (strncmp(substitutename, "\\??\\", 4) == 0
 						|| strncmp(substitutename, "\\\\?\\", 4) == 0) {
 					substitutename_off = 4;
 				}
@@ -887,7 +1016,7 @@
 		tmp = tsrm_do_alloca(len+1, use_heap);
 		memcpy(tmp, path, len+1);
 #else
-		if (save && lstat(path, &st) < 0) {
+		if (save && php_sys_lstat(path, &st) < 0) {
 			if (use_realpath == CWD_REALPATH) {
 				/* file not found */
 				return -1;
@@ -900,8 +1029,8 @@
 		memcpy(tmp, path, len+1);
 
 		if (save && S_ISLNK(st.st_mode)) {
-			if (++(*ll) > LINK_MAX || (j = readlink(tmp, path, MAXPATHLEN)) < 0) {
-			    /* too many links or broken symlinks */
+			if (++(*ll) > LINK_MAX || (j = php_sys_readlink(tmp, path, MAXPATHLEN)) < 0) {
+				/* too many links or broken symlinks */
 				tsrm_free_alloca(tmp, use_heap);
 				return -1;
 			}
@@ -913,10 +1042,10 @@
 					return -1;
 				}
 			} else {
-			    if (i + j >= MAXPATHLEN-1) {
+				if (i + j >= MAXPATHLEN-1) {
 					tsrm_free_alloca(tmp, use_heap);
 					return -1; /* buffer overflow */
-			    }
+				}
 				memmove(path+i, path, j+1);
 				memcpy(path, tmp, i-1);
 				path[i-1] = DEFAULT_SLASH;
@@ -1038,18 +1167,18 @@
 					state_cwd_length = 2;
 					while (IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}						 
+					}
 					while (state->cwd[state_cwd_length] &&
-					       !IS_SLASH(state->cwd[state_cwd_length])) {
+							!IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}						 
+					}
 					while (IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}						 
+					}
 					while (state->cwd[state_cwd_length] &&
-					       !IS_SLASH(state->cwd[state_cwd_length])) {
+							!IS_SLASH(state->cwd[state_cwd_length])) {
 						state_cwd_length++;
-					}						 
+					}
 				}
 			}
 #endif
@@ -1061,7 +1190,7 @@
 			memcpy(resolved_path + state_cwd_length + 1, path, path_length + 1);
 			path_length += state_cwd_length + 1;
 		}
-	} else {		
+	} else {
 #ifdef TSRM_WIN32
 		if (path_length > 2 && path[1] == ':' && !IS_SLASH(path[2])) {
 			resolved_path[0] = path[0];
@@ -1072,11 +1201,11 @@
 		} else
 #endif
 		memcpy(resolved_path, path, path_length + 1);
-	} 
+	}
 
 #ifdef TSRM_WIN32
 	if (memchr(resolved_path, '*', path_length) ||
-	    memchr(resolved_path, '?', path_length)) {
+		memchr(resolved_path, '?', path_length)) {
 		return 1;
 	}
 #endif
@@ -1126,12 +1255,12 @@
 	add_slash = (use_realpath != CWD_REALPATH) && path_length > 0 && IS_SLASH(resolved_path[path_length-1]);
 	t = CWDG(realpath_cache_ttl) ? 0 : -1;
 	path_length = tsrm_realpath_r(resolved_path, start, path_length, &ll, &t, use_realpath, 0, NULL TSRMLS_CC);
-	
+
 	if (path_length < 0) {
 		errno = ENOENT;
 		return 1;
 	}
-	
+
 	if (!start && !path_length) {
 		resolved_path[path_length++] = '.';
 	}
@@ -1184,7 +1313,7 @@
 		memcpy(state->cwd, resolved_path, state->cwd_length+1);
 		ret = 0;
 	}
-	
+
 #if VIRTUAL_CWD_DEBUG
 	fprintf (stderr, "virtual_file_ex() = %s\n",state->cwd);
 #endif
@@ -1207,7 +1336,7 @@
 
 	if (length == 0) {
 		return 1; /* Can't cd to empty string */
-	}	
+	}
 	while(--length >= 0 && !IS_SLASH(path[length])) {
 	}
 
@@ -1242,16 +1371,16 @@
 	if (!*path) {
 		new_state.cwd = (char*)malloc(1);
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;		
-	    if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
-		    path = cwd;
+		new_state.cwd_length = 0;
+		if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
+			path = cwd;
 		}
 	} else if (!IS_ABSOLUTE_PATH(path, strlen(path))) {
 		CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	} else {
 		new_state.cwd = (char*)malloc(1);
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;		
+		new_state.cwd_length = 0;
 	}
 
 	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)==0) {
@@ -1317,7 +1446,7 @@
 {
 	cwd_state new_state;
 	int ret;
-	
+
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
 	if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
 		CWD_STATE_FREE(&new_state);
@@ -1329,9 +1458,9 @@
 #else
 	ret = access(new_state.cwd, mode);
 #endif
-	
+
 	CWD_STATE_FREE(&new_state);
-	
+
 	return ret;
 }
 /* }}} */
@@ -1352,12 +1481,12 @@
 TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */
 {
 	FILETIME mtime, atime;
-	HANDLE hFile; 
+	HANDLE hFile;
 
 	hFile = CreateFile(filename, GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, NULL,
 				 OPEN_ALWAYS, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 
-	/* OPEN_ALWAYS mode sets the last error to ERROR_ALREADY_EXISTS but 
+	/* OPEN_ALWAYS mode sets the last error to ERROR_ALREADY_EXISTS but
 	   the CreateFile operation succeeds */
 	if (GetLastError() == ERROR_ALREADY_EXISTS) {
 		SetLastError(0);
@@ -1477,7 +1606,7 @@
 		f = open(new_state.cwd, flags, mode);
 	} else {
 		f = open(new_state.cwd, flags);
-	}	
+	}
 	CWD_STATE_FREE(&new_state);
 	return f;
 }
@@ -1556,7 +1685,6 @@
 }
 /* }}} */
 
-#if !defined(TSRM_WIN32)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC) /* {{{ */
 {
 	cwd_state new_state;
@@ -1568,13 +1696,12 @@
 		return -1;
 	}
 
-	retval = lstat(new_state.cwd, buf);
+	retval = php_sys_lstat(new_state.cwd, buf);
 
 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
 /* }}} */
-#endif
 
 CWD_API int virtual_unlink(const char *path TSRMLS_DC) /* {{{ */
 {
@@ -1738,7 +1865,7 @@
 		}
 		*ptr++ = '\'';
 	}
-	
+
 	*ptr++ = ' ';
 	*ptr++ = ';';
 	*ptr++ = ' ';
@@ -1761,18 +1888,18 @@
 	if (!*path) {
 		new_state.cwd = (char*)malloc(1);
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;		
-	    if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
-		    path = cwd;
+		new_state.cwd_length = 0;
+		if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
+			path = cwd;
 		}
 	} else if (!IS_ABSOLUTE_PATH(path, strlen(path)) &&
-	    VCWD_GETCWD(cwd, MAXPATHLEN)) {
+					VCWD_GETCWD(cwd, MAXPATHLEN)) {
 		new_state.cwd = strdup(cwd);
 		new_state.cwd_length = strlen(cwd);
 	} else {
 		new_state.cwd = (char*)malloc(1);
 		new_state.cwd[0] = '\0';
-		new_state.cwd_length = 0;		
+		new_state.cwd_length = 0;
 	}
 
 	if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {

=== modified file 'TSRM/tsrm_virtual_cwd.h'
--- TSRM/tsrm_virtual_cwd.h	2010-03-16 09:09:50 +0000
+++ TSRM/tsrm_virtual_cwd.h	2011-02-01 10:04:54 +0000
@@ -14,10 +14,11 @@
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <[e-mail]>                                |
    |          Sascha Schumann <[e-mail]>                        |
+   |          Pierre Joye <[e-mail]>                                |
    +----------------------------------------------------------------------+
 */
 
-/* $Id: tsrm_virtual_cwd.h 293036 2010-01-03 09:23:27Z sebastian $ */
+/* $Id: tsrm_virtual_cwd.h 305070 2010-11-04 01:16:20Z pajoye $ */
 
 #ifndef VIRTUAL_CWD_H
 #define VIRTUAL_CWD_H
@@ -107,7 +108,7 @@
 #define COPY_WHEN_ABSOLUTE(path) 0
 #endif
 
-#ifndef IS_ABSOLUTE_PATH	
+#ifndef IS_ABSOLUTE_PATH
 #define IS_ABSOLUTE_PATH(path, len) \
 	(IS_SLASH(path[0]))
 #endif
@@ -129,9 +130,16 @@
 #endif
 
 #ifdef TSRM_WIN32
+CWD_API int php_sys_stat_ex(const char *path, struct stat *buf, int lstat);
 CWD_API int php_sys_stat(const char *path, struct stat *buf);
+CWD_API int php_sys_lstat(const char *path, struct stat *buf);
+CWD_API int php_sys_readlink(const char *link, char *target, size_t target_len);
 #else
 # define php_sys_stat stat
+# define php_sys_lstat lstat
+# ifdef HAVE_SYMLINK
+# define php_sys_readlink(link, target, target_len) readlink(link, target, target_len)
+# endif
 #endif
 
 typedef struct _cwd_state {
@@ -155,9 +163,7 @@
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
-#if !defined(TSRM_WIN32)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
-#endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
 CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
@@ -188,7 +194,7 @@
 CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link TSRMLS_DC);
 #endif
 
-/* One of the following constants must be used as the last argument 
+/* One of the following constants must be used as the last argument
    in virtual_file_ex() call. */
 
 #define CWD_EXPAND   0 /* expand "." and ".." but dont resolve symlinks      */
@@ -216,7 +222,7 @@
 	unsigned char                  is_wvalid;
 	unsigned char                  is_writable;
 #endif
-	struct _realpath_cache_bucket *next;	
+	struct _realpath_cache_bucket *next;
 } realpath_cache_bucket;
 
 typedef struct _virtual_cwd_globals {
@@ -244,7 +250,7 @@
 
 /* The actual macros to be used in programs using TSRM
  * If the program defines VIRTUAL_DIR it will use the
- * virtual_* functions 
+ * virtual_* functions
  */
 
 #ifdef VIRTUAL_DIR
@@ -261,9 +267,7 @@
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-#if !defined(TSRM_WIN32)
-# define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
-#endif
+#define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
 #define VCWD_MKDIR(pathname, mode) virtual_mkdir(pathname, mode TSRMLS_CC)
 #define VCWD_RMDIR(pathname) virtual_rmdir(pathname TSRMLS_CC)

=== modified file 'UPGRADING'
--- UPGRADING	2010-08-01 11:58:54 +0000
+++ UPGRADING	2011-02-01 10:04:54 +0000
@@ -1,4 +1,4 @@
-$Id: UPGRADING 282950 2009-06-28 16:14:30Z johannes $
+$Id: UPGRADING 306076 2010-12-08 09:38:47Z pajoye $
 
 UPGRADE NOTES - PHP 5.3
 
@@ -40,6 +40,9 @@
 2. Changes made to existing functions
 =====================================
 
+- Paths containing NULL (like /some/path\0foo.txt) are now considered invalid. 
+  See http://news.php.net/php.internals/50191
+
 - The HTTP stream wrapper now considers all status codes from 200 to 399 to be
   successful.
 
@@ -273,6 +276,8 @@
         - MySQLi: Now supports persistent connections by prepending the hostname 
           with "p:".
 
+        - imagepstext now rejects invalid antialiasing steps and raises a warning.
+
      d. no longer possible to disable
 
         - PCRE
@@ -457,6 +462,14 @@
 - Firebird and SNMP support are no longer available on Windows. Firebird support
   may be reintroduced in the future.
 
+=====================
+11.1 New in PHP 5.3.4
+=====================
+
+- open_basedir supports now symbolic links (checks the target).
+- is_link and SplFileInfo symbolic links related method are now fully supported
+  (on Windows Vista or later).
+
 ===================
 12. New in PHP 5.3:
 ===================

=== added file 'UPGRADING.INTERNALS'
--- UPGRADING.INTERNALS	1970-01-01 00:00:00 +0000
+++ UPGRADING.INTERNALS	2011-02-01 10:04:54 +0000
@@ -0,0 +1,23 @@
+$Id$
+
+UPGRADE NOTES - PHP 5.3.4
+
+1. Internal API changes
+
+========================
+1. Internal API changes
+========================
+
+	a. stat/lstat support
+
+lstat is now available on all platforms. On unix-like platform
+php_sys_lstat is an alias to lstat (when avaible). On Windows it is now 
+available using php_sys_lstat. php_sys_stat and php_sys_lstat usage is recommended 
+instead of calling lstat directly, to ensure portability.
+
+	b. readlink support
+
+readlink is now available on all platforms. On unix-like platform
+php_sys_readlink is an alias to readlink (when avaible). On Windows it is now 
+available using php_sys_readlink. php_sys_readlink usage is recommended 
+instead of calling readlink directly, to ensure portability.

=== modified file 'Zend/acinclude.m4'
--- Zend/acinclude.m4	2010-08-01 11:58:54 +0000
+++ Zend/acinclude.m4	2011-02-01 10:04:54 +0000
@@ -1,10 +1,10 @@
-dnl $Id: acinclude.m4 298893 2010-05-03 09:05:30Z pajoye $
+dnl $Id: acinclude.m4 304193 2010-10-07 21:44:41Z felipe $
 dnl
 dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
   # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

=== modified file 'Zend/tests/bug45180.phpt'
--- Zend/tests/bug45180.phpt	2010-07-31 15:53:12 +0000
+++ Zend/tests/bug45180.phpt	2011-02-01 10:04:54 +0000
@@ -43,11 +43,11 @@
 string(3) "ABC"
 __call:
 string(3) "ABC"
-__callstatic:
+__call:
 string(3) "XYZ"
-__callstatic:
+__call:
 string(3) "WWW"
-__callstatic:
+__call:
 string(3) "ABC"
 __callstatic:
 string(1) "A"
@@ -58,4 +58,4 @@
 __callstatic:
 string(3) "FOO"
 __callstatic:
-string(3) "FOO"
+string(3) "FOO"
\ No newline at end of file

=== modified file 'Zend/tests/bug45186.phpt'
--- Zend/tests/bug45186.phpt	2010-07-31 15:53:12 +0000
+++ Zend/tests/bug45186.phpt	2011-02-01 10:04:54 +0000
@@ -35,17 +35,17 @@
 
 ?>
 --EXPECTF--
-__callstatic:
+__call:
 string(3) "ABC"
-__callstatic:
+__call:
 string(3) "ABC"
 __call:
 string(3) "xyz"
-__callstatic:
+__call:
 string(3) "www"
 __call:
 string(1) "y"
-__callstatic:
+__call:
 string(1) "y"
 ok
 __callstatic:

=== modified file 'Zend/tests/bug51176.phpt'
--- Zend/tests/bug51176.phpt	2010-07-31 15:53:12 +0000
+++ Zend/tests/bug51176.phpt	2011-02-01 10:04:54 +0000
@@ -27,6 +27,6 @@
 
 ?>
 --EXPECT--
-static
-static
-static
+instance
+instance
+instance
\ No newline at end of file

=== added file 'Zend/tests/bug52361.phpt'
--- Zend/tests/bug52361.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug52361.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,35 @@
+--TEST--
+Bug #52361 (Throwing an exception in a destructor causes invalid catching)
+--FILE--
+<?php
+class aaa {
+	public function __destruct() {
+		try {
+			throw new Exception(__CLASS__);
+		} catch(Exception $ex) {
+			echo "1. $ex\n";
+		}
+	}
+}
+function bbb() {
+	$a = new aaa();
+	throw new Exception(__FUNCTION__);
+}
+try {
+	bbb();
+	echo "must be skipped !!!";
+} catch(Exception $ex) {
+	echo "2. $ex\n";
+}
+?>
+--EXPECTF--
+1. exception 'Exception' with message 'aaa' in %sbug52361.php:5
+Stack trace:
+#0 %sbug52361.php(16): aaa->__destruct()
+#1 %sbug52361.php(16): bbb()
+#2 {main}
+2. exception 'Exception' with message 'bbb' in %sbug52361.php:13
+Stack trace:
+#0 %sbug52361.php(16): bbb()
+#1 {main}
+

=== added file 'Zend/tests/bug52484.phpt'
--- Zend/tests/bug52484.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug52484.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,19 @@
+--TEST--
+Bug #52484 (__set() ignores setting properties with empty names)
+--FILE--
+<?php
+
+class A {	
+	function __unset($prop) {
+		unset($this->$prop);
+	}
+}
+
+$a = new A();
+$prop = null;
+
+unset($a->$prop);
+
+?>
+--EXPECTF--
+Fatal error: Cannot access empty property in %s on line %d

=== added file 'Zend/tests/bug52484_2.phpt'
--- Zend/tests/bug52484_2.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug52484_2.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,19 @@
+--TEST--
+Bug #52484.2 (__set() ignores setting properties with empty names)
+--FILE--
+<?php
+
+class A {
+	function __set($prop, $val) {
+		$this->$prop = $val;
+	}
+}
+
+$a = new A();
+$prop = null;
+
+$a->$prop = 2;
+
+?>
+--EXPECTF--
+Fatal error: Cannot access empty property in %s on line %d

=== added file 'Zend/tests/bug52484_3.phpt'
--- Zend/tests/bug52484_3.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug52484_3.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,19 @@
+--TEST--
+Bug #52484.3 (__set() ignores setting properties with empty names)
+--FILE--
+<?php
+
+class A {	
+	function __get($prop) {
+		var_dump($this->$prop);
+	}
+}
+
+$a = new A();
+$prop = null;
+
+var_dump($a->$prop);
+
+?>
+--EXPECTF--
+Fatal error: Cannot access empty property in %s on line %d

=== added file 'Zend/tests/bug52508.phpt'
--- Zend/tests/bug52508.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug52508.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,20 @@
+--TEST--
+Bug #52508 (newline problem with parse_ini_file+INI_SCANNER_RAW)
+--FILE--
+<?php
+
+$file = dirname(__FILE__) .'/bug52508.ini';
+
+file_put_contents($file, "a = 1");
+
+$ini_array = parse_ini_file($file, true, INI_SCANNER_RAW);
+var_dump($ini_array);
+
+unlink($file);
+
+?>
+--EXPECT--
+array(1) {
+  ["a"]=>
+  string(1) "1"
+}

=== added file 'Zend/tests/bug52879.phpt'
--- Zend/tests/bug52879.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug52879.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,16 @@
+--TEST--
+Bug #52879 (Objects unreferenced in __get, __set, __isset or __unset can be freed too early)
+--FILE--
+<?php
+class MyClass {
+	public $myRef;
+	public function __set($property,$value) {
+		$this->myRef = $value;
+	}
+}
+$myGlobal=new MyClass($myGlobal);
+$myGlobal->myRef=&$myGlobal;
+$myGlobal->myNonExistentProperty="ok\n";
+echo $myGlobal;
+--EXPECT--
+ok

=== added file 'Zend/tests/bug52939.phpt'
--- Zend/tests/bug52939.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug52939.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,40 @@
+--TEST--
+Bug #52939 (zend_call_function_array does not respect ZEND_SEND_PREFER_REF)
+--FILE--
+<?php
+$ar1 = array("row1" => 2, "row2" => 1);
+var_dump(array_multisort($ar1));
+var_dump($ar1);
+
+$ar1 = array("row1" => 2, "row2" => 1);
+$args = array(&$ar1);
+var_dump(call_user_func_array("array_multisort", $args));
+var_dump($ar1);
+
+$ar1 = array("row1" => 2, "row2" => 1);
+$args = array($ar1);
+var_dump(call_user_func_array("array_multisort", $args));
+var_dump($ar1);
+?>
+--EXPECT--
+bool(true)
+array(2) {
+  ["row2"]=>
+  int(1)
+  ["row1"]=>
+  int(2)
+}
+bool(true)
+array(2) {
+  ["row2"]=>
+  int(1)
+  ["row1"]=>
+  int(2)
+}
+bool(true)
+array(2) {
+  ["row1"]=>
+  int(2)
+  ["row2"]=>
+  int(1)
+}

=== added file 'Zend/tests/bug53305.phpt'
--- Zend/tests/bug53305.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug53305.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,19 @@
+--TEST--
+Bug #53305 (E_NOTICE when defining a constant starts with __COMPILER_HALT_OFFSET__)
+--FILE--
+<?php
+error_reporting(E_ALL);
+
+define('__COMPILER_HALT_OFFSET__1', 1);
+define('__COMPILER_HALT_OFFSET__2', 2);
+define('__COMPILER_HALT_OFFSET__', 3);
+define('__COMPILER_HALT_OFFSET__1'.chr(0), 4);
+
+var_dump(__COMPILER_HALT_OFFSET__1);
+var_dump(constant('__COMPILER_HALT_OFFSET__1'.chr(0)));
+
+?>
+--EXPECTF--
+Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d
+int(1)
+int(4)

=== added file 'Zend/tests/bug53632.phpt'
--- Zend/tests/bug53632.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/bug53632.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,10 @@
+--TEST--
+zend_strtod() hangs with 2.2250738585072011e-308
+--FILE--
+<?php
+$d = 2.2250738585072011e-308;
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Done

=== modified file 'Zend/tests/call_static_003.phpt'
--- Zend/tests/call_static_003.phpt	2010-07-31 15:53:12 +0000
+++ Zend/tests/call_static_003.phpt	2011-02-01 10:04:54 +0000
@@ -28,9 +28,9 @@
 --EXPECT--
 nonstatic
 string(6) "fOoBaR"
-static
+nonstatic
 string(6) "foOBAr"
-static
+nonstatic
 string(6) "fOOBAr"
 static
 string(3) "bAr"

=== modified file 'Zend/tests/call_static_007.phpt'
--- Zend/tests/call_static_007.phpt	2010-07-31 15:53:12 +0000
+++ Zend/tests/call_static_007.phpt	2011-02-01 10:04:54 +0000
@@ -30,5 +30,5 @@
 --EXPECT--
 __callstatic: Test
 __call: Test
-__callstatic: Bar
+__call: Bar
 __callstatic: Foo

=== modified file 'Zend/tests/declare_001.phpt'
--- Zend/tests/declare_001.phpt	2010-03-16 09:09:50 +0000
+++ Zend/tests/declare_001.phpt	2011-02-01 10:04:54 +0000
@@ -1,5 +1,11 @@
 --TEST--
 Testing declare statement with several type values
+--SKIPIF--
+<?php
+if (in_array("detect_unicode", array_keys(ini_get_all()))) {
+  die("skip");
+}
+?>
 --FILE--
 <?php
 

=== added file 'Zend/tests/gc_032.phpt'
--- Zend/tests/gc_032.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/gc_032.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,40 @@
+--TEST--
+GC 032: Crash in GC because of invalid reference counting
+--FILE--
+<?php
+$a = array();
+$b =& $a;
+$a[0] = $a;
+debug_zval_dump($a);
+$a = array(array());
+$b =& $a;
+$a[0][0] = $a;
+debug_zval_dump($a);
+?>
+--EXPECT--
+array(1) refcount(1){
+  [0]=>
+  array(1) refcount(3){
+    [0]=>
+    array(1) refcount(3){
+      [0]=>
+      *RECURSION*
+    }
+  }
+}
+array(1) refcount(1){
+  [0]=>
+  array(1) refcount(3){
+    [0]=>
+    array(1) refcount(1){
+      [0]=>
+      array(1) refcount(3){
+        [0]=>
+        array(1) refcount(1){
+          [0]=>
+          *RECURSION*
+        }
+      }
+    }
+  }
+}

=== added file 'Zend/tests/multibyte/multibyte_encoding_006.phpt'
Binary files Zend/tests/multibyte/multibyte_encoding_006.phpt	1970-01-01 00:00:00 +0000 and Zend/tests/multibyte/multibyte_encoding_006.phpt	2011-02-01 10:04:54 +0000 differ
=== added file 'Zend/tests/objects_032.phpt'
--- Zend/tests/objects_032.phpt	1970-01-01 00:00:00 +0000
+++ Zend/tests/objects_032.phpt	2011-02-01 10:04:54 +0000
@@ -0,0 +1,40 @@
+--TEST--
+Covariant return-by-ref constraints
+--FILE--
+<?php
+
+class A implements ArrayAccess {
+    public $foo = array();
+
+    public function &offsetGet($n) {
+        return $this->foo[$n];
+    }
+
+    public function offsetSet($n, $v) {
+    }
+    public function offsetUnset($n) {
+    }
+    public function offsetExists($n) {
+    }
+}
+
+$a = new A;
+
+$a['foo']['bar'] = 2;
+
+var_dump($a);
+
+?>
+==DONE==
+--EXPECTF--
+object(A)#1 (1) {
+  ["foo"]=>
+  array(1) {
+    ["foo"]=>
+    array(1) {
+      ["bar"]=>
+      int(2)
+    }
+  }
+}
+==DONE==

=== modified file 'Zend/tests/unset_cv05.phpt'
--- Zend/tests/unset_cv05.phpt	2010-03-16 09:09:50 +0000
+++ Zend/tests/unset_cv05.phpt	2011-02-01 10:04:54 +0000
@@ -19,7 +19,7 @@
 echo "\nok\n";
 ?>
 --EXPECTF--
-Warning: Directive 'register_long_arrays' is deprecated in PHP %d.%d and greater in Unknown on line 0
+Deprecated: Directive 'register_long_arrays' is deprecated in PHP %d.%d and greater in Unknown on line 0
 ok
 
 Warning: session_start(): Cannot send session cookie - headers already sent by (output started at %sunset_cv05.php on line %d

=== modified file 'Zend/tests/unset_cv06.phpt'
--- Zend/tests/unset_cv06.phpt	2010-03-16 09:09:50 +0000
+++ Zend/tests/unset_cv06.phpt	2011-02-01 10:04:54 +0000
@@ -19,7 +19,7 @@
 echo "ok\n";
 ?>
 --EXPECTF--
-Warning: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0
+Deprecated: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0
 1
 
 Deprecated: Function session_register() is deprecated in %s on line %d

=== modified file 'Zend/zend_API.c'
--- Zend/zend_API.c	2010-08-01 11:58:54 +0000
+++ Zend/zend_API.c	2011-02-01 10:04:54 +0000
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_API.c 299395 2010-05-14 23:48:03Z felipe $ */
+/* $Id: zend_API.c 302137 2010-08-12 07:58:14Z sas $ */
 
 #include "zend.h"
 #include "zend_execute.h"
@@ -1082,7 +1082,7 @@
 		} else {
 			ALLOC_HASHTABLE_REL(object->properties);
 			zend_hash_init(object->properties, zend_hash_num_elements(&class_type->default_properties), NULL, ZVAL_PTR_DTOR, 0);
-			zend_hash_copy(object->properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+			zend_hash_copy(object->properties, &class_type->default_properties, zval_copy_property_ctor(class_type), (void *) &tmp, sizeof(zval *));
 		}
 	} else {
 		Z_OBJVAL_P(arg) = class_type->create_object(class_type TSRMLS_CC);

=== modified file 'Zend/zend_compile.c'
--- Zend/zend_compile.c	2010-08-01 11:58:54 +0000
+++ Zend/zend_compile.c	2011-02-01 10:04:54 +0000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_compile.c 300817 2010-06-28 16:37:57Z felipe $ */
+/* $Id: zend_compile.c 305057 2010-11-03 15:40:24Z colder $ */
 
 #include <zend_language_parser.h>
 #include "zend.h"
@@ -2551,12 +2551,14 @@
 		return 0;
 	}
 
-	if (proto->common.pass_rest_by_reference
+	if (fe->common.type != ZEND_USER_FUNCTION
+		&& proto->common.pass_rest_by_reference
 		&& !fe->common.pass_rest_by_reference) {
 		return 0;
 	}
 
-	if (fe->common.return_reference != proto->common.return_reference) {
+	/* by-ref constraints on return values are covariant */
+	if (proto->common.return_reference && !fe->common.return_reference) {
 		return 0;
 	}
 
@@ -2580,6 +2582,8 @@
 			/* Only one has an array type hint and the other one doesn't */
 			return 0;
 		}
+
+		/* by-ref constraints on arguments are invariant */
 		if (fe->common.arg_info[i].pass_by_reference != proto->common.arg_info[i].pass_by_reference) {
 			return 0;
 		}
@@ -2817,6 +2821,9 @@
 }
 /* }}} */
 
+#define zval_property_ctor(parent_ce, ce) \
+	((copy_ctor_func_t) (((parent_ce)->type != (ce)->type) ? zval_shared_property_ctor : zval_add_ref))
+
 ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce TSRMLS_DC) /* {{{ */
 {
 	if ((ce->ce_flags & ZEND_ACC_INTERFACE)
@@ -2840,7 +2847,7 @@
 	zend_do_inherit_interfaces(ce, parent_ce TSRMLS_CC);
 
 	/* Inherit properties */
-	zend_hash_merge(&ce->default_properties, &parent_ce->default_properties, (void (*)(void *)) zval_add_ref, NULL, sizeof(zval *), 0);
+	zend_hash_merge(&ce->default_properties, &parent_ce->default_properties, zval_property_ctor(parent_ce, ce), NULL, sizeof(zval *), 0);
 	if (parent_ce->type != ce->type) {
 		/* User class extends internal class */
 		zend_update_class_constants(parent_ce  TSRMLS_CC);
@@ -2850,7 +2857,7 @@
 	}
 	zend_hash_merge_ex(&ce->properties_info, &parent_ce->properties_info, (copy_ctor_func_t) (ce->type & ZEND_INTERNAL_CLASS ? zend_duplicate_property_info_internal : zend_duplicate_property_info), sizeof(zend_property_info), (merge_checker_func_t) do_inherit_property_access_check, ce);
 
-	zend_hash_merge(&ce->constants_table, &parent_ce->constants_table, (void (*)(void *)) zval_add_ref, NULL, sizeof(zval *), 0);
+	zend_hash_merge(&ce->constants_table, &parent_ce->constants_table, zval_property_ctor(parent_ce, ce), NULL, sizeof(zval *), 0);
 	zend_hash_merge_ex(&ce->function_table, &parent_ce->function_table, (copy_ctor_func_t) do_inherit_method, sizeof(zend_function), (merge_checker_func_t) do_inherit_method_check, ce);
 	do_inherit_parent_constructor(ce);
 

=== modified file 'Zend/zend_constants.c'
--- Zend/zend_constants.c	2010-03-16 09:09:50 +0000
+++ Zend/zend_constants.c	2011-02-01 10:04:54 +0000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_constants.c 293155 2010-01-05 20:46:53Z sebastian $ */
+/* $Id: zend_constants.c 305332 2010-11-14 01:38:52Z felipe $ */
 
 #include "zend.h"
 #include "zend_constants.h"
@@ -434,8 +434,16 @@
 		}
 	}
 
-	if ((strncmp(name, "__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__") - 1) == 0) ||
-			zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
+	/* Check if the user is trying to define the internal pseudo constant name __COMPILER_HALT_OFFSET__ */
+	if ((c->name_len == sizeof("__COMPILER_HALT_OFFSET__")
+		&& !memcmp(name, "__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__")-1))
+		|| zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
+		
+		/* The internal __COMPILER_HALT_OFFSET__ is prefixed by NULL byte */
+		if (c->name[0] == '\0' && c->name_len > sizeof("\0__COMPILER_HALT_OFFSET__")
+			&& memcmp(name, "\0__COMPILER_HALT_OFFSET__", sizeof("\0__COMPILER_HALT_OFFSET__")) == 0) {
+			name++;
+		}
 		zend_error(E_NOTICE,"Constant %s already defined", name);
 		free(c->name);
 		if (!(c->flags & CONST_PERSISTENT)) {

=== modified file 'Zend/zend_exceptions.c'
--- Zend/zend_exceptions.c	2010-03-16 09:09:50 +0000
+++ Zend/zend_exceptions.c	2011-02-01 10:04:54 +0000
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_exceptions.c 293155 2010-01-05 20:46:53Z sebastian $ */
+/* $Id: zend_exceptions.c 302311 2010-08-16 08:11:08Z dmitry $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -137,7 +137,7 @@
 
 	ALLOC_HASHTABLE(object->properties);
 	zend_hash_init(object->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-	zend_hash_copy(object->properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+	zend_hash_copy(object->properties, &class_type->default_properties, zval_copy_property_ctor(class_type), (void *) &tmp, sizeof(zval *));
 
 	ALLOC_ZVAL(trace);
 	Z_UNSET_ISREF_P(trace);
@@ -572,6 +572,7 @@
 		zend_call_function(&fci, NULL TSRMLS_CC);
 
 		if (Z_TYPE_P(trace) != IS_STRING) {
+			zval_ptr_dtor(&trace);
 			trace = NULL;
 		}
 
@@ -592,6 +593,10 @@
 		zval_dtor(&line);
 
 		exception = zend_read_property(default_exception_ce, exception, "previous", sizeof("previous")-1, 0 TSRMLS_CC);
+
+		if (trace) {
+			zval_ptr_dtor(&trace);
+		}
 	}
 	zval_dtor(&fname);
 
@@ -599,10 +604,6 @@
 	 * the result in uncaught exception handlers without memleaks. */
 	zend_update_property_string(default_exception_ce, getThis(), "string", sizeof("string")-1, str TSRMLS_CC);
 
-	if (trace) {
-		zval_ptr_dtor(&trace);
-	}
-
 	RETURN_STRINGL(str, len, 0);
 }
 /* }}} */

=== modified file 'Zend/zend_execute.c'
--- Zend/zend_execute.c	2010-08-01 11:58:54 +0000
+++ Zend/zend_execute.c	2011-02-01 10:04:54 +0000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.c 298213 2010-04-20 12:30:35Z dmitry $ */
+/* $Id: zend_execute.c 303895 2010-09-30 14:11:51Z dmitry $ */
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
@@ -714,8 +714,8 @@
 					ALLOC_ZVAL(variable_ptr);
 					*variable_ptr_ptr = variable_ptr;
 					*variable_ptr = *value;
-					zval_copy_ctor(variable_ptr);
 					Z_SET_REFCOUNT_P(variable_ptr, 1);
+					zval_copy_ctor(variable_ptr);
 				} else {
 					*variable_ptr_ptr = value;
 					Z_ADDREF_P(value);

=== modified file 'Zend/zend_execute_API.c'
--- Zend/zend_execute_API.c	2010-08-01 11:58:54 +0000
+++ Zend/zend_execute_API.c	2011-02-01 10:04:54 +0000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c 299766 2010-05-26 00:00:58Z felipe $ */
+/* $Id: zend_execute_API.c 304364 2010-10-13 08:51:39Z dmitry $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -870,7 +870,8 @@
 			if (Z_REFCOUNT_PP(fci->params[i]) > 1) {
 				zval *new_zval;
 
-				if (fci->no_separation) {
+				if (fci->no_separation &&
+				    !ARG_MAY_BE_SENT_BY_REF(EX(function_state).function, i + 1)) {
 					if(i) {
 						/* hack to clean up the stack */
 						zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);

=== modified file 'Zend/zend_gc.c'
--- Zend/zend_gc.c	2010-07-31 15:53:12 +0000
+++ Zend/zend_gc.c	2011-02-01 10:04:54 +0000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_gc.c 297307 2010-04-01 22:54:03Z stas $ */
+/* $Id: zend_gc.c 303016 2010-09-03 09:27:47Z dmitry $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -414,19 +414,21 @@
 	gc_root_buffer *current = GC_G(roots).next;
 
 	while (current != &GC_G(roots)) {
-		if (current->handle && EG(objects_store).object_buckets) {
-			struct _store_object *obj = &EG(objects_store).object_buckets[current->handle].bucket.obj;
-
-			if (GC_GET_COLOR(obj->buffered) == GC_PURPLE) {
-				zval z;
-
-				INIT_PZVAL(&z);
-				Z_OBJ_HANDLE(z) = current->handle;
-				Z_OBJ_HT(z) = current->u.handlers;
-				zobj_mark_grey(obj, &z TSRMLS_CC);
-			} else {
-				GC_SET_ADDRESS(obj->buffered, NULL);
-				GC_REMOVE_FROM_BUFFER(current);
+		if (current->handle) {
+			if (EG(objects_store).object_buckets) {
+				struct _store_object *obj = &EG(objects_store).object_buckets[current->handle].bucket.obj;
+
+				if (GC_GET_COLOR(obj->buffered) == GC_PURPLE) {
+					zval z;
+
+					INIT_PZVAL(&z);
+					Z_OBJ_HANDLE(z) = current->handle;
+					Z_OBJ_HT(z) = current->u.handlers;
+					zobj_mark_grey(obj, &z TSRMLS_CC);
+				} else {
+					GC_SET_ADDRESS(obj->buffered, NULL);
+					GC_REMOVE_FROM_BUFFER(current);
+				}
 			}
 		} else {
 			if (GC_ZVAL_GET_COLOR(current->u.pz) == GC_PURPLE) {
@@ -623,15 +625,17 @@
 	gc_root_buffer *current = GC_G(roots).next;
 
 	while (current != &GC_G(roots)) {
-		if (current->handle && EG(objects_store).object_buckets) {
-			struct _store_object *obj = &EG(objects_store).object_buckets[current->handle].bucket.obj;
-			zval z;
+		if (current->handle) {
+			if (EG(objects_store).object_buckets) {
+				struct _store_object *obj = &EG(objects_store).object_buckets[current->handle].bucket.obj;
+				zval z;
 
-			GC_SET_ADDRESS(obj->buffered, NULL);
-			INIT_PZVAL(&z);
-			Z_OBJ_HANDLE(z) = current->handle;
-			Z_OBJ_HT(z) = current->u.handlers;
-			zobj_collect_white(&z TSRMLS_CC);
+				GC_SET_ADDRESS(obj->buffered, NULL);
+				INIT_PZVAL(&z);
+				Z_OBJ_HANDLE(z) = current->handle;
+				Z_OBJ_HT(z) = current->u.handlers;
+				zobj_collect_white(&z TSRMLS_CC);
+			}
 		} else {
 			GC_ZVAL_SET_ADDRESS(current->u.pz, NULL);
 			zval_collect_white(current->u.pz TSRMLS_CC);

=== modified file 'Zend/zend_hash.c'
--- Zend/zend_hash.c	2010-08-01 11:58:54 +0000
+++ Zend/zend_hash.c	2011-02-01 10:04:54 +0000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_hash.c 298914 2010-05-03 16:36:04Z felipe $ */
+/* $Id: zend_hash.c 303364 2010-09-14 14:26:37Z johannes $ */
 
 #include "zend.h"
 
@@ -63,6 +63,9 @@
 		case HT_CLEANING:
 			zend_output_debug_string(1, "%s(%d) : ht=%p is being cleaned", file, line, ht);
 			break;
+		default:
+			zend_output_debug_string(1, "%s(%d) : ht=%p is inconsistent", file, line, ht);
+			break;
 	}
 	zend_bailout();
 }

=== modified file 'Zend/zend_hash.h'
--- Zend/zend_hash.h	2010-03-16 09:09:50 +0000
+++ Zend/zend_hash.h	2011-02-01 10:04:54 +0000
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_hash.h 293155 2010-01-05 20:46:53Z sebastian $ */
+/* $Id: zend_hash.h 304083 2010-10-05 11:28:56Z dmitry $ */
 
 #ifndef ZEND_HASH_H
 #define ZEND_HASH_H
@@ -312,7 +312,7 @@
 	}																		\
 	if (*tmp >= '0' && *tmp <= '9') { /* possibly a numeric index */		\
 		const char *end = key + length - 1;									\
-		long idx;															\
+		ulong idx;															\
 																			\
 		if ((*end != '\0') /* not a null terminated string */				\
 		 || (*tmp == '0' && length > 2) /* numbers with leading zeros */	\
@@ -328,11 +328,11 @@
 		}																	\
 		if (tmp == end) {													\
 			if (*key == '-') {												\
-				idx = -idx;													\
-				if (idx > 0) { /* overflow */								\
+				if (idx-1 > LONG_MAX) { /* overflow */						\
 					break;													\
 				}															\
-			} else if (idx < 0) { /* overflow */							\
+				idx = (ulong)(-(long)idx);									\
+			} else if (idx > LONG_MAX) { /* overflow */						\
 				break;														\
 			}																\
 			return func;													\

=== modified file 'Zend/zend_ini_scanner.c'
--- Zend/zend_ini_scanner.c	2010-08-01 11:58:54 +0000
+++ Zend/zend_ini_scanner.c	2011-02-01 10:04:54 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue May 25 22:53:58 2010 */
+/* Generated by re2c 0.13.5 on Sun Aug  1 12:07:43 2010 */
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini_scanner.c 299767 2010-05-26 02:18:17Z felipe $ */
+/* $Id: zend_ini_scanner.c 301758 2010-08-01 15:26:54Z felipe $ */
 
 #include <errno.h>
 #include "zend.h"
@@ -1826,7 +1826,7 @@
 yyc_ST_RAW:
 	{
 		static const unsigned char yybm[] = {
-			160, 160, 160, 160, 160, 160, 160, 160, 
+			 32, 160, 160, 160, 160, 160, 160, 160, 
 			160, 224,   0, 160, 160,   0, 160, 160, 
 			160, 160, 160, 160, 160, 160, 160, 160, 
 			160, 160, 160, 160, 160, 160, 160, 160, 
@@ -1862,150 +1862,158 @@
 		YYDEBUG(135, *YYCURSOR);
 		YYFILL(3);
 		yych = *YYCURSOR;
-		if (yych <= '\r') {
-			if (yych <= '\t') {
-				if (yych >= '\t') goto yy139;
+		if (yych <= '\f') {
+			if (yych <= 0x08) {
+				if (yych >= 0x01) goto yy139;
 			} else {
-				if (yych <= '\n') goto yy140;
-				if (yych >= '\r') goto yy142;
+				if (yych <= '\t') goto yy141;
+				if (yych <= '\n') goto yy142;
+				goto yy139;
 			}
 		} else {
 			if (yych <= ' ') {
-				if (yych >= ' ') goto yy139;
+				if (yych <= '\r') goto yy144;
+				if (yych <= 0x1F) goto yy139;
+				goto yy141;
 			} else {
-				if (yych == ';') goto yy143;
+				if (yych == ';') goto yy145;
+				goto yy139;
 			}
 		}
 		YYDEBUG(137, *YYCURSOR);
 		++YYCURSOR;
-		yych = *YYCURSOR;
-		goto yy155;
-yy138:
 		YYDEBUG(138, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 445 "Zend/zend_ini_scanner.l"
-		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-	/* Eat leading and trailing double quotes */
-	if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {
-		SCNG(yy_text)++;
-		yyleng = yyleng - 2;
-	}
-	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+#line 567 "Zend/zend_ini_scanner.l"
+		{ /* End of option value (if EOF is reached before EOL */
+	BEGIN(INITIAL);
+	return END_OF_LINE;
 }
-#line 1896 "Zend/zend_ini_scanner.c"
+#line 1893 "Zend/zend_ini_scanner.c"
 yy139:
 		YYDEBUG(139, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy151;
-		}
-		if (yych <= '\f') {
-			if (yych == '\n') goto yy150;
-			goto yy154;
-		} else {
-			if (yych <= '\r') goto yy153;
-			if (yych == ';') goto yy145;
-			goto yy154;
-		}
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy156;
 yy140:
 		YYDEBUG(140, *YYCURSOR);
-		++YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 445 "Zend/zend_ini_scanner.l"
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+	/* Eat leading and trailing double quotes */
+	if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 1911 "Zend/zend_ini_scanner.c"
 yy141:
 		YYDEBUG(141, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 458 "Zend/zend_ini_scanner.l"
-		{ /* End of option value */
-	BEGIN(INITIAL);
-	SCNG(lineno)++;
-	return END_OF_LINE;
-}
-#line 1924 "Zend/zend_ini_scanner.c"
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy152;
+		}
+		if (yych <= '\f') {
+			if (yych == '\n') goto yy151;
+			goto yy156;
+		} else {
+			if (yych <= '\r') goto yy154;
+			if (yych == ';') goto yy146;
+			goto yy156;
+		}
 yy142:
 		YYDEBUG(142, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy150;
-		goto yy141;
+		++YYCURSOR;
 yy143:
 		YYDEBUG(143, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		goto yy146;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 458 "Zend/zend_ini_scanner.l"
+		{ /* End of option value */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 1939 "Zend/zend_ini_scanner.c"
+yy144:
 		YYDEBUG(144, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 567 "Zend/zend_ini_scanner.l"
-		{ /* End of option value (if EOF is reached before EOL */
-	BEGIN(INITIAL);
-	return END_OF_LINE;
-}
-#line 1942 "Zend/zend_ini_scanner.c"
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy151;
+		goto yy143;
 yy145:
 		YYDEBUG(145, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(2);
-		yych = *YYCURSOR;
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy147;
 yy146:
 		YYDEBUG(146, *YYCURSOR);
-		if (yybm[0+yych] & 32) {
-			goto yy145;
-		}
-		if (yych >= '\r') goto yy149;
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
 yy147:
 		YYDEBUG(147, *YYCURSOR);
-		++YYCURSOR;
+		if (yybm[0+yych] & 32) {
+			goto yy146;
+		}
+		if (yych >= '\r') goto yy150;
 yy148:
 		YYDEBUG(148, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 554 "Zend/zend_ini_scanner.l"
-		{ /* Comment */
-	BEGIN(INITIAL);
-	SCNG(lineno)++;
-	return END_OF_LINE;
-}
-#line 1966 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
 yy149:
 		YYDEBUG(149, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy147;
-		goto yy148;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 554 "Zend/zend_ini_scanner.l"
+		{ /* Comment */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 1973 "Zend/zend_ini_scanner.c"
 yy150:
 		YYDEBUG(150, *YYCURSOR);
 		yych = *++YYCURSOR;
-		goto yy141;
+		if (yych == '\n') goto yy148;
+		goto yy149;
 yy151:
 		YYDEBUG(151, *YYCURSOR);
-		yyaccept = 0;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(2);
-		yych = *YYCURSOR;
+		yych = *++YYCURSOR;
+		goto yy143;
+yy152:
 		YYDEBUG(152, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy151;
-		}
-		if (yych <= '\f') {
-			if (yych == '\n') goto yy150;
-			goto yy154;
-		} else {
-			if (yych <= '\r') goto yy153;
-			if (yych == ';') goto yy145;
-			goto yy154;
-		}
-yy153:
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
 		YYDEBUG(153, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy150;
-		goto yy141;
+		if (yybm[0+yych] & 64) {
+			goto yy152;
+		}
+		if (yych <= '\f') {
+			if (yych <= 0x00) goto yy140;
+			if (yych == '\n') goto yy151;
+			goto yy155;
+		} else {
+			if (yych <= '\r') goto yy154;
+			if (yych == ';') goto yy146;
+			goto yy155;
+		}
 yy154:
 		YYDEBUG(154, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy151;
+		goto yy143;
 yy155:
 		YYDEBUG(155, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy156:
+		YYDEBUG(156, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy154;
+			goto yy155;
 		}
-		goto yy138;
+		goto yy140;
 	}
 /* *********************************** */
 yyc_ST_SECTION_RAW:
@@ -2044,85 +2052,85 @@
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(156, *YYCURSOR);
+		YYDEBUG(157, *YYCURSOR);
 		YYFILL(3);
 		yych = *YYCURSOR;
 		if (yych <= '\f') {
-			if (yych == '\n') goto yy160;
+			if (yych == '\n') goto yy161;
 		} else {
-			if (yych <= '\r') goto yy160;
-			if (yych == ']') goto yy162;
+			if (yych <= '\r') goto yy161;
+			if (yych == ']') goto yy163;
 		}
-		YYDEBUG(158, *YYCURSOR);
-		++YYCURSOR;
-		yych = *YYCURSOR;
-		goto yy169;
-yy159:
 		YYDEBUG(159, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 454 "Zend/zend_ini_scanner.l"
-		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-	RETURN_TOKEN(TC_RAW, yytext, yyleng);
-}
-#line 2068 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy170;
 yy160:
 		YYDEBUG(160, *YYCURSOR);
-		++YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 454 "Zend/zend_ini_scanner.l"
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 2076 "Zend/zend_ini_scanner.c"
+yy161:
 		YYDEBUG(161, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 572 "Zend/zend_ini_scanner.l"
-		{
-	return 0;
-}
-#line 2078 "Zend/zend_ini_scanner.c"
-yy162:
+		++YYCURSOR;
 		YYDEBUG(162, *YYCURSOR);
-		++YYCURSOR;
-		yych = *YYCURSOR;
-		goto yy165;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 572 "Zend/zend_ini_scanner.l"
+		{
+	return 0;
+}
+#line 2086 "Zend/zend_ini_scanner.c"
 yy163:
 		YYDEBUG(163, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 374 "Zend/zend_ini_scanner.l"
-		{ /* End of section */
-	BEGIN(INITIAL);
-	SCNG(lineno)++;
-	return ']';
-}
-#line 2093 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy166;
 yy164:
 		YYDEBUG(164, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(2);
-		yych = *YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 374 "Zend/zend_ini_scanner.l"
+		{ /* End of section */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return ']';
+}
+#line 2101 "Zend/zend_ini_scanner.c"
 yy165:
 		YYDEBUG(165, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy164;
-		}
-		if (yych == '\n') goto yy166;
-		if (yych == '\r') goto yy167;
-		goto yy163;
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
 yy166:
 		YYDEBUG(166, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy163;
+		if (yybm[0+yych] & 64) {
+			goto yy165;
+		}
+		if (yych == '\n') goto yy167;
+		if (yych == '\r') goto yy168;
+		goto yy164;
 yy167:
 		YYDEBUG(167, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy166;
-		goto yy163;
+		goto yy164;
 yy168:
 		YYDEBUG(168, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy167;
+		goto yy164;
 yy169:
 		YYDEBUG(169, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy168;
+			goto yy169;
 		}
-		goto yy159;
+		goto yy160;
 	}
 /* *********************************** */
 yyc_ST_SECTION_VALUE:
@@ -2161,590 +2169,590 @@
 			132, 132, 132, 132, 132, 132, 132, 132, 
 			132, 132, 132, 132, 132, 132, 132, 132, 
 		};
-		YYDEBUG(170, *YYCURSOR);
+		YYDEBUG(171, *YYCURSOR);
 		YYFILL(3);
 		yych = *YYCURSOR;
 		if (yych <= '-') {
 			if (yych <= ' ') {
 				if (yych <= '\n') {
-					if (yych <= 0x08) goto yy172;
-					if (yych <= '\t') goto yy174;
-					goto yy175;
+					if (yych <= 0x08) goto yy173;
+					if (yych <= '\t') goto yy175;
+					goto yy176;
 				} else {
-					if (yych == '\r') goto yy175;
-					if (yych >= ' ') goto yy174;
+					if (yych == '\r') goto yy176;
+					if (yych >= ' ') goto yy175;
 				}
 			} else {
 				if (yych <= '$') {
-					if (yych == '"') goto yy177;
-					if (yych >= '$') goto yy179;
+					if (yych == '"') goto yy178;
+					if (yych >= '$') goto yy180;
 				} else {
-					if (yych == '\'') goto yy180;
-					if (yych >= '-') goto yy181;
+					if (yych == '\'') goto yy181;
+					if (yych >= '-') goto yy182;
 				}
 			}
 		} else {
 			if (yych <= 'Z') {
 				if (yych <= '9') {
-					if (yych <= '.') goto yy182;
-					if (yych >= '0') goto yy183;
+					if (yych <= '.') goto yy183;
+					if (yych >= '0') goto yy184;
 				} else {
-					if (yych == ';') goto yy175;
-					if (yych >= 'A') goto yy185;
+					if (yych == ';') goto yy176;
+					if (yych >= 'A') goto yy186;
 				}
 			} else {
 				if (yych <= '^') {
-					if (yych <= '[') goto yy172;
-					if (yych <= '\\') goto yy187;
-					if (yych <= ']') goto yy188;
+					if (yych <= '[') goto yy173;
+					if (yych <= '\\') goto yy188;
+					if (yych <= ']') goto yy189;
 				} else {
-					if (yych == '`') goto yy172;
-					if (yych <= 'z') goto yy185;
+					if (yych == '`') goto yy173;
+					if (yych <= 'z') goto yy186;
 				}
 			}
 		}
-yy172:
-		YYDEBUG(172, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		goto yy195;
 yy173:
 		YYDEBUG(173, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 490 "Zend/zend_ini_scanner.l"
-		{ /* Get rest as section/offset value */
-	RETURN_TOKEN(TC_STRING, yytext, yyleng);
-}
-#line 2219 "Zend/zend_ini_scanner.c"
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy196;
 yy174:
 		YYDEBUG(174, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x1F) {
-			if (yych == '\t') goto yy221;
-			goto yy195;
-		} else {
-			if (yych <= ' ') goto yy221;
-			if (yych == '"') goto yy223;
-			goto yy195;
-		}
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 490 "Zend/zend_ini_scanner.l"
+		{ /* Get rest as section/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+#line 2227 "Zend/zend_ini_scanner.c"
 yy175:
 		YYDEBUG(175, *YYCURSOR);
-		++YYCURSOR;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy222;
+			goto yy196;
+		} else {
+			if (yych <= ' ') goto yy222;
+			if (yych == '"') goto yy224;
+			goto yy196;
+		}
 yy176:
 		YYDEBUG(176, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 572 "Zend/zend_ini_scanner.l"
-		{
-	return 0;
-}
-#line 2242 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
 yy177:
 		YYDEBUG(177, *YYCURSOR);
-		++YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 572 "Zend/zend_ini_scanner.l"
+		{
+	return 0;
+}
+#line 2250 "Zend/zend_ini_scanner.c"
 yy178:
 		YYDEBUG(178, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 494 "Zend/zend_ini_scanner.l"
-		{ /* Double quoted '"' string start */
-	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
-	return '"';
-}
-#line 2254 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
 yy179:
 		YYDEBUG(179, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy176;
-			if (yych <= '[') goto yy194;
-			goto yy199;
-		} else {
-			if (yych == '{') goto yy219;
-			goto yy194;
-		}
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 494 "Zend/zend_ini_scanner.l"
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
+	return '"';
+}
+#line 2262 "Zend/zend_ini_scanner.c"
 yy180:
 		YYDEBUG(180, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy215;
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy177;
+			if (yych <= '[') goto yy195;
+			goto yy200;
+		} else {
+			if (yych == '{') goto yy220;
+			goto yy195;
 		}
-		goto yy176;
 yy181:
 		YYDEBUG(181, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy195;
-		if (yych <= '9') goto yy213;
-		goto yy195;
+		if (yybm[0+yych] & 128) {
+			goto yy216;
+		}
+		goto yy177;
 yy182:
 		YYDEBUG(182, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy195;
-		if (yych <= '9') goto yy211;
-		goto yy195;
+		if (yych <= '/') goto yy196;
+		if (yych <= '9') goto yy214;
+		goto yy196;
 yy183:
 		YYDEBUG(183, *YYCURSOR);
-		yyaccept = 2;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '\'') {
-			if (yych <= '\r') {
-				if (yych == '\n') goto yy184;
-				if (yych <= '\f') goto yy195;
-			} else {
-				if (yych == '"') goto yy184;
-				if (yych <= '&') goto yy195;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych == '.') goto yy207;
-				if (yych <= '/') goto yy195;
-				goto yy209;
-			} else {
-				if (yych <= ';') {
-					if (yych <= ':') goto yy195;
-				} else {
-					if (yych != ']') goto yy195;
-				}
-			}
-		}
+		if (yych <= '/') goto yy196;
+		if (yych <= '9') goto yy212;
+		goto yy196;
 yy184:
 		YYDEBUG(184, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 468 "Zend/zend_ini_scanner.l"
-		{ /* Get number option value as string */
-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
-}
-#line 2320 "Zend/zend_ini_scanner.c"
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy185;
+				if (yych <= '\f') goto yy196;
+			} else {
+				if (yych == '"') goto yy185;
+				if (yych <= '&') goto yy196;
+			}
+		} else {
+			if (yych <= '9') {
+				if (yych == '.') goto yy208;
+				if (yych <= '/') goto yy196;
+				goto yy210;
+			} else {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy196;
+				} else {
+					if (yych != ']') goto yy196;
+				}
+			}
+		}
 yy185:
 		YYDEBUG(185, *YYCURSOR);
-		yyaccept = 3;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 32) {
-			goto yy205;
-		}
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych != '\n') goto yy195;
-			} else {
-				if (yych <= '\r') goto yy186;
-				if (yych <= '!') goto yy195;
-			}
-		} else {
-			if (yych <= ':') {
-				if (yych != '\'') goto yy195;
-			} else {
-				if (yych <= ';') goto yy186;
-				if (yych != ']') goto yy195;
-			}
-		}
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 468 "Zend/zend_ini_scanner.l"
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+#line 2328 "Zend/zend_ini_scanner.c"
 yy186:
 		YYDEBUG(186, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 464 "Zend/zend_ini_scanner.l"
-		{ /* Get constant option value */
-	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
-}
-#line 2350 "Zend/zend_ini_scanner.c"
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy206;
+		}
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych != '\n') goto yy196;
+			} else {
+				if (yych <= '\r') goto yy187;
+				if (yych <= '!') goto yy196;
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych != '\'') goto yy196;
+			} else {
+				if (yych <= ';') goto yy187;
+				if (yych != ']') goto yy196;
+			}
+		}
 yy187:
 		YYDEBUG(187, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy194;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 464 "Zend/zend_ini_scanner.l"
+		{ /* Get constant option value */
+	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
+}
+#line 2358 "Zend/zend_ini_scanner.c"
 yy188:
 		YYDEBUG(188, *YYCURSOR);
-		++YYCURSOR;
-		yych = *YYCURSOR;
-		goto yy191;
+		yych = *++YYCURSOR;
+		goto yy195;
 yy189:
 		YYDEBUG(189, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 374 "Zend/zend_ini_scanner.l"
-		{ /* End of section */
-	BEGIN(INITIAL);
-	SCNG(lineno)++;
-	return ']';
-}
-#line 2369 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy192;
 yy190:
 		YYDEBUG(190, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(2);
-		yych = *YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 374 "Zend/zend_ini_scanner.l"
+		{ /* End of section */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return ']';
+}
+#line 2377 "Zend/zend_ini_scanner.c"
 yy191:
 		YYDEBUG(191, *YYCURSOR);
-		if (yybm[0+yych] & 2) {
-			goto yy190;
-		}
-		if (yych == '\n') goto yy192;
-		if (yych == '\r') goto yy193;
-		goto yy189;
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
 yy192:
 		YYDEBUG(192, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy189;
+		if (yybm[0+yych] & 2) {
+			goto yy191;
+		}
+		if (yych == '\n') goto yy193;
+		if (yych == '\r') goto yy194;
+		goto yy190;
 yy193:
 		YYDEBUG(193, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy192;
-		goto yy189;
+		goto yy190;
 yy194:
 		YYDEBUG(194, *YYCURSOR);
-		yyaccept = 0;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy193;
+		goto yy190;
 yy195:
 		YYDEBUG(195, *YYCURSOR);
-		if (yybm[0+yych] & 4) {
-			goto yy194;
-		}
-		if (yych == '$') goto yy197;
-		if (yych != '\\') goto yy173;
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy196:
 		YYDEBUG(196, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		goto yy194;
+		if (yybm[0+yych] & 4) {
+			goto yy195;
+		}
+		if (yych == '$') goto yy198;
+		if (yych != '\\') goto yy174;
 yy197:
 		YYDEBUG(197, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy198;
-			if (yych <= '[') goto yy194;
-			goto yy199;
-		} else {
-			if (yych != '{') goto yy194;
-		}
+		goto yy195;
 yy198:
 		YYDEBUG(198, *YYCURSOR);
-		YYCURSOR = YYMARKER;
-		if (yyaccept <= 1) {
-			if (yyaccept <= 0) {
-				goto yy173;
-			} else {
-				goto yy176;
-			}
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy199;
+			if (yych <= '[') goto yy195;
+			goto yy200;
 		} else {
-			if (yyaccept <= 2) {
-				goto yy184;
-			} else {
-				goto yy186;
-			}
+			if (yych != '{') goto yy195;
 		}
 yy199:
 		YYDEBUG(199, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yybm[0+yych] & 8) {
-			goto yy200;
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 1) {
+			if (yyaccept <= 0) {
+				goto yy174;
+			} else {
+				goto yy177;
+			}
+		} else {
+			if (yyaccept <= 2) {
+				goto yy185;
+			} else {
+				goto yy187;
+			}
 		}
-		if (yych == '\\') goto yy202;
-		goto yy194;
 yy200:
 		YYDEBUG(200, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy201;
+		}
+		if (yych == '\\') goto yy203;
+		goto yy195;
+yy201:
 		YYDEBUG(201, *YYCURSOR);
-		if (yybm[0+yych] & 8) {
-			goto yy200;
-		}
-		if (yych == '\\') goto yy204;
-		goto yy194;
-yy202:
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(202, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy201;
+		}
+		if (yych == '\\') goto yy205;
+		goto yy195;
+yy203:
 		YYDEBUG(203, *YYCURSOR);
-		if (yybm[0+yych] & 8) {
-			goto yy200;
-		}
-		if (yych == '\\') goto yy202;
-		goto yy194;
-yy204:
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(204, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
 		if (yybm[0+yych] & 8) {
-			goto yy200;
+			goto yy201;
 		}
-		if (yych == '\\') goto yy202;
-		goto yy194;
+		if (yych == '\\') goto yy203;
+		goto yy195;
 yy205:
 		YYDEBUG(205, *YYCURSOR);
-		yyaccept = 3;
-		YYMARKER = ++YYCURSOR;
+		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy201;
+		}
+		if (yych == '\\') goto yy203;
+		goto yy195;
+yy206:
 		YYDEBUG(206, *YYCURSOR);
-		if (yybm[0+yych] & 32) {
-			goto yy205;
-		}
-		if (yych <= '$') {
-			if (yych <= '\r') {
-				if (yych == '\n') goto yy186;
-				if (yych <= '\f') goto yy194;
-				goto yy186;
-			} else {
-				if (yych == '"') goto yy186;
-				if (yych <= '#') goto yy194;
-				goto yy197;
-			}
-		} else {
-			if (yych <= ';') {
-				if (yych == '\'') goto yy186;
-				if (yych <= ':') goto yy194;
-				goto yy186;
-			} else {
-				if (yych <= '[') goto yy194;
-				if (yych <= '\\') goto yy196;
-				if (yych <= ']') goto yy186;
-				goto yy194;
-			}
-		}
-yy207:
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(207, *YYCURSOR);
-		yyaccept = 2;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		if (yybm[0+yych] & 32) {
+			goto yy206;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy187;
+				if (yych <= '\f') goto yy195;
+				goto yy187;
+			} else {
+				if (yych == '"') goto yy187;
+				if (yych <= '#') goto yy195;
+				goto yy198;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy187;
+				if (yych <= ':') goto yy195;
+				goto yy187;
+			} else {
+				if (yych <= '[') goto yy195;
+				if (yych <= '\\') goto yy197;
+				if (yych <= ']') goto yy187;
+				goto yy195;
+			}
+		}
+yy208:
 		YYDEBUG(208, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy207;
-		}
-		if (yych <= '$') {
-			if (yych <= '\r') {
-				if (yych == '\n') goto yy184;
-				if (yych <= '\f') goto yy194;
-				goto yy184;
-			} else {
-				if (yych == '"') goto yy184;
-				if (yych <= '#') goto yy194;
-				goto yy197;
-			}
-		} else {
-			if (yych <= ';') {
-				if (yych == '\'') goto yy184;
-				if (yych <= ':') goto yy194;
-				goto yy184;
-			} else {
-				if (yych <= '[') goto yy194;
-				if (yych <= '\\') goto yy196;
-				if (yych <= ']') goto yy184;
-				goto yy194;
-			}
-		}
-yy209:
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(209, *YYCURSOR);
-		yyaccept = 2;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy208;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy185;
+				if (yych <= '\f') goto yy195;
+				goto yy185;
+			} else {
+				if (yych == '"') goto yy185;
+				if (yych <= '#') goto yy195;
+				goto yy198;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy185;
+				if (yych <= ':') goto yy195;
+				goto yy185;
+			} else {
+				if (yych <= '[') goto yy195;
+				if (yych <= '\\') goto yy197;
+				if (yych <= ']') goto yy185;
+				goto yy195;
+			}
+		}
+yy210:
 		YYDEBUG(210, *YYCURSOR);
-		if (yych <= '\'') {
-			if (yych <= '!') {
-				if (yych <= '\n') {
-					if (yych <= '\t') goto yy194;
-					goto yy184;
-				} else {
-					if (yych == '\r') goto yy184;
-					goto yy194;
-				}
-			} else {
-				if (yych <= '#') {
-					if (yych <= '"') goto yy184;
-					goto yy194;
-				} else {
-					if (yych <= '$') goto yy197;
-					if (yych <= '&') goto yy194;
-					goto yy184;
-				}
-			}
-		} else {
-			if (yych <= ':') {
-				if (yych <= '.') {
-					if (yych <= '-') goto yy194;
-					goto yy207;
-				} else {
-					if (yych <= '/') goto yy194;
-					if (yych <= '9') goto yy209;
-					goto yy194;
-				}
-			} else {
-				if (yych <= '[') {
-					if (yych <= ';') goto yy184;
-					goto yy194;
-				} else {
-					if (yych <= '\\') goto yy196;
-					if (yych <= ']') goto yy184;
-					goto yy194;
-				}
-			}
-		}
-yy211:
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(211, *YYCURSOR);
-		yyaccept = 2;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		if (yych <= '\'') {
+			if (yych <= '!') {
+				if (yych <= '\n') {
+					if (yych <= '\t') goto yy195;
+					goto yy185;
+				} else {
+					if (yych == '\r') goto yy185;
+					goto yy195;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= '"') goto yy185;
+					goto yy195;
+				} else {
+					if (yych <= '$') goto yy198;
+					if (yych <= '&') goto yy195;
+					goto yy185;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '.') {
+					if (yych <= '-') goto yy195;
+					goto yy208;
+				} else {
+					if (yych <= '/') goto yy195;
+					if (yych <= '9') goto yy210;
+					goto yy195;
+				}
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy185;
+					goto yy195;
+				} else {
+					if (yych <= '\\') goto yy197;
+					if (yych <= ']') goto yy185;
+					goto yy195;
+				}
+			}
+		}
+yy212:
 		YYDEBUG(212, *YYCURSOR);
-		if (yych <= '&') {
-			if (yych <= '\r') {
-				if (yych == '\n') goto yy184;
-				if (yych <= '\f') goto yy194;
-				goto yy184;
-			} else {
-				if (yych <= '"') {
-					if (yych <= '!') goto yy194;
-					goto yy184;
-				} else {
-					if (yych == '$') goto yy197;
-					goto yy194;
-				}
-			}
-		} else {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy184;
-				if (yych <= '/') goto yy194;
-				if (yych <= '9') goto yy211;
-				goto yy194;
-			} else {
-				if (yych <= '[') {
-					if (yych <= ';') goto yy184;
-					goto yy194;
-				} else {
-					if (yych <= '\\') goto yy196;
-					if (yych <= ']') goto yy184;
-					goto yy194;
-				}
-			}
-		}
-yy213:
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(213, *YYCURSOR);
-		yyaccept = 2;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy185;
+				if (yych <= '\f') goto yy195;
+				goto yy185;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy195;
+					goto yy185;
+				} else {
+					if (yych == '$') goto yy198;
+					goto yy195;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy185;
+				if (yych <= '/') goto yy195;
+				if (yych <= '9') goto yy212;
+				goto yy195;
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy185;
+					goto yy195;
+				} else {
+					if (yych <= '\\') goto yy197;
+					if (yych <= ']') goto yy185;
+					goto yy195;
+				}
+			}
+		}
+yy214:
 		YYDEBUG(214, *YYCURSOR);
-		if (yych <= '&') {
-			if (yych <= '\r') {
-				if (yych == '\n') goto yy184;
-				if (yych <= '\f') goto yy194;
-				goto yy184;
-			} else {
-				if (yych <= '"') {
-					if (yych <= '!') goto yy194;
-					goto yy184;
-				} else {
-					if (yych == '$') goto yy197;
-					goto yy194;
-				}
-			}
-		} else {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy184;
-				if (yych <= '/') goto yy194;
-				if (yych <= '9') goto yy213;
-				goto yy194;
-			} else {
-				if (yych <= '[') {
-					if (yych <= ';') goto yy184;
-					goto yy194;
-				} else {
-					if (yych <= '\\') goto yy196;
-					if (yych <= ']') goto yy184;
-					goto yy194;
-				}
-			}
-		}
-yy215:
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(215, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy185;
+				if (yych <= '\f') goto yy195;
+				goto yy185;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy195;
+					goto yy185;
+				} else {
+					if (yych == '$') goto yy198;
+					goto yy195;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy185;
+				if (yych <= '/') goto yy195;
+				if (yych <= '9') goto yy214;
+				goto yy195;
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy185;
+					goto yy195;
+				} else {
+					if (yych <= '\\') goto yy197;
+					if (yych <= ']') goto yy185;
+					goto yy195;
+				}
+			}
+		}
+yy216:
 		YYDEBUG(216, *YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy215;
-		}
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(217, *YYCURSOR);
-		++YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy216;
+		}
 		YYDEBUG(218, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 365 "Zend/zend_ini_scanner.l"
-		{ /* Raw string */
-	/* Eat leading and trailing single quotes */
-	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
-		SCNG(yy_text)++;
-		yyleng = yyleng - 2;
-	}
-	RETURN_TOKEN(TC_RAW, yytext, yyleng);
-}
-#line 2690 "Zend/zend_ini_scanner.c"
-yy219:
+		++YYCURSOR;
 		YYDEBUG(219, *YYCURSOR);
-		++YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 365 "Zend/zend_ini_scanner.l"
+		{ /* Raw string */
+	/* Eat leading and trailing single quotes */
+	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 2698 "Zend/zend_ini_scanner.c"
+yy220:
 		YYDEBUG(220, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 398 "Zend/zend_ini_scanner.l"
-		{ /* Variable start */
-	yy_push_state(ST_VARNAME TSRMLS_CC);
-	return TC_DOLLAR_CURLY;
-}
-#line 2701 "Zend/zend_ini_scanner.c"
-yy221:
+		++YYCURSOR;
 		YYDEBUG(221, *YYCURSOR);
-		yyaccept = 0;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 398 "Zend/zend_ini_scanner.l"
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME TSRMLS_CC);
+	return TC_DOLLAR_CURLY;
+}
+#line 2709 "Zend/zend_ini_scanner.c"
+yy222:
 		YYDEBUG(222, *YYCURSOR);
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy194;
-				if (yych <= '\t') goto yy221;
-				if (yych <= '\n') goto yy173;
-				goto yy194;
-			} else {
-				if (yych <= 0x1F) {
-					if (yych <= '\r') goto yy173;
-					goto yy194;
-				} else {
-					if (yych <= ' ') goto yy221;
-					if (yych <= '!') goto yy194;
-				}
-			}
-		} else {
-			if (yych <= ':') {
-				if (yych <= '$') {
-					if (yych <= '#') goto yy194;
-					goto yy197;
-				} else {
-					if (yych == '\'') goto yy173;
-					goto yy194;
-				}
-			} else {
-				if (yych <= '[') {
-					if (yych <= ';') goto yy173;
-					goto yy194;
-				} else {
-					if (yych <= '\\') goto yy196;
-					if (yych <= ']') goto yy173;
-					goto yy194;
-				}
-			}
-		}
-yy223:
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(223, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) goto yy195;
+				if (yych <= '\t') goto yy222;
+				if (yych <= '\n') goto yy174;
+				goto yy195;
+			} else {
+				if (yych <= 0x1F) {
+					if (yych <= '\r') goto yy174;
+					goto yy195;
+				} else {
+					if (yych <= ' ') goto yy222;
+					if (yych <= '!') goto yy195;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '$') {
+					if (yych <= '#') goto yy195;
+					goto yy198;
+				} else {
+					if (yych == '\'') goto yy174;
+					goto yy195;
+				}
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy174;
+					goto yy195;
+				} else {
+					if (yych <= '\\') goto yy197;
+					if (yych <= ']') goto yy174;
+					goto yy195;
+				}
+			}
+		}
+yy224:
+		YYDEBUG(224, *YYCURSOR);
 		++YYCURSOR;
 		yych = *YYCURSOR;
-		goto yy178;
+		goto yy179;
 	}
 /* *********************************** */
 yyc_ST_VALUE:
@@ -2783,27 +2791,27 @@
 			162, 162, 162, 162, 162, 162, 162, 162, 
 			162, 162, 162, 162, 162, 162, 162, 162, 
 		};
-		YYDEBUG(224, *YYCURSOR);
+		YYDEBUG(225, *YYCURSOR);
 		YYFILL(6);
 		yych = *YYCURSOR;
 		YYDEBUG(-1, yych);
 		switch (yych) {
-		case 0x00:	goto yy226;
+		case 0x00:	goto yy227;
 		case '\t':
-		case ' ':	goto yy230;
-		case '\n':	goto yy232;
-		case '\r':	goto yy234;
+		case ' ':	goto yy231;
+		case '\n':	goto yy233;
+		case '\r':	goto yy235;
 		case '!':
 		case '&':
 		case '(':
 		case ')':
 		case '|':
-		case '~':	goto yy235;
-		case '"':	goto yy237;
-		case '$':	goto yy239;
-		case '\'':	goto yy240;
-		case '-':	goto yy241;
-		case '.':	goto yy242;
+		case '~':	goto yy236;
+		case '"':	goto yy238;
+		case '$':	goto yy240;
+		case '\'':	goto yy241;
+		case '-':	goto yy242;
+		case '.':	goto yy243;
 		case '0':
 		case '1':
 		case '2':
@@ -2813,9 +2821,9 @@
 		case '6':
 		case '7':
 		case '8':
-		case '9':	goto yy243;
-		case ';':	goto yy245;
-		case '=':	goto yy246;
+		case '9':	goto yy244;
+		case ';':	goto yy246;
+		case '=':	goto yy247;
 		case 'A':
 		case 'B':
 		case 'C':
@@ -2858,189 +2866,189 @@
 		case 'v':
 		case 'w':
 		case 'x':
-		case 'z':	goto yy248;
+		case 'z':	goto yy249;
 		case 'F':
-		case 'f':	goto yy250;
+		case 'f':	goto yy251;
 		case 'N':
-		case 'n':	goto yy251;
+		case 'n':	goto yy252;
 		case 'O':
-		case 'o':	goto yy252;
+		case 'o':	goto yy253;
 		case 'T':
-		case 't':	goto yy253;
+		case 't':	goto yy254;
 		case 'Y':
-		case 'y':	goto yy254;
-		default:	goto yy228;
+		case 'y':	goto yy255;
+		default:	goto yy229;
 		}
-yy226:
-		YYDEBUG(226, *YYCURSOR);
-		++YYCURSOR;
 yy227:
 		YYDEBUG(227, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 567 "Zend/zend_ini_scanner.l"
-		{ /* End of option value (if EOF is reached before EOL */
-	BEGIN(INITIAL);
-	return END_OF_LINE;
-}
-#line 2886 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
 yy228:
 		YYDEBUG(228, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		goto yy256;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 567 "Zend/zend_ini_scanner.l"
+		{ /* End of option value (if EOF is reached before EOL */
+	BEGIN(INITIAL);
+	return END_OF_LINE;
+}
+#line 2894 "Zend/zend_ini_scanner.c"
 yy229:
 		YYDEBUG(229, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy257;
+yy230:
+		YYDEBUG(230, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 486 "Zend/zend_ini_scanner.l"
 		{ /* Get everything else as option/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 2899 "Zend/zend_ini_scanner.c"
-yy230:
-		YYDEBUG(230, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		goto yy306;
+#line 2907 "Zend/zend_ini_scanner.c"
 yy231:
 		YYDEBUG(231, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy307;
+yy232:
+		YYDEBUG(232, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 540 "Zend/zend_ini_scanner.l"
 		{
 	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
 }
-#line 2912 "Zend/zend_ini_scanner.c"
-yy232:
-		YYDEBUG(232, *YYCURSOR);
-		++YYCURSOR;
+#line 2920 "Zend/zend_ini_scanner.c"
 yy233:
 		YYDEBUG(233, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 458 "Zend/zend_ini_scanner.l"
-		{ /* End of option value */
-	BEGIN(INITIAL);
-	SCNG(lineno)++;
-	return END_OF_LINE;
-}
-#line 2925 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
 yy234:
 		YYDEBUG(234, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy304;
-		goto yy233;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 458 "Zend/zend_ini_scanner.l"
+		{ /* End of option value */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 2933 "Zend/zend_ini_scanner.c"
 yy235:
 		YYDEBUG(235, *YYCURSOR);
-		++YYCURSOR;
-		yych = *YYCURSOR;
-		goto yy303;
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy305;
+		goto yy234;
 yy236:
 		YYDEBUG(236, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy304;
+yy237:
+		YYDEBUG(237, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 476 "Zend/zend_ini_scanner.l"
 		{ /* Boolean operators */
 	return yytext[0];
 }
-#line 2943 "Zend/zend_ini_scanner.c"
-yy237:
-		YYDEBUG(237, *YYCURSOR);
-		++YYCURSOR;
+#line 2951 "Zend/zend_ini_scanner.c"
 yy238:
 		YYDEBUG(238, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 494 "Zend/zend_ini_scanner.l"
-		{ /* Double quoted '"' string start */
-	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
-	return '"';
-}
-#line 2955 "Zend/zend_ini_scanner.c"
+		++YYCURSOR;
 yy239:
 		YYDEBUG(239, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy227;
-			if (yych <= '[') goto yy255;
-			goto yy262;
-		} else {
-			if (yych == '{') goto yy300;
-			goto yy255;
-		}
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 494 "Zend/zend_ini_scanner.l"
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
+	return '"';
+}
+#line 2963 "Zend/zend_ini_scanner.c"
 yy240:
 		YYDEBUG(240, *YYCURSOR);
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy296;
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy228;
+			if (yych <= '[') goto yy256;
+			goto yy263;
+		} else {
+			if (yych == '{') goto yy301;
+			goto yy256;
 		}
-		goto yy227;
 yy241:
 		YYDEBUG(241, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy256;
-		if (yych <= '9') goto yy294;
-		goto yy256;
+		if (yybm[0+yych] & 128) {
+			goto yy297;
+		}
+		goto yy228;
 yy242:
 		YYDEBUG(242, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '/') goto yy256;
-		if (yych <= '9') goto yy292;
-		goto yy256;
+		if (yych <= '/') goto yy257;
+		if (yych <= '9') goto yy295;
+		goto yy257;
 yy243:
 		YYDEBUG(243, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy257;
+		if (yych <= '9') goto yy293;
+		goto yy257;
+yy244:
+		YYDEBUG(244, *YYCURSOR);
 		yyaccept = 3;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '.') {
 			if (yych <= '\r') {
 				if (yych <= 0x08) {
-					if (yych >= 0x01) goto yy256;
+					if (yych >= 0x01) goto yy257;
 				} else {
-					if (yych <= '\n') goto yy244;
-					if (yych <= '\f') goto yy256;
+					if (yych <= '\n') goto yy245;
+					if (yych <= '\f') goto yy257;
 				}
 			} else {
 				if (yych <= '%') {
-					if (yych <= 0x1F) goto yy256;
-					if (yych >= '#') goto yy256;
+					if (yych <= 0x1F) goto yy257;
+					if (yych >= '#') goto yy257;
 				} else {
-					if (yych <= ')') goto yy244;
-					if (yych <= '-') goto yy256;
-					goto yy288;
+					if (yych <= ')') goto yy245;
+					if (yych <= '-') goto yy257;
+					goto yy289;
 				}
 			}
 		} else {
 			if (yych <= '<') {
 				if (yych <= '9') {
-					if (yych <= '/') goto yy256;
-					goto yy290;
+					if (yych <= '/') goto yy257;
+					goto yy291;
 				} else {
-					if (yych != ';') goto yy256;
+					if (yych != ';') goto yy257;
 				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '=') goto yy244;
-					if (yych <= '{') goto yy256;
+					if (yych <= '=') goto yy245;
+					if (yych <= '{') goto yy257;
 				} else {
-					if (yych != '~') goto yy256;
+					if (yych != '~') goto yy257;
 				}
 			}
 		}
-yy244:
-		YYDEBUG(244, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 468 "Zend/zend_ini_scanner.l"
-		{ /* Get number option value as string */
-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
-}
-#line 3035 "Zend/zend_ini_scanner.c"
 yy245:
 		YYDEBUG(245, *YYCURSOR);
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		goto yy284;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 468 "Zend/zend_ini_scanner.l"
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+#line 3043 "Zend/zend_ini_scanner.c"
 yy246:
 		YYDEBUG(246, *YYCURSOR);
-		++YYCURSOR;
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy285;
+yy247:
 		YYDEBUG(247, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(248, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
 #line 480 "Zend/zend_ini_scanner.l"
 		{ /* Make = used in option value to trigger error */
@@ -3048,154 +3056,93 @@
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-#line 3052 "Zend/zend_ini_scanner.c"
-yy248:
-		YYDEBUG(248, *YYCURSOR);
-		yyaccept = 4;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 4) {
-			goto yy257;
-		}
-		if (yych <= ')') {
-			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy249;
-				if (yych <= 0x08) goto yy256;
-				if (yych >= '\v') goto yy256;
-			} else {
-				if (yych <= 0x1F) {
-					if (yych >= 0x0E) goto yy256;
-				} else {
-					if (yych <= '"') goto yy249;
-					if (yych <= '%') goto yy256;
-				}
-			}
-		} else {
-			if (yych <= '=') {
-				if (yych == ';') goto yy249;
-				if (yych <= '<') goto yy256;
-			} else {
-				if (yych <= '|') {
-					if (yych <= '{') goto yy256;
-				} else {
-					if (yych != '~') goto yy256;
-				}
-			}
-		}
+#line 3060 "Zend/zend_ini_scanner.c"
 yy249:
 		YYDEBUG(249, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 464 "Zend/zend_ini_scanner.l"
-		{ /* Get constant option value */
-	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
-}
-#line 3092 "Zend/zend_ini_scanner.c"
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy258;
+		}
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x00) goto yy250;
+				if (yych <= 0x08) goto yy257;
+				if (yych >= '\v') goto yy257;
+			} else {
+				if (yych <= 0x1F) {
+					if (yych >= 0x0E) goto yy257;
+				} else {
+					if (yych <= '"') goto yy250;
+					if (yych <= '%') goto yy257;
+				}
+			}
+		} else {
+			if (yych <= '=') {
+				if (yych == ';') goto yy250;
+				if (yych <= '<') goto yy257;
+			} else {
+				if (yych <= '|') {
+					if (yych <= '{') goto yy257;
+				} else {
+					if (yych != '~') goto yy257;
+				}
+			}
+		}
 yy250:
 		YYDEBUG(250, *YYCURSOR);
-		yyaccept = 4;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '<') {
-			if (yych <= '"') {
-				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					goto yy249;
-				} else {
-					if (yych == '\r') goto yy249;
-					if (yych <= 0x1F) goto yy256;
-					goto yy249;
-				}
-			} else {
-				if (yych <= '/') {
-					if (yych <= '%') goto yy256;
-					if (yych <= ')') goto yy249;
-					goto yy256;
-				} else {
-					if (yych <= '9') goto yy257;
-					if (yych == ';') goto yy249;
-					goto yy256;
-				}
-			}
-		} else {
-			if (yych <= '`') {
-				if (yych <= 'A') {
-					if (yych <= '=') goto yy249;
-					if (yych <= '@') goto yy256;
-					goto yy280;
-				} else {
-					if (yych <= 'Z') goto yy257;
-					if (yych == '_') goto yy257;
-					goto yy256;
-				}
-			} else {
-				if (yych <= '{') {
-					if (yych <= 'a') goto yy280;
-					if (yych <= 'z') goto yy257;
-					goto yy256;
-				} else {
-					if (yych == '}') goto yy256;
-					if (yych <= '~') goto yy249;
-					goto yy256;
-				}
-			}
-		}
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 464 "Zend/zend_ini_scanner.l"
+		{ /* Get constant option value */
+	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
+}
+#line 3100 "Zend/zend_ini_scanner.c"
 yy251:
 		YYDEBUG(251, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 'N') {
-			if (yych <= '%') {
-				if (yych <= '\f') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					if (yych <= '\n') goto yy249;
-					goto yy256;
+		if (yych <= '<') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy257;
+					goto yy250;
 				} else {
-					if (yych <= '\r') goto yy249;
-					if (yych <= 0x1F) goto yy256;
-					if (yych <= '"') goto yy249;
-					goto yy256;
+					if (yych == '\r') goto yy250;
+					if (yych <= 0x1F) goto yy257;
+					goto yy250;
 				}
 			} else {
-				if (yych <= ':') {
-					if (yych <= ')') goto yy249;
-					if (yych <= '/') goto yy256;
-					if (yych <= '9') goto yy257;
-					goto yy256;
+				if (yych <= '/') {
+					if (yych <= '%') goto yy257;
+					if (yych <= ')') goto yy250;
+					goto yy257;
 				} else {
-					if (yych <= '<') {
-						if (yych <= ';') goto yy249;
-						goto yy256;
-					} else {
-						if (yych <= '=') goto yy249;
-						if (yych <= '@') goto yy256;
-						goto yy257;
-					}
+					if (yych <= '9') goto yy258;
+					if (yych == ';') goto yy250;
+					goto yy257;
 				}
 			}
 		} else {
-			if (yych <= 'n') {
-				if (yych <= 'Z') {
-					if (yych <= 'O') goto yy276;
-					if (yych == 'U') goto yy277;
-					goto yy257;
+			if (yych <= '`') {
+				if (yych <= 'A') {
+					if (yych <= '=') goto yy250;
+					if (yych <= '@') goto yy257;
+					goto yy281;
 				} else {
-					if (yych == '_') goto yy257;
-					if (yych <= '`') goto yy256;
+					if (yych <= 'Z') goto yy258;
+					if (yych == '_') goto yy258;
 					goto yy257;
 				}
 			} else {
-				if (yych <= 'z') {
-					if (yych <= 'o') goto yy276;
-					if (yych == 'u') goto yy277;
+				if (yych <= '{') {
+					if (yych <= 'a') goto yy281;
+					if (yych <= 'z') goto yy258;
 					goto yy257;
 				} else {
-					if (yych <= '|') {
-						if (yych <= '{') goto yy256;
-						goto yy249;
-					} else {
-						if (yych == '~') goto yy249;
-						goto yy256;
-					}
+					if (yych == '}') goto yy257;
+					if (yych <= '~') goto yy250;
+					goto yy257;
 				}
 			}
 		}
@@ -3203,113 +3150,124 @@
 		YYDEBUG(252, *YYCURSOR);
 		yyaccept = 4;
 		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'N') {
+			if (yych <= '%') {
+				if (yych <= '\f') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy257;
+					if (yych <= '\n') goto yy250;
+					goto yy257;
+				} else {
+					if (yych <= '\r') goto yy250;
+					if (yych <= 0x1F) goto yy257;
+					if (yych <= '"') goto yy250;
+					goto yy257;
+				}
+			} else {
+				if (yych <= ':') {
+					if (yych <= ')') goto yy250;
+					if (yych <= '/') goto yy257;
+					if (yych <= '9') goto yy258;
+					goto yy257;
+				} else {
+					if (yych <= '<') {
+						if (yych <= ';') goto yy250;
+						goto yy257;
+					} else {
+						if (yych <= '=') goto yy250;
+						if (yych <= '@') goto yy257;
+						goto yy258;
+					}
+				}
+			}
+		} else {
+			if (yych <= 'n') {
+				if (yych <= 'Z') {
+					if (yych <= 'O') goto yy277;
+					if (yych == 'U') goto yy278;
+					goto yy258;
+				} else {
+					if (yych == '_') goto yy258;
+					if (yych <= '`') goto yy257;
+					goto yy258;
+				}
+			} else {
+				if (yych <= 'z') {
+					if (yych <= 'o') goto yy277;
+					if (yych == 'u') goto yy278;
+					goto yy258;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy257;
+						goto yy250;
+					} else {
+						if (yych == '~') goto yy250;
+						goto yy257;
+					}
+				}
+			}
+		}
+yy253:
+		YYDEBUG(253, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'E') {
 			if (yych <= '%') {
 				if (yych <= '\f') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					if (yych <= '\n') goto yy249;
-					goto yy256;
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy257;
+					if (yych <= '\n') goto yy250;
+					goto yy257;
 				} else {
-					if (yych <= '\r') goto yy249;
-					if (yych <= 0x1F) goto yy256;
-					if (yych <= '"') goto yy249;
-					goto yy256;
+					if (yych <= '\r') goto yy250;
+					if (yych <= 0x1F) goto yy257;
+					if (yych <= '"') goto yy250;
+					goto yy257;
 				}
 			} else {
 				if (yych <= ':') {
-					if (yych <= ')') goto yy249;
-					if (yych <= '/') goto yy256;
-					if (yych <= '9') goto yy257;
-					goto yy256;
+					if (yych <= ')') goto yy250;
+					if (yych <= '/') goto yy257;
+					if (yych <= '9') goto yy258;
+					goto yy257;
 				} else {
 					if (yych <= '<') {
-						if (yych <= ';') goto yy249;
-						goto yy256;
+						if (yych <= ';') goto yy250;
+						goto yy257;
 					} else {
-						if (yych <= '=') goto yy249;
-						if (yych <= '@') goto yy256;
-						goto yy257;
+						if (yych <= '=') goto yy250;
+						if (yych <= '@') goto yy257;
+						goto yy258;
 					}
 				}
 			}
 		} else {
 			if (yych <= 'e') {
 				if (yych <= 'Z') {
-					if (yych <= 'F') goto yy271;
-					if (yych == 'N') goto yy265;
-					goto yy257;
+					if (yych <= 'F') goto yy272;
+					if (yych == 'N') goto yy266;
+					goto yy258;
 				} else {
-					if (yych == '_') goto yy257;
-					if (yych <= '`') goto yy256;
-					goto yy257;
+					if (yych == '_') goto yy258;
+					if (yych <= '`') goto yy257;
+					goto yy258;
 				}
 			} else {
 				if (yych <= 'z') {
-					if (yych <= 'f') goto yy271;
-					if (yych == 'n') goto yy265;
-					goto yy257;
+					if (yych <= 'f') goto yy272;
+					if (yych == 'n') goto yy266;
+					goto yy258;
 				} else {
 					if (yych <= '|') {
-						if (yych <= '{') goto yy256;
-						goto yy249;
+						if (yych <= '{') goto yy257;
+						goto yy250;
 					} else {
-						if (yych == '~') goto yy249;
-						goto yy256;
+						if (yych == '~') goto yy250;
+						goto yy257;
 					}
 				}
 			}
 		}
-yy253:
-		YYDEBUG(253, *YYCURSOR);
-		yyaccept = 4;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '=') {
-			if (yych <= '"') {
-				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					goto yy249;
-				} else {
-					if (yych == '\r') goto yy249;
-					if (yych <= 0x1F) goto yy256;
-					goto yy249;
-				}
-			} else {
-				if (yych <= '9') {
-					if (yych <= '%') goto yy256;
-					if (yych <= ')') goto yy249;
-					if (yych <= '/') goto yy256;
-					goto yy257;
-				} else {
-					if (yych == ';') goto yy249;
-					if (yych <= '<') goto yy256;
-					goto yy249;
-				}
-			}
-		} else {
-			if (yych <= '`') {
-				if (yych <= 'R') {
-					if (yych <= '@') goto yy256;
-					if (yych <= 'Q') goto yy257;
-					goto yy269;
-				} else {
-					if (yych <= 'Z') goto yy257;
-					if (yych == '_') goto yy257;
-					goto yy256;
-				}
-			} else {
-				if (yych <= '{') {
-					if (yych == 'r') goto yy269;
-					if (yych <= 'z') goto yy257;
-					goto yy256;
-				} else {
-					if (yych == '}') goto yy256;
-					if (yych <= '~') goto yy249;
-					goto yy256;
-				}
-			}
-		}
 yy254:
 		YYDEBUG(254, *YYCURSOR);
 		yyaccept = 4;
@@ -3317,333 +3275,334 @@
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					goto yy249;
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy257;
+					goto yy250;
 				} else {
-					if (yych == '\r') goto yy249;
-					if (yych <= 0x1F) goto yy256;
-					goto yy249;
+					if (yych == '\r') goto yy250;
+					if (yych <= 0x1F) goto yy257;
+					goto yy250;
 				}
 			} else {
 				if (yych <= '9') {
-					if (yych <= '%') goto yy256;
-					if (yych <= ')') goto yy249;
-					if (yych <= '/') goto yy256;
-					goto yy257;
+					if (yych <= '%') goto yy257;
+					if (yych <= ')') goto yy250;
+					if (yych <= '/') goto yy257;
+					goto yy258;
 				} else {
-					if (yych == ';') goto yy249;
-					if (yych <= '<') goto yy256;
-					goto yy249;
+					if (yych == ';') goto yy250;
+					if (yych <= '<') goto yy257;
+					goto yy250;
 				}
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= 'E') {
-					if (yych <= '@') goto yy256;
-					if (yych <= 'D') goto yy257;
-					goto yy259;
+				if (yych <= 'R') {
+					if (yych <= '@') goto yy257;
+					if (yych <= 'Q') goto yy258;
+					goto yy270;
 				} else {
-					if (yych <= 'Z') goto yy257;
-					if (yych == '_') goto yy257;
-					goto yy256;
+					if (yych <= 'Z') goto yy258;
+					if (yych == '_') goto yy258;
+					goto yy257;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych == 'e') goto yy259;
-					if (yych <= 'z') goto yy257;
-					goto yy256;
+					if (yych == 'r') goto yy270;
+					if (yych <= 'z') goto yy258;
+					goto yy257;
 				} else {
-					if (yych == '}') goto yy256;
-					if (yych <= '~') goto yy249;
-					goto yy256;
+					if (yych == '}') goto yy257;
+					if (yych <= '~') goto yy250;
+					goto yy257;
 				}
 			}
 		}
 yy255:
 		YYDEBUG(255, *YYCURSOR);
-		yyaccept = 0;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy257;
+					goto yy250;
+				} else {
+					if (yych == '\r') goto yy250;
+					if (yych <= 0x1F) goto yy257;
+					goto yy250;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy257;
+					if (yych <= ')') goto yy250;
+					if (yych <= '/') goto yy257;
+					goto yy258;
+				} else {
+					if (yych == ';') goto yy250;
+					if (yych <= '<') goto yy257;
+					goto yy250;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'E') {
+					if (yych <= '@') goto yy257;
+					if (yych <= 'D') goto yy258;
+					goto yy260;
+				} else {
+					if (yych <= 'Z') goto yy258;
+					if (yych == '_') goto yy258;
+					goto yy257;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'e') goto yy260;
+					if (yych <= 'z') goto yy258;
+					goto yy257;
+				} else {
+					if (yych == '}') goto yy257;
+					if (yych <= '~') goto yy250;
+					goto yy257;
+				}
+			}
+		}
 yy256:
 		YYDEBUG(256, *YYCURSOR);
-		if (yybm[0+yych] & 2) {
-			goto yy255;
-		}
-		if (yych == '$') goto yy260;
-		goto yy229;
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy257:
 		YYDEBUG(257, *YYCURSOR);
-		yyaccept = 4;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		if (yybm[0+yych] & 2) {
+			goto yy256;
+		}
+		if (yych == '$') goto yy261;
+		goto yy230;
+yy258:
 		YYDEBUG(258, *YYCURSOR);
-		if (yybm[0+yych] & 4) {
-			goto yy257;
-		}
-		if (yych <= '%') {
-			if (yych <= '\r') {
-				if (yych <= 0x08) {
-					if (yych <= 0x00) goto yy249;
-					goto yy255;
-				} else {
-					if (yych <= '\n') goto yy249;
-					if (yych <= '\f') goto yy255;
-					goto yy249;
-				}
-			} else {
-				if (yych <= '"') {
-					if (yych <= 0x1F) goto yy255;
-					goto yy249;
-				} else {
-					if (yych == '$') goto yy260;
-					goto yy255;
-				}
-			}
-		} else {
-			if (yych <= '=') {
-				if (yych <= ':') {
-					if (yych <= ')') goto yy249;
-					goto yy255;
-				} else {
-					if (yych == '<') goto yy255;
-					goto yy249;
-				}
-			} else {
-				if (yych <= '|') {
-					if (yych <= '{') goto yy255;
-					goto yy249;
-				} else {
-					if (yych == '~') goto yy249;
-					goto yy255;
-				}
-			}
-		}
-yy259:
+		yyaccept = 4;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(259, *YYCURSOR);
-		yyaccept = 4;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '=') {
-			if (yych <= '"') {
-				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					goto yy249;
+		if (yybm[0+yych] & 4) {
+			goto yy258;
+		}
+		if (yych <= '%') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) {
+					if (yych <= 0x00) goto yy250;
+					goto yy256;
 				} else {
-					if (yych == '\r') goto yy249;
+					if (yych <= '\n') goto yy250;
+					if (yych <= '\f') goto yy256;
+					goto yy250;
+				}
+			} else {
+				if (yych <= '"') {
 					if (yych <= 0x1F) goto yy256;
-					goto yy249;
-				}
-			} else {
-				if (yych <= '9') {
-					if (yych <= '%') goto yy256;
-					if (yych <= ')') goto yy249;
-					if (yych <= '/') goto yy256;
-					goto yy257;
+					goto yy250;
 				} else {
-					if (yych == ';') goto yy249;
-					if (yych <= '<') goto yy256;
-					goto yy249;
+					if (yych == '$') goto yy261;
+					goto yy256;
 				}
 			}
 		} else {
-			if (yych <= '`') {
-				if (yych <= 'S') {
-					if (yych <= '@') goto yy256;
-					if (yych <= 'R') goto yy257;
-					goto yy265;
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= ')') goto yy250;
+					goto yy256;
 				} else {
-					if (yych <= 'Z') goto yy257;
-					if (yych == '_') goto yy257;
-					goto yy256;
+					if (yych == '<') goto yy256;
+					goto yy250;
 				}
 			} else {
-				if (yych <= '{') {
-					if (yych == 's') goto yy265;
-					if (yych <= 'z') goto yy257;
-					goto yy256;
+				if (yych <= '|') {
+					if (yych <= '{') goto yy256;
+					goto yy250;
 				} else {
-					if (yych == '}') goto yy256;
-					if (yych <= '~') goto yy249;
+					if (yych == '~') goto yy250;
 					goto yy256;
 				}
 			}
 		}
 yy260:
 		YYDEBUG(260, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yych <= '\\') {
-			if (yych <= 0x00) goto yy261;
-			if (yych <= '[') goto yy255;
-			goto yy262;
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy257;
+					goto yy250;
+				} else {
+					if (yych == '\r') goto yy250;
+					if (yych <= 0x1F) goto yy257;
+					goto yy250;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy257;
+					if (yych <= ')') goto yy250;
+					if (yych <= '/') goto yy257;
+					goto yy258;
+				} else {
+					if (yych == ';') goto yy250;
+					if (yych <= '<') goto yy257;
+					goto yy250;
+				}
+			}
 		} else {
-			if (yych != '{') goto yy255;
+			if (yych <= '`') {
+				if (yych <= 'S') {
+					if (yych <= '@') goto yy257;
+					if (yych <= 'R') goto yy258;
+					goto yy266;
+				} else {
+					if (yych <= 'Z') goto yy258;
+					if (yych == '_') goto yy258;
+					goto yy257;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 's') goto yy266;
+					if (yych <= 'z') goto yy258;
+					goto yy257;
+				} else {
+					if (yych == '}') goto yy257;
+					if (yych <= '~') goto yy250;
+					goto yy257;
+				}
+			}
 		}
 yy261:
 		YYDEBUG(261, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy262;
+			if (yych <= '[') goto yy256;
+			goto yy263;
+		} else {
+			if (yych != '{') goto yy256;
+		}
+yy262:
+		YYDEBUG(262, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 3) {
 			if (yyaccept <= 1) {
 				if (yyaccept <= 0) {
-					goto yy229;
+					goto yy230;
 				} else {
-					goto yy231;
+					goto yy232;
 				}
 			} else {
 				if (yyaccept <= 2) {
-					goto yy227;
+					goto yy228;
 				} else {
-					goto yy244;
+					goto yy245;
 				}
 			}
 		} else {
 			if (yyaccept <= 5) {
 				if (yyaccept <= 4) {
-					goto yy249;
+					goto yy250;
 				} else {
-					goto yy266;
+					goto yy267;
 				}
 			} else {
-				goto yy273;
+				goto yy274;
 			}
 		}
-yy262:
-		YYDEBUG(262, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yybm[0+yych] & 8) {
-			goto yy263;
-		}
-		goto yy255;
 yy263:
 		YYDEBUG(263, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy264;
+		}
+		goto yy256;
+yy264:
 		YYDEBUG(264, *YYCURSOR);
-		if (yybm[0+yych] & 8) {
-			goto yy263;
-		}
-		if (yych <= 0x00) goto yy229;
-		if (yych == '\\') goto yy262;
-		goto yy255;
-yy265:
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(265, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy264;
+		}
+		if (yych <= 0x00) goto yy230;
+		if (yych == '\\') goto yy263;
+		goto yy256;
+yy266:
+		YYDEBUG(266, *YYCURSOR);
 		yyaccept = 5;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm[0+yych] & 16) {
-			goto yy267;
+			goto yy268;
 		}
 		if (yych <= ';') {
 			if (yych <= ' ') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy266;
-					if (yych <= '\t') goto yy256;
+					if (yych <= 0x00) goto yy267;
+					if (yych <= '\t') goto yy257;
 				} else {
-					if (yych != '\r') goto yy256;
+					if (yych != '\r') goto yy257;
 				}
 			} else {
 				if (yych <= ')') {
-					if (yych <= '"') goto yy266;
-					if (yych <= '%') goto yy256;
+					if (yych <= '"') goto yy267;
+					if (yych <= '%') goto yy257;
 				} else {
-					if (yych <= '/') goto yy256;
-					if (yych <= '9') goto yy257;
-					if (yych <= ':') goto yy256;
+					if (yych <= '/') goto yy257;
+					if (yych <= '9') goto yy258;
+					if (yych <= ':') goto yy257;
 				}
 			}
 		} else {
 			if (yych <= '_') {
 				if (yych <= '@') {
-					if (yych != '=') goto yy256;
+					if (yych != '=') goto yy257;
 				} else {
-					if (yych <= 'Z') goto yy257;
-					if (yych <= '^') goto yy256;
-					goto yy257;
+					if (yych <= 'Z') goto yy258;
+					if (yych <= '^') goto yy257;
+					goto yy258;
 				}
 			} else {
 				if (yych <= '{') {
-					if (yych <= '`') goto yy256;
-					if (yych <= 'z') goto yy257;
-					goto yy256;
+					if (yych <= '`') goto yy257;
+					if (yych <= 'z') goto yy258;
+					goto yy257;
 				} else {
-					if (yych == '}') goto yy256;
-					if (yych >= 0x7F) goto yy256;
+					if (yych == '}') goto yy257;
+					if (yych >= 0x7F) goto yy257;
 				}
 			}
 		}
-yy266:
-		YYDEBUG(266, *YYCURSOR);
-		yyleng = YYCURSOR - SCNG(yy_text);
-#line 418 "Zend/zend_ini_scanner.l"
-		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
-	RETURN_TOKEN(BOOL_TRUE, "1", 1);
-}
-#line 3588 "Zend/zend_ini_scanner.c"
 yy267:
 		YYDEBUG(267, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 418 "Zend/zend_ini_scanner.l"
+		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
+	RETURN_TOKEN(BOOL_TRUE, "1", 1);
+}
+#line 3596 "Zend/zend_ini_scanner.c"
+yy268:
 		YYDEBUG(268, *YYCURSOR);
-		if (yybm[0+yych] & 16) {
-			goto yy267;
-		}
-		goto yy266;
-yy269:
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(269, *YYCURSOR);
-		yyaccept = 4;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '=') {
-			if (yych <= '"') {
-				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					goto yy249;
-				} else {
-					if (yych == '\r') goto yy249;
-					if (yych <= 0x1F) goto yy256;
-					goto yy249;
-				}
-			} else {
-				if (yych <= '9') {
-					if (yych <= '%') goto yy256;
-					if (yych <= ')') goto yy249;
-					if (yych <= '/') goto yy256;
-					goto yy257;
-				} else {
-					if (yych == ';') goto yy249;
-					if (yych <= '<') goto yy256;
-					goto yy249;
-				}
-			}
-		} else {
-			if (yych <= '`') {
-				if (yych <= 'U') {
-					if (yych <= '@') goto yy256;
-					if (yych <= 'T') goto yy257;
-				} else {
-					if (yych <= 'Z') goto yy257;
-					if (yych == '_') goto yy257;
-					goto yy256;
-				}
-			} else {
-				if (yych <= '{') {
-					if (yych == 'u') goto yy270;
-					if (yych <= 'z') goto yy257;
-					goto yy256;
-				} else {
-					if (yych == '}') goto yy256;
-					if (yych <= '~') goto yy249;
-					goto yy256;
-				}
-			}
+		if (yybm[0+yych] & 16) {
+			goto yy268;
 		}
+		goto yy267;
 yy270:
 		YYDEBUG(270, *YYCURSOR);
 		yyaccept = 4;
@@ -3651,46 +3610,45 @@
 		if (yych <= '=') {
 			if (yych <= '"') {
 				if (yych <= '\n') {
-					if (yych <= 0x00) goto yy249;
-					if (yych <= 0x08) goto yy256;
-					goto yy249;
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy257;
+					goto yy250;
 				} else {
-					if (yych == '\r') goto yy249;
-					if (yych <= 0x1F) goto yy256;
-					goto yy249;
+					if (yych == '\r') goto yy250;
+					if (yych <= 0x1F) goto yy257;
+					goto yy250;