Anatol Belski
0f74baed9c
prepare NEWS for next
2015-09-03 19:04:39 +02:00
Lior Kaplan
3bb88aee53
Align NEWS entries format
2015-09-03 19:49:07 +03:00
Lior Kaplan
dbbc0e4ced
Align NEWS entries format
2015-09-03 19:46:41 +03:00
Anatol Belski
fcece2a7bb
sync NEWS
2015-09-03 18:25:14 +02:00
Lior Kaplan
9131cf4924
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
2015-09-03 18:46:07 +03:00
Lior Kaplan
23b88d38e8
Align NEWS entries format
2015-09-03 17:53:53 +03:00
Lior Kaplan
abf0ede0ac
Add CVE for #70140 (PHP 7.0.0 Beta 3)
2015-09-03 17:51:07 +03:00
Xinchen Hui
49ee37d870
Seems master is not affected
2015-09-02 23:15:57 -07:00
Xinchen Hui
d5b78cec64
We should keep one refcount to resource
2015-09-02 22:14:48 -07:00
Xinchen Hui
6815c08e29
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
2015-09-02 22:07:29 -07:00
Xinchen Hui
6290344d96
Fixed test
2015-09-02 21:59:36 -07:00
Levi Morrison
432dc527ad
Partially fix bug #67167 - Wrong return value...
...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE
The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
2015-09-02 18:23:26 -06:00
Ferenc Kovacs
4388eba510
Merge branch 'PHP-5.6'
...
* PHP-5.6:
move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:29 +02:00
Ferenc Kovacs
52b2a3ff25
move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:13 +02:00
Ferenc Kovacs
ece397ef0f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add missing news entries
2015-09-03 01:47:17 +02:00
Ferenc Kovacs
3759de241f
add missing news entries
2015-09-03 01:46:38 +02:00
Levi Morrison
730496b899
Skip if ext/filter isn't loaded
2015-09-02 10:12:08 -06:00
Julien Pauli
1f0045d44a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Merge branch 'PHP-5.6'
bump version
2015-09-02 17:56:49 +02:00
Julien Pauli
c65350cd4d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Merge branch 'PHP-5.6'
bump version
2015-09-02 17:55:57 +02:00
Julien Pauli
bb98ed600a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Merge branch 'PHP-5.6'
bump version
Conflicts:
configure.in
main/php_version.h
2015-09-02 17:55:20 +02:00
Matteo Beccati
a12cef979d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added missing skipif for phar+zlib test
2015-09-02 17:53:36 +02:00
Julien Pauli
60e2207c34
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.5.30 next
More fixes for bug #70219
Conflicts:
ext/pcre/php_pcre.c
ext/session/session.c
2015-09-02 17:51:02 +02:00
Julien Pauli
c07150cd1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.30 next
Conflicts:
configure.in
main/php_version.h
2015-09-02 17:42:00 +02:00
Julien Pauli
ea807f9c07
5.5.30 next
2015-09-02 17:40:56 +02:00
Xinchen Hui
7cf8df5597
Merge branch 'master' of git.php.net:/php-src
2015-09-02 23:36:43 +08:00
Xinchen Hui
1cfd12d618
Use ZSTR_VAL
2015-09-02 23:36:13 +08:00
Xinchen Hui
362f787b75
Merge branch 'fix-dtrace-phpdbg' of https://github.com/reeze/php-src
2015-09-02 23:28:51 +08:00
Anatol Belski
ebb6f5eae6
fix dir separators in test
2015-09-02 17:26:35 +02:00
Anatol Belski
2d72a17ab9
use correct api
2015-09-02 17:25:00 +02:00
Anatol Belski
45a72785b5
fix leak
2015-09-02 17:20:24 +02:00
Anatol Belski
59d3529f29
cleanup an atavism
...
no DOS support here )
2015-09-02 17:05:47 +02:00
Anatol Belski
9d82a7dc98
add overflow check
2015-09-02 17:05:45 +02:00
Anatol Belski
95ac779956
remove unnecessary macros
2015-09-02 17:05:43 +02:00
Dmitry Stogov
6848cb3f63
Use regular huge pages instead of anonymous if available.
2015-09-02 15:55:41 +03:00
Dmitry Stogov
111bd5d8c4
Introduced additional check. Its miss might be the reason of bug #70392 (SIGSEGV during PHP shutdown)
2015-09-02 13:05:12 +03:00
Dmitry Stogov
a2f8a7675b
Prevent HashTable compaction below HT_MIN_SIZE (this may lead to hash collisions).
2015-09-02 13:03:31 +03:00
Stanislav Malyshev
9c35f87e9a
Temporary add XFAILs, will fix soon
2015-09-02 01:23:40 -07:00
Stanislav Malyshev
6640aded24
fix memory leak
2015-09-02 01:21:47 -07:00
Stanislav Malyshev
c18f662e3c
Merge remote-tracking branch 'origin/master'
...
* origin/master:
Add test for ReflectionMethod::getPrototype_basic()
Added two tests to check the main functionallity of recode extension
Doubles are not refcounted
Fix #32490 : constructor of mysqli has wrong name
2015-09-02 01:00:16 -07:00
Stanislav Malyshev
9b1a224d4e
Merge branch 'PHP-5.6'
...
* PHP-5.6: (21 commits)
fix unit tests
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350 : ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
...
Conflicts:
ext/exif/exif.c
ext/gmp/gmp.c
ext/pcre/php_pcre.c
ext/session/session.c
ext/session/tests/session_decode_variation3.phpt
ext/soap/soap.c
ext/spl/spl_observer.c
ext/standard/var.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xsl/xsltprocessor.c
2015-09-02 00:37:20 -07:00
marcosptf
519016096f
Add test for ReflectionMethod::getPrototype_basic()
2015-09-02 00:28:46 +02:00
Daniel Persson
c98b88aafe
Added two tests to check the main functionallity of recode extension
2015-09-02 00:11:45 +02:00
Hannes Magnusson
874dcd8f73
Doubles are not refcounted
2015-09-01 14:52:04 -07:00
Stanislav Malyshev
51fca4b77d
bump version
2015-09-01 13:12:16 -07:00
Stanislav Malyshev
a6c063d663
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
More fixes for bug #70219
2015-09-01 12:51:48 -07:00
Christoph M. Becker
b15eff6386
Fix #32490 : constructor of mysqli has wrong name
...
As of PHP 7 old style constructor names are deprecated, so we rename
mysqli::mysqli() to mysqli::__construct().
2015-09-01 21:44:16 +02:00
Stanislav Malyshev
3fe509443c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix unit tests
2015-09-01 12:24:14 -07:00
Stanislav Malyshev
43c2dfa7b3
Merge branch 'PHP-5.5' into PHP-5.5.29
...
* PHP-5.5:
fix unit tests
2015-09-01 12:24:06 -07:00
Stanislav Malyshev
4aeff30337
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix unit tests
2015-09-01 12:23:55 -07:00
Stanislav Malyshev
1922c650ba
fix unit tests
2015-09-01 12:23:22 -07:00