9d4f4483cb
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-08 11:06:50 +00:00
5f9a68d3ef
Fixed day_of_week function as it could sometimes return negative values internally.
2014-12-08 11:06:12 +00:00
85bada10c1
fix ZTS
2014-11-30 21:50:29 -08:00
4675b79e65
Conflicts:
...
ext/date/php_date.c
2014-11-30 20:49:18 -08:00
de65eaa8c8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:39 -08:00
17094017f7
Merge branch 'pull-request/914' into PHP-5.5
...
* pull-request/914:
Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:17 -08:00
a8dfb33db8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add my information to this test
Add a test for the exception cases of readline_read_history
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
teste basico da funcao timezone_version_get
2014-11-23 17:26:28 -08:00
1330491994
Merge branch 'pull-request/854' into PHP-5.5
...
* pull-request/854:
teste basico da funcao timezone_version_get
2014-11-23 17:23:34 -08:00
9d7206dcea
Merge branch 'pull-request/855' into PHP-5.5
...
* pull-request/855:
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
2014-11-23 17:22:54 -08:00
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
489bfb0af9
Fixes memory leak introduced in 2b9af967
...
Fixes https://bugs.php.net/bug.php?id=68285
2014-11-23 01:42:26 +01:00
a19d96fc58
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-11 14:01:26 -03:00
695a102ede
- Updated to version 2014.10 (2014j)
2014-11-11 14:01:24 -03:00
25e3560546
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-26 10:54:09 -04:00
22b9f16e9a
- Updated to version 2014.9 (2014i)
2014-10-26 10:54:07 -04:00
0e5f475f5e
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-04 15:59:17 +01:00
0874ef624c
Merge branch 'PHP-5.4' into PHP-5.5
2014-10-04 15:58:40 +01:00
046c345de5
DateTimeZone::getOffset() now accepts a DateTimeInterface
...
Fixes #68062
2014-10-04 15:58:24 +01:00
d89b1dad8a
added some tests to datetime and dateinterval functions
2014-09-28 20:30:52 -03:00
c0b83ba2be
teste basico da funcao timezone_version_get
2014-09-28 19:03:32 -03:00
71c39612d5
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-26 16:27:05 +01:00
5d299509b4
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-26 16:27:00 +01:00
16e2d954fc
- Updated to version 2014.8 (2014h)
2014-09-26 16:26:59 +01:00
f89b7ec389
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-01 16:40:54 +01:00
21446cd7b6
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-01 16:40:50 +01:00
e665a07ab9
- Updated to version 2014.7 (2014g)
2014-09-01 16:40:49 +01:00
6da2a977fc
fix test
2014-08-20 14:44:25 -07:00
2dfabd8b51
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-08-20 14:43:22 -07:00
6424bf659d
fix test
2014-08-20 14:42:48 -07:00
77cc6aabb7
Merge branch 'PHP-5.5' into PHP-5.6
2014-08-18 20:27:44 +01:00
36d05d75c8
Fixed bug #67109 : First uppercase letter breaks date string parsing.
2014-08-18 18:41:50 +01:00
2b9af967fb
Fixed bug #66985 : Some timezones are no longer valid in PHP 5.5.10.
2014-08-18 18:41:50 +01:00
7fbc99e390
Some changes were lost in the merge commit of #66091
2014-08-13 20:57:10 +08:00
4b85f1d46a
Fixed #66091
2014-08-13 20:24:43 +08:00
4647016abe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #66091
Fixed #66091
Conflicts:
ext/date/php_date.c
2014-08-13 20:20:10 +08:00
c5f619ba6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed #66091
Conflicts:
ext/date/php_date.c
2014-08-13 20:15:52 +08:00
f6896e4395
Fixed #66091
2014-08-13 20:12:42 +08:00
54e8595f34
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:38:35 +02:00
7aa776c7b4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:37:44 +02:00
39dd715382
fix the failing date tests introduced with the latest timezonedb update
...
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:34:54 +02:00
33e9bb79a3
Merge branch 'PHP-5.5' into PHP-5.6
2014-08-07 10:22:14 +01:00
0753c22e76
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-07 10:22:10 +01:00
7df4087b98
- Updated to version 2014.6 (2014f)
2014-08-07 10:22:09 +01:00
6a4f0b14eb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:34:50 +01:00
c2f2d5c8fc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of
Conflicts:
ext/date/lib/parse_date.c
2014-07-31 14:33:55 +01:00
358aedc454
Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:21:38 +01:00
c186ce8fef
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:09:54 +03:00
3e1b749f5e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:04:23 +03:00
2dff153b23
Enable build without atoll (e.g old AIX flavours)
2014-07-17 22:58:36 +03:00
11b18347d8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
2014-06-16 23:32:10 +03:00
Derick Rethans