* PHP-5.4:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778)

* PHP-5.4:
  PHP 5.3.15-dev

Also unified timezone handling in IntlCalendar::setTimeZone()
to that in the IntlCalendar and IntlGregorianCalendar constructors.

IntlCalendar::fromDateTime(DateTime|string $dateTime[, string $locale)
intlcal_from_date_time(...)

If a string is given as the first argument, the method will try to
instantiate a new DateTime object and use that instead.

IntlTimeZone::fromDateTimeZone(DateTimeZone $dtz) converts from an
ext/date TimeZone to an IntlTimeZone. The conversion is done by feeding
the time zone name (essentially what would be given by
DateTimeZone::getName()) to ICU's TimeZone::createTimeZone except if it's
an offset time zone. In that case, the offset is read from the ext/date
time zone object structure and an appopriate id (of the form
GMT<+|-><HH:MM>) is given to ICU's TimeZone::createTimeZone. Not all
ext/date time zones are recognized for ICU. For instance, WEST is not.
Note that these kind of abbreviations, as far as I can tell, can only be
created via ext/date DateTime, not directly through DateTimeZone's
constructor.

For IntlTimeZone::toDateTimeZone(), the behavior is symmetrical.
We instantiate a DateTimeZone and then call its constructor if we don't
have an offset time zone, otherwise we mess with its structure. If the
timezone is not valid for ext/date, then we allow the exception of
DateTimeZone constructor to propagate.

I don't think the current ICU API allows this bug to be completely fixed.

Right now, the code cannot control the time zone used in date/time formats
that appear inside complex subformats. See the comment inside
umsg_set_timezone().

Now MessageFormatter::format() accepts IntlCalendar objects to be used in
arguments of type Format::kDate.

…ialization)

…in crash during execution)

…in crash during execution)

* PHP-5.4:
  Fixed bug #62068 Test bug - gmp_nextprime and 022
  Fix: 62067 Moved comments to FILE section
  - BFN

* PHP-5.4:
  Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt

* PHP-5.4:
  Use emalloc instead of malloc

* PHP-5.4:
  Use free instead of efree

* PHP-5.4:
  - Fix the fix (typo s/AIX/_AIX/g)

* PHP-5.4:
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
  - fix NEWS for bug #61812

* PHP-5.4:
  Added in NEWS and UPGRADING for feature 55218
  Adding in test for feature 55218
  Implements feature 55218

Conflicts:
	UPGRADING

* PHP-5.4:
  Fixed Bug #62500 (Segfault in DateInterval class when extended)

* PHP-5.4:
  - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)

* PHP-5.4:
  update NEWS
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)

* PHP-5.4:
  fixed #62433 test for win

* PHP-5.4:
  Fixed test bug #62312 (warnings changed one more time)
  fix valgrind warning

Conflicts:
	ext/mysqlnd/mysqlnd.c

* upstream/master: (101 commits)
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
  Fixed test bug #62312 (warnings changed one more time)
  fix valgrind warning
  fix valgrind warning
  fixed #62433 test for win
  update NEWS
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
  - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
  Added in NEWS and UPGRADING for feature 55218
  Fix two issues with run-tests.php
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex
  This wil be PHP 5.3.16
  Revert change 3f3ad30: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too.
  fix (signed) integer overflow (part of bug #52550
  fix (signed) integer overflow (part of bug #52550
  ...

- there should be no trailing white spaces after \ in multiline macros

* PHP-5.4:
  Fixed bug #62477 LimitIterator int overflow

* PHP-5.4:
  updated NEWS

* PHP-5.4:
  updated NEWS

* PHP-5.4:
  reverted news about #62477
  reverted changes for #62477

Conflicts:
	NEWS

* PHP-5.4:
  fixed the test for warnings changed

* PHP-5.4:
  Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails

* PHP-5.4:
  Fixed bug #62379 failing ODBC long column functionality

* PHP-5.4:
  - Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)

* PHP-5.4:
  - Fixed memory leak when extending DOMXPath
  - BFN

* PHP-5.4:
  - Fixed bug #62525 (sigabrt while converting floating point to string)