181f34f375
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix perms
2014-12-16 08:37:56 +01:00
9c4de388c6
fix perms
2014-12-16 08:37:48 +01:00
51771ed238
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-13 22:30:19 +00:00
f804a3614e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
NEWS
2014-12-13 22:28:45 +00:00
034e6decb3
Fix undefined behaviour in strnatcmp
2014-12-13 22:27:10 +00:00
8bd67ce748
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
2014-12-13 09:05:33 +01:00
07b5896a13
Fix bug #68601 buffer read overflow in gd_gif_in.c
2014-12-13 09:03:44 +01:00
3769aee67c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:24:16 +01:00
9beb3763db
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:16:12 +01:00
a0d848f795
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:50:42 +01:00
86f1875536
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:42:38 +01:00
0323f66fa2
move the test to the right place
2014-12-11 10:39:47 -08:00
13f1c276ab
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-11 10:39:37 -08:00
21da246807
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move the test to the right place
2014-12-10 13:22:52 +01:00
c5f7dcd1dc
move the test to the right place
2014-12-10 13:19:51 +01:00
4a82cdce66
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
ext/standard/var_unserializer.c
2014-12-10 11:47:34 +01:00
20d93534d5
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-10 11:43:33 +01:00
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
278c38165c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:24:16 +03:00
e6ad29ae96
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:20:01 +03:00
dd791cd717
Fixed possible read after end of buffer and use after free.
2014-12-08 12:18:27 +03:00
41a2f7074d
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:00 +01:00
0854fd8b81
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-12-06 12:31:55 +01:00
5d126245a3
fixed test
2014-12-06 12:31:27 +01:00
08241ee3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:05 +01:00
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
373aa7c81f
add include for missing localeconv_r proto
2014-12-06 12:09:35 +01:00
ebaf130a15
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65230 setting locale randomly broken
2014-12-06 12:00:17 +01:00
1b4d5ad46a
Fixed bug #65230 setting locale randomly broken
2014-12-06 11:59:43 +01:00
b120f9beb2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix compilation error (ref #68424 )
2014-12-06 10:24:27 +01:00
625b929c6e
Fix compilation error (ref #68424 )
2014-12-06 10:23:56 +01:00
381fd62ccf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert unintentional docblock change
2014-12-05 13:58:19 -08:00
79131b4617
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert unintentional docblock change
2014-12-05 13:57:46 -08:00
0e985d3726
Revert unintentional docblock change
...
Revert unintentional docblock change
It looks like commit dd8e59da8f
2014-12-05 13:57:03 -08:00
5104c2bbc3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:05:37 +01:00
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
297f582f5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
. Fixed bug #68120 Update bundled libsqlite
Conflicts:
ext/sqlite3/libsqlite/sqlite3.c
2014-12-05 15:50:18 +01:00
fccd1eda5f
. Fixed bug #68120 Update bundled libsqlite
2014-12-05 15:43:53 +01:00
0e09e5e6fa
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:08:55 +01:00
7943f944c2
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:06:06 +01:00
ee709c5366
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
2014-12-05 10:12:08 +01:00
557026301f
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
2014-12-05 10:10:10 +01:00
6cf5ac7567
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separators in test
2014-12-05 07:08:35 +01:00
c65143d571
fix dir separators in test
2014-12-05 07:07:58 +01:00
52b41f24e3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed #65213 - cannot cast SplFileInfo to boolean
2014-12-04 07:21:13 +08:00
2bcf8a6cd9
Fixed #65213 - cannot cast SplFileInfo to boolean
2014-12-04 07:17:33 +08:00
cd68c4b1d2
Fixed __debugInfo() support
2014-12-03 12:13:01 +03:00
6f3714a8fc
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
...
Covered by ext/standard/tests/strings/pack64.phpt
2014-12-02 08:38:39 +01:00
c45fcfd063
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more refix to the test
2014-12-01 19:10:18 +01:00
Remi Collet