summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-04Changed XFAILed collator_get_sort_key.phptGustavo André dos Santos Lopes1-36/+35
Ressurected and limited to ICU 4.8 in the hope that the sort keys will remain stable in more recent ICU versions. I have only tested with ICU 4.8 so far.
2012-06-03Merge branch 'datefmt_tz_cal_interop'Gustavo André dos Santos Lopes45-428/+1179
* datefmt_tz_cal_interop: Added and fixed tests given eb346ef DateFormat plays nice with Calendar, TimeZone Added private constructor to IntlTimeZone. Fixed write in constant memory.
2012-06-03Added and fixed tests given eb346efGustavo André dos Santos Lopes17-69/+400
2012-06-03Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57'Felipe Pena1-1/+5
2012-06-03Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4Felipe Pena1-1/+5
2012-06-03DateFormat plays nice with Calendar, TimeZoneGustavo André dos Santos Lopes28-358/+768
The following changes were made: * The IntlDateFormatter constructor now accepts the usual values for its $timezone argument. This includes timezone identifiers, IntlTimeZone objects, DateTimeZone objects and NULL. An empty string is not accepted. An invalid time zone is no longer accepted (it used to use UTC in this case). * When NULL is passed to IntlDateFormatter, the time zone specified in date.timezone is used instead of the ICU default. * The IntlDateFormatter $calendar argument now accepts also an IntlCalendar. In this case, IntlDateFormatter::getCalendar() will return false. * The time zone passed to the IntlDateFormatter is ignored if it is NULL and if the calendar passed is an IntlCalendar object -- in this case, the IntlCalendar time zone will be used instead. Otherwise, the time zone specified in the $timezone argument is used instead. * Added IntlDateFormatter::getCalendarObject(), which always returns the IntlCalendar object that backs the DateFormat, even if a constant was passed to the constructor, i.e., if an IntlCalendar was not passed to the constructor. * Added IntlDateFormatter::setTimeZone(). It accepts the usual values for time zone arguments. If NULL is passed, the time zone of the IntlDateFormatter WILL be overridden with the default time zone, even if an IntlCalendar object was passed to the constructor. * Added IntlDateFormatter::getTimeZone(), which returns the time zone that's associated with the DateFormat. * Depreacated IntlDateFormatter::setTimeZoneId() and made it an alias for IntlDateFormatter::setTimeZone(), as the new ::setTimeZone() also accepts plain identifiers, besides other types. IntlDateFormatter::getTimeZoneId() is not deprecated however. * IntlDateFormatter::setCalendar() with a constant passed should now work correctly. This requires saving the requested locale to the constructor. * Centralized the hacks required to avoid compilation disasters on Windows due to some headers being included inside and outside of extern "C" blocks.
2012-06-03Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.3Felipe Pena1-1/+5
2012-06-03Added private constructor to IntlTimeZone.Gustavo André dos Santos Lopes3-0/+10
2012-06-03Fixed write in constant memory.Gustavo André dos Santos Lopes1-2/+2
clang did not forgive.
2012-06-03Merge branch 'PHP-5.4'Felipe Pena1-3/+4
* PHP-5.4: - Optimize comparison between same HashTable pointer - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) - fix missing include for unix sockets - Comment unused function to avoid warnings - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) - fix missing include for unix sockets - Comment unused function to avoid warnings
2012-06-03Merge branch 'PHP-5.3' into PHP-5.4Felipe Pena1-3/+4
* PHP-5.3: - Optimize comparison between same HashTable pointer - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) - fix missing include for unix sockets - Comment unused function to avoid warnings
2012-06-03- Optimize comparison between same HashTable pointerFelipe Pena1-3/+4
2012-06-03- Fixed information leak in ext exif (discovered by Martin Noga, Matthew ↵Felipe Pena1-1/+5
"j00ru" Jurczyk, Gynvael Coldwind)
2012-06-03Fix indentionDavid Soria Parra1-5/+5
2012-06-03Send mails to php-qa@lists.php.net whenever a build is failingDavid Soria Parra1-0/+7
2012-06-03Add preliminary README.md for githubDavid Soria Parra1-0/+30
Github uses a special markdown syntax and display the content of the README formatted on the front page of the repo. This readme contains information for github users.
2012-06-03Merge branch 'pull-request/68'David Soria Parra9-6/+86
By Davey Shafik via Davey Shafik * pull-request/68: Fix boolean casting and whitespace (@dsp / #68) Add curl extension config, uses cli-server to test Source all extension scripts for ENV vars Add extension configs, compile more extensions Reformat, setup MySQL DB, call run-tests directly Add support for Travis CI
2012-06-01close the underlying stream as early as possible and so notify theandrey2-17/+19
NET layer
2012-06-01Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Jerome Loyet16-152/+248
* 'PHP-5.4' of git.php.net:php-src: (27 commits) Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) sort NEWS fix bug #55042 - erealloc without updating pointer Fix bug #62186 readline fails to compile fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854) fix test fix test Typofix in comment in proc_open.c fix CVE-2012-2143 updated the libmagic patch after Felipes regex fix Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt Bug #62177 deactivate the linux test version on win Fix bug #62177 Test Bug - finfo_file_regex.phpt Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt fix unchecked emalloc add CVE add bug 62146 add bug #62082 sync with HEAD sync with HEAD ...
2012-06-01Merge branch 'master' of git.php.net:php-srcJerome Loyet24-477/+595
* 'master' of git.php.net:php-src: (43 commits) close the stream whenever possible, no need to keep it open altough the connection is marked as unusable Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) more refactoring stuff. Reduced code duplication in the authentication code sort NEWS fix bug #55042 - erealloc without updating pointer Fix bug #62186 readline fails to compile fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854) small refactoring - factour out code from connection establishment. Add a define for the default authentication protocol - get away from the hardcoded magic value fix test fix test Typofix in comment in proc_open.c fix CVE-2012-2143 updated the libmagic patch after Felipes regex fix Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt Bug #62177 deactivate the linux test version on win Fix bug #62177 Test Bug - finfo_file_regex.phpt Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt fix unchecked emalloc add CVE add bug 62146 ...
2012-06-01- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet3-4/+44
2012-06-01- fix missing include for unix socketsJerome Loyet1-0/+1
2012-06-01- Comment unused function to avoid warningsJerome Loyet1-0/+4
2012-06-01- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet4-4/+45
2012-06-01- fix missing include for unix socketsJerome Loyet1-0/+1
2012-06-01- Comment unused function to avoid warningsJerome Loyet1-0/+4
2012-06-01- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet4-4/+45
2012-06-01- fix missing include for unix socketsJerome Loyet1-0/+1
2012-06-01- Comment unused function to avoid warningsJerome Loyet1-0/+4
2012-06-01Merge branch 'master' of git.php.net:php-srcandrey1-1/+2
2012-06-01close the stream whenever possible, no need to keep it open altough theandrey1-0/+5
connection is marked as unusable
2012-06-01Merge branch 'PHP-5.4'Xinchen Hui1-1/+2
* PHP-5.4: Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) sort NEWS
2012-06-01Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui1-1/+2
* PHP-5.3: Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
2012-06-01Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with ↵Xinchen Hui2-1/+6
constant)
2012-05-31Merge branch 'master' of git.php.net:php-srcandrey2-63/+67
2012-05-31more refactoring stuff. Reduced code duplication in the authenticationandrey2-217/+174
code
2012-05-31sort NEWSStanislav Malyshev1-30/+40
2012-05-31Merge branch 'PHP-5.4'Stanislav Malyshev1-62/+66
* PHP-5.4: fix bug #55042 - erealloc without updating pointer
2012-05-31fix bug #55042 - erealloc without updating pointerStanislav Malyshev1-62/+66
2012-05-30Merge branch 'PHP-5.4'Johannes Schlüter1-1/+1
* PHP-5.4: Fix bug #62186 readline fails to compile fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
2012-05-30Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter0-0/+0
* PHP-5.3: fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
2012-05-30Fix bug #62186 readline fails to compileJohannes Schlüter2-2/+6
2012-05-30fix unchecked emallocStanislav Malyshev1-3/+3
(cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
2012-05-30Merge branch 'master' of git.php.net:php-srcandrey12-84/+178
2012-05-30small refactoring - factour out code from connection establishment.andrey4-101/+163
Add a define for the default authentication protocol - get away from the hardcoded magic value
2012-05-30Merge branch 'PHP-5.4'Stanislav Malyshev2-2/+2
* PHP-5.4: fix test fix test
2012-05-30fix testStanislav Malyshev1-1/+1
2012-05-30fix testStanislav Malyshev1-1/+1
2012-05-30Merge branch 'PHP-5.4'Xinchen Hui1-1/+1
* PHP-5.4: Typofix in comment in proc_open.c
2012-05-30Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui1-1/+1
* PHP-5.3: Typofix in comment in proc_open.c