Ferenc Kovacs
e629e4ba20
5.6.9RC1
2015-04-30 00:00:18 +02:00
Julien Pauli
d004c1d5ff
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.26 now
Conflicts:
configure.in
main/php_version.h
2015-04-29 11:21:18 +02:00
Julien Pauli
775d0707ca
5.5.26 now
2015-04-29 11:16:06 +02:00
Derick Rethans
ce9b6e5ee8
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-29 00:28:56 +01:00
Derick Rethans
6a5798d990
Use new structures for tzdb header here as well
2015-04-29 00:28:50 +01:00
Derick Rethans
7d6d8a3369
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-29 00:27:55 +01:00
Derick Rethans
df49ce3d5a
This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync
2015-04-29 00:25:29 +01:00
Derick Rethans
a1fef89abe
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-29 00:09:00 +01:00
Derick Rethans
912e42fc23
Split header reading in 32bit and 64bit variants.
...
We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.
2015-04-29 00:08:28 +01:00
Derick Rethans
43c69443bb
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-28 15:57:35 +01:00
Derick Rethans
cdd2b8a79f
Merge whitespace changes that have been made to timelib and PHP-5.6 and master
2015-04-28 15:57:26 +01:00
Anatol Belski
c4739897e7
updated NEWS
2015-04-28 15:34:11 +02:00
Anatol Belski
4af9ca544e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backported patch for bug #69472
2015-04-28 15:32:22 +02:00
Anatol Belski
3cd3881574
backported patch for bug #69472
2015-04-28 15:31:47 +02:00
Anatol Belski
5cfb81d5b0
updated NEWS
2015-04-28 15:14:45 +02:00
Anatol Belski
b78f8220e7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #69381 out of memory with sage odbc driver
2015-04-28 15:13:46 +02:00
Anatol Belski
1c7a902d8a
updated NEWS
2015-04-28 15:13:19 +02:00
Frederic Marchal
f505d11207
Fixed bug #69381 out of memory with sage odbc driver
...
This is just a hotfix as there are still drivers with no full
ODBC 3.x support. This patch origins from bug #68350 which was
solved by the proper 3.0 migration, another driver (Sage)
turned out to have the real issue.
2015-04-28 15:08:53 +02:00
Anatol Belski
7ccafe40c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix VC9 build with PCRE
Revert "Fix segfault in ext/date since 957aa2"
2015-04-28 14:38:45 +02:00
Anatol Belski
768bbedf82
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix VC9 build with PCRE
2015-04-28 14:38:21 +02:00
Anatol Belski
9c5c3ff022
fix VC9 build with PCRE
2015-04-28 13:15:39 +02:00
Matteo Beccati
e645837ba1
Revert "Fix segfault in ext/date since 957aa2"
...
This reverts commit b5e5098c50
2015-04-28 12:56:15 +02:00
Matteo Beccati
4cabbf9781
Revert "Fix segfault in ext/date since 957aa2"
...
This reverts commit b5e5098c50
2015-04-28 12:56:11 +02:00
Remi Collet
4131f6bf39
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
relax tests with huge year (new zic)
ignore second value for huge timestamp test (new zic)
relax test for date < INT32_MIN (new zic)
relax bigbang content (new zic)
Make date transitions tests more flexible
2015-04-28 12:50:09 +02:00
Remi Collet
97fcbf041a
relax tests with huge year (new zic)
2015-04-28 12:48:47 +02:00
Remi Collet
c1e84a3bde
ignore second value for huge timestamp test (new zic)
2015-04-28 12:48:38 +02:00
Remi Collet
194e64982e
relax test for date < INT32_MIN (new zic)
2015-04-28 12:48:30 +02:00
Remi Collet
ba41b340c2
relax bigbang content (new zic)
2015-04-28 12:48:23 +02:00
Remi Collet
c39e777722
Make date transitions tests more flexible
...
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
2015-04-28 12:48:13 +02:00
Matteo Beccati
df490dcf0c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix segfault in ext/date since 957aa2
2015-04-28 10:57:52 +02:00
Matteo Beccati
b5e5098c50
Fix segfault in ext/date since 957aa2
2015-04-28 10:57:18 +02:00
Stanislav Malyshev
19ad1389aa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:30:57 -07:00
Stanislav Malyshev
13c32a102c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Upgrade PCRE to 8.36, it fixes some crashes
2015-04-27 23:25:32 -07:00
Stanislav Malyshev
23917b451b
Upgrade PCRE to 8.36, it fixes some crashes
...
We probably will need to go to 8.37 once it is released.
2015-04-27 23:16:54 -07:00
Derick Rethans
1e18ffd2f8
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-26 11:04:35 +01:00
Derick Rethans
957aa220aa
Fixed location reading due to file format changes
2015-04-26 11:04:16 +01:00
Derick Rethans
ad9aaf8093
- Updated to version 2015.4 (2015d)
2015-04-24 17:22:33 +01:00
Derick Rethans
73a07522ef
Empty merge
2015-04-24 17:22:32 +01:00
Derick Rethans
53c49994f2
- Updated to version 2015.4 (2015d)
2015-04-24 17:22:31 +01:00
Yasuo Ohgaki
02ff308e27
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set NULL after efree
2015-04-24 16:05:50 +09:00
Yasuo Ohgaki
4c711200b4
Set NULL after efree
2015-04-24 16:04:01 +09:00
Lior Kaplan
4fd3c8aebb
Add entry for bug #69152 in 5.6.8
2015-04-22 19:40:56 +03:00
Lior Kaplan
b35c02e2df
Add entry for bug #69152 in 5.5.24
2015-04-22 19:38:26 +03:00
Lior Kaplan
bfa7e11c9c
Format alignment
2015-04-22 18:19:45 +03:00
Lior Kaplan
e48305cdb5
Bug #68846 was fixed in 5.6.8 by 934d6ed9
2015-04-22 18:10:37 +03:00
Lior Kaplan
59f6d7cd4f
Add merged bug fixes into 5.5.24
...
Done in commits 25cb6f00363e6ce6
2015-04-22 17:41:34 +03:00
Xinchen Hui
9db4e25927
Since 5.6 stat.cwd using emalloc (Thanks to Remi)
2015-04-22 15:14:00 +08:00
Xinchen Hui
29c449ce98
Merge branch 'PHP-5.5' into PHP-5.6
2015-04-21 22:44:45 +08:00
Xinchen Hui
a508693874
Remove tail blank which is committed by accident
2015-04-21 22:44:22 +08:00
Xinchen Hui
ceb992501b
Update NEWS
2015-04-21 22:37:25 +08:00
