Derick Rethans
eb6fb71e55
Merge branch 'PHP-5.6'
2014-12-08 11:07:00 +00:00
Derick Rethans
9d4f4483cb
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-08 11:06:50 +00:00
Derick Rethans
5f9a68d3ef
Fixed day_of_week function as it could sometimes return negative values internally.
2014-12-08 11:06:12 +00:00
Dmitry Stogov
70a2748b5e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:25:52 +03:00
Dmitry Stogov
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
Dmitry Stogov
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
Dmitry Stogov
dd791cd717
Fixed possible read after end of buffer and use after free.
2014-12-08 12:18:27 +03:00
Anatol Belski
aa52fcf179
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:41 +01:00
Anatol Belski
41a2f7074d
Fixed bug #68398 msooxml matches too many archives
2014-12-06 20:51:00 +01:00
Nikita Popov
204e3f8d5a
Drop unnecessary zval containers
2014-12-06 12:38:56 +01:00
Anatol Belski
51bae8805d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed test
2014-12-06 12:32:16 +01:00
Anatol Belski
0854fd8b81
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-12-06 12:31:55 +01:00
Anatol Belski
5d126245a3
fixed test
2014-12-06 12:31:27 +01:00
Anatol Belski
42d7cb4c2c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
C89 compat
add include for missing localeconv_r proto
2014-12-06 12:18:36 +01:00
Anatol Belski
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
Anatol Belski
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
Anatol Belski
373aa7c81f
add include for missing localeconv_r proto
2014-12-06 12:09:35 +01:00
Anatol Belski
3d68d843cb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #65230 setting locale randomly broken
2014-12-06 12:01:09 +01:00
Anatol Belski
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
Anatol Belski
1b4d5ad46a
Fixed bug #65230 setting locale randomly broken
2014-12-06 11:59:43 +01:00
Matteo Beccati
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
Matteo Beccati
625b929c6e
Fix compilation error (ref #68424 )
2014-12-06 10:23:56 +01:00
Adam Harvey
751aa92fe5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert unintentional docblock change
2014-12-05 13:58:48 -08:00
Adam Harvey
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
Adam Harvey
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
Chris Christoff
0e985d3726
Revert unintentional docblock change
...
Revert unintentional docblock change
It looks like commit dd8e59da8f
introduced an unintended docbloc change. I have reverted this
change in this commit.
2014-12-05 13:57:03 -08:00
Andrea Faulds
8a065c554b
Restored zip/oci8 PHP 4 code, add PHP 7 checks
2014-12-05 19:46:31 +00:00
Andrea Faulds
c7157e4cfb
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
2014-12-05 19:46:30 +00:00
Julien Pauli
5a528076d2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
2014-12-05 17:06:33 +01:00
Julien Pauli
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
pwolanin
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
Anatol Belski
e0a0bea826
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
. Fixed bug #68120 Update bundled libsqlite
2014-12-05 15:51:53 +01:00
Anatol Belski
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
Anatol Belski
fccd1eda5f
. Fixed bug #68120 Update bundled libsqlite
2014-12-05 15:43:53 +01:00
Anatol Belski
653bba5e60
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:09:27 +01:00
Anatol Belski
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
Anatol Belski
7943f944c2
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:06:06 +01:00
Julien Pauli
3cd156d1d9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
Updated NEWS
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
Conflicts:
ext/spl/spl_directory.c
2014-12-05 10:18:22 +01:00
Julien Pauli
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
Peter Cowburn
557026301f
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
2014-12-05 10:10:10 +01:00
Anatol Belski
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
Anatol Belski
c65143d571
fix dir separators in test
2014-12-05 07:07:58 +01:00
Tjerk Meesters
7e933c5ff8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed #65213 - cannot cast SplFileInfo to boolean
Conflicts:
ext/spl/spl_directory.c
2014-12-04 07:22:54 +08:00
Tjerk Meesters
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
Tjerk Meesters
2bcf8a6cd9
Fixed #65213 - cannot cast SplFileInfo to boolean
2014-12-04 07:17:33 +08:00
Dmitry Stogov
5dd427eac2
Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*.
2014-12-03 16:56:09 +03:00
Dmitry Stogov
cd68c4b1d2
Fixed __debugInfo() support
2014-12-03 12:13:01 +03:00
Remi Collet
8199278ffb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
2014-12-02 08:41:35 +01:00
Remi Collet
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
Remi Collet
9aabfeb6c4
fix string is optional, set default length, thanks laruence
2014-12-02 07:41:35 +01:00