Remi Collet
b347f2c47a
fix test description
2015-06-09 09:12:59 +02:00
Lior Kaplan
d8d5dc5d32
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Upgrade bundled sqlite to 3.8.10.2
2015-06-08 23:22:03 +03:00
George Wang
81ab4b12aa
Fixed Buf #68812 Unchecked return value.
2015-06-08 15:47:11 -04:00
George Wang
eb15ec385e
Fixed Buf #68812 Unchecked return value.
2015-06-08 15:46:56 -04:00
George Wang
6bb24823d0
Fixed Buf #68812 Unchecked return value.
2015-06-08 15:46:40 -04:00
Lior Kaplan
b861a4a4d2
NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
...
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
2015-06-08 22:39:00 +03:00
George Wang
78d1228ef6
Fixed Buf #68812 Unchecked return value.
2015-06-08 15:38:59 -04:00
Lior Kaplan
79528c5e24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Upgrade bundled sqlite to 3.8.10.2
2015-06-08 22:37:02 +03:00
Lior Kaplan
f5bf7b6b27
NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
...
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
2015-06-08 22:32:29 +03:00
Lior Kaplan
eb7c33b204
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
Upgrade bundled sqlite to 3.8.10.2
Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41
Add CVE to #68598
2015-06-08 22:29:35 +03:00
Lior Kaplan
b5d1530e4f
Upgrade bundled sqlite to 3.8.10.2
...
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
2015-06-08 22:29:10 +03:00
Lior Kaplan
33a9f01d36
NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
...
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
2015-06-08 22:23:22 +03:00
Lior Kaplan
7ced40e24e
Upgrade bundled sqlite to 3.8.10.2
...
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
2015-06-08 22:17:06 +03:00
Lior Kaplan
4cc46b2a99
Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41
2015-06-08 22:12:42 +03:00
Lior Kaplan
90a8ea9827
Add CVE to #68598
2015-06-08 22:04:42 +03:00
Anatol Belski
c8cf54719f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed test related to fix for bug #67805
2015-06-08 13:28:53 +02:00
Anatol Belski
18b3508c3c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test related to fix for bug #67805
2015-06-08 13:28:23 +02:00
Anatol Belski
17f2d1e8a7
fixed test related to fix for bug #67805
2015-06-08 13:27:22 +02:00
Anatol Belski
bc305d9c05
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
Fix bug #67805 - SplFileObject setMaxLineLength.
2015-06-08 12:13:12 +02:00
Anatol Belski
4482c03622
updated NEWS
2015-06-08 12:12:24 +02:00
Anatol Belski
3c02e6f457
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fix bug #67805 - SplFileObject setMaxLineLength.
2015-06-08 12:11:58 +02:00
Anatol Belski
b754e3ec4b
updated NEWS
2015-06-08 12:11:29 +02:00
Willian Gustavo Veiga
b470d9a0d6
Fix bug #67805 - SplFileObject setMaxLineLength.
2015-06-08 12:08:05 +02:00
Willian Gustavo Veiga
8e747f6833
Fix bug #67805 - SplFileObject setMaxLineLength.
2015-06-08 11:36:27 +02:00
Anatol Belski
0cd86f6b77
fix dir separator in test
2015-06-08 11:29:04 +02:00
Anatol Belski
4cdfbbd399
updated UPGRADING and NEWS
2015-06-08 10:15:03 +02:00
Christoph M. Becker
b8d8c75c4c
added LIBXML_BIGLINES constant
2015-06-08 09:59:37 +02:00
Christoph M. Becker
a1951c2e0a
added tests for bug #54138
2015-06-08 09:59:36 +02:00
Christoph M. Becker
f661b10536
replaced / in filename with DIRECTORY_SEPARATOR according to performance warning on DOMDocument::load man page
2015-06-08 09:40:06 +02:00
Christoph M. Becker
03399721f4
added SKIPIF conditional to check for DOM availability
2015-06-08 09:40:05 +02:00
Christoph M. Becker
5fed10e109
added XFAIL test for bug #69753
2015-06-08 09:40:04 +02:00
Matteo Beccati
11ece75291
Merge remote-tracking branch 'mbeccati/reflection-typehints-sth-v5'
...
* mbeccati/reflection-typehints-sth-v5:
Reflection support for type hints and return types
Merge remote-tracking branch 'pollita/reflection.typehint'
As discussed on https://github.com/php/php-src/pull/1190
2015-06-08 08:49:15 +02:00
Matteo Beccati
ec281fef48
Reflection support for type hints and return types
2015-06-08 08:46:30 +02:00
Sara Golemon
cf8898fbd5
Merge remote-tracking branch 'pollita/reflection.typehint'
...
Conflicts:
ext/reflection/php_reflection.c
ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
2015-06-08 08:33:32 +02:00
Christoph M. Becker
9c8696e645
fixed language dependent Windows socket tests
2015-06-08 08:13:30 +02:00
Anatol Belski
349cf3229c
add error message
2015-06-08 07:06:21 +02:00
Xinchen Hui
6c89d2d9de
Also reflects the case change
2015-06-08 12:37:11 +08:00
Xinchen Hui
cea801cce2
Fixed bug #69767 (Default parameter value with wrong type segfaults)
2015-06-08 11:47:22 +08:00
Jakub Zelenka
61de771afa
Improve json parser code
2015-06-07 15:22:09 +01:00
Andrea Faulds
05ef3b7c0d
Fix typo in Unicode escape test
2015-06-06 15:29:56 +01:00
Anatol Belski
11230328b5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS for bug #69642
updated NEWS for bug #69642 fix
2015-06-05 17:59:39 +02:00
Anatol Belski
9fde041a7d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS for bug #69642 fix
2015-06-05 17:59:08 +02:00
Anatol Belski
fb49ffe62e
updated NEWS for bug #69642
2015-06-05 17:58:39 +02:00
Anatol Belski
75c2aa9d3a
updated NEWS for bug #69642 fix
2015-06-05 17:56:57 +02:00
Dmitry Stogov
869f662cdd
Use better zend_hash_* functions
2015-06-05 13:54:57 +03:00
Dmitry Stogov
3186f913eb
Fixed incorrect ZEND_FILE_LINE_CC usage
2015-06-05 13:54:10 +03:00
Xinchen Hui
0655abef1a
Improve the fix for bug #69756
2015-06-05 18:42:21 +08:00
Dmitry Stogov
ed5fbf5e49
Fixed bug #69756 (Fatal error: Nesting level too deep - recursive dependency? with ===)
2015-06-05 10:04:58 +03:00
Xinchen Hui
d251ced225
Merge branch 'master' of git.php.net:php-src
2015-06-05 11:54:53 +08:00
Xinchen Hui
497f9f2cda
Fixed bug #69758 (Item added to array not being removed by array_pop/shift)
2015-06-05 11:54:22 +08:00