* PHP-5.3:
  Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only

using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event

Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous

* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path

* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails

* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt

* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()

* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)

…php.net

* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c

* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails

* PHP-5.3:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails

* PHP-5.3:
  Additional fixs for bug 61746 - prepare/clean acls

* PHP-5.3:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails

* PHP-5.3:
  Fix masking in bug61115-1.phpt

* PHP-5.3:
  Make output order for dom007.phpt platform independent

…information) and"

This reverts commit cb2a1c7.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch

* PHP-5.3:
  Remove extra ;

* PHP-5.3:
  Remove unneeded and outdated ChangeLog file

* PHP-5.3:
  - Improved fix for #62384

* PHP-5.3:
  Improve json_encode error handling
  - BFN

Conflicts:
	ext/json/json.c

* PHP-5.3:
  Fix memory allocation checks for base64 encode

… function __memcmp).

Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments

* PHP-5.3:
  ws fix
  BFN
  Fix bug #62373 (serialize() generates wrong reference to the object)

Conflicts:
	php.ini-development
	php.ini-production

* PHP-5.3:
  Fix memleak in CLI

Conflicts:
	sapi/cli/php_cli.c

* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt

* PHP-5.3:
  Fix #62432 ReflectionMethod random corrupt memory on high concurrent

Conflicts:
	ext/date/php_date.c
	ext/fileinfo/fileinfo.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/reflection/php_reflection.c
	ext/spl/spl_array.c
	ext/spl/spl_directory.c
	ext/spl/spl_dllist.c
	ext/spl/spl_fixedarray.c
	ext/spl/spl_heap.c
	ext/spl/spl_iterators.c
	ext/spl/spl_observer.c
	ext/sqlite/sqlite.c
	ext/sqlite3/sqlite3.c
	ext/tidy/tidy.c
	ext/xmlreader/php_xmlreader.c
	ext/xmlwriter/php_xmlwriter.c
	ext/xsl/php_xsl.c
	ext/zip/php_zip.c

* PHP-5.3:
  Add json_last_error_msg() function

* PHP-5.3:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)

* PHP-5.3:
  Fix some lengths in crypt()

Conflicts:
	ext/standard/crypt.c