]>
granicus.if.org Git - php/log
Nikita Popov [Fri, 14 Aug 2015 14:16:27 +0000 (16:16 +0200)]
Don't copy zend_strings during exception creation
Minor optimization...
Anatol Belski [Fri, 14 Aug 2015 12:12:22 +0000 (14:12 +0200)]
fix array size calculation for range, related to bug #70239
Anatol Belski [Fri, 14 Aug 2015 12:10:27 +0000 (14:10 +0200)]
add range() tests
Anatol Belski [Thu, 13 Aug 2015 16:16:26 +0000 (18:16 +0200)]
Fixed bug #70239 Creating a huge array doesn't result in exhausted, but segfault
Christoph M. Becker [Fri, 14 Aug 2015 12:32:56 +0000 (14:32 +0200)]
updated NEWS
Christoph M. Becker [Fri, 14 Aug 2015 12:25:19 +0000 (14:25 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
Christoph M. Becker [Fri, 14 Aug 2015 12:20:37 +0000 (14:20 +0200)]
updated NEWS
Christoph M. Becker [Fri, 14 Aug 2015 12:19:12 +0000 (14:19 +0200)]
Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
The required_num_args argument of ZEND_BEGIN_ARG_INFO_EX() has to be 1.
Xinchen Hui [Fri, 14 Aug 2015 09:09:27 +0000 (17:09 +0800)]
Remove useless insert
Xinchen Hui [Fri, 14 Aug 2015 08:20:53 +0000 (16:20 +0800)]
Fixed dumpbt
Dmitry Stogov [Fri, 14 Aug 2015 07:59:39 +0000 (10:59 +0300)]
Set expectations
Adam Harvey [Thu, 13 Aug 2015 19:40:46 +0000 (12:40 -0700)]
We don't need CVS/SVN keywords in UPGRADING.
Adam Harvey [Thu, 13 Aug 2015 19:39:41 +0000 (12:39 -0700)]
We did eventually decide it was PHP 7.0, so make it so.
Christoph M. Becker [Thu, 13 Aug 2015 18:33:59 +0000 (20:33 +0200)]
Merge branch 'pull-request/1454'
* pull-request/1454:
Docs for find_tested.php
Xinchen Hui [Thu, 13 Aug 2015 15:38:39 +0000 (23:38 +0800)]
Simplify the macro (HT_DATA_SIZE/HT_HASH_SIZE is not used outside Zend)
Xinchen Hui [Thu, 13 Aug 2015 15:02:15 +0000 (23:02 +0800)]
Fixed similar issues(segfault on OOM)
Xinchen Hui [Thu, 13 Aug 2015 14:42:18 +0000 (22:42 +0800)]
Fixed segfault while OOM in pack_to_hash
Xinchen Hui [Thu, 13 Aug 2015 14:31:59 +0000 (22:31 +0800)]
Fixed tests(I am not sure, these tests seems strange, anyway it passes
locally now)
Christoph M. Becker [Thu, 13 Aug 2015 12:30:05 +0000 (14:30 +0200)]
updated NEWS
Christoph M. Becker [Thu, 13 Aug 2015 12:28:16 +0000 (14:28 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #70232: Incorrect bump-along behavior with \K and empty string match
Resolved conflicts:
ext/pcre/php_pcre.c
Christoph M. Becker [Thu, 13 Aug 2015 12:21:17 +0000 (14:21 +0200)]
updated NEWS
Christoph M. Becker [Thu, 13 Aug 2015 12:20:04 +0000 (14:20 +0200)]
Fix #70232: Incorrect bump-along behavior with \K and empty string match
To do global matching (/g), for every empty match we have to do a second match
with PCRE_NOTEMPTY turned on. That may fail, however, when the \K escape
sequence is involved. For this purpose libpcre 8.0 introduced the
PCRE_NOTEMPTY_ATSTART flag, which we will use if available, and otherwise fall
back to the old (possibly buggy) behavior.
Dmitry Stogov [Thu, 13 Aug 2015 10:56:29 +0000 (13:56 +0300)]
Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
Derick Rethans [Thu, 13 Aug 2015 10:07:39 +0000 (11:07 +0100)]
Merge branch 'PHP-5.6'
Derick Rethans [Thu, 13 Aug 2015 10:07:16 +0000 (11:07 +0100)]
Of course, we support v2 in PHP 5.6 as well.
Derick Rethans [Thu, 13 Aug 2015 09:54:06 +0000 (10:54 +0100)]
Updated to version 2015.6 (2015f)
Derick Rethans [Thu, 13 Aug 2015 09:54:05 +0000 (10:54 +0100)]
Empty merge
Derick Rethans [Thu, 13 Aug 2015 09:54:03 +0000 (10:54 +0100)]
Updated to version 2015.6 (2015f)
Derick Rethans [Thu, 13 Aug 2015 09:50:28 +0000 (10:50 +0100)]
Tell timelib we support v2
Xinchen Hui [Thu, 13 Aug 2015 05:39:31 +0000 (13:39 +0800)]
Add entry for zend_memnstr change
Xinchen Hui [Thu, 13 Aug 2015 05:30:50 +0000 (13:30 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Thu, 13 Aug 2015 05:30:25 +0000 (13:30 +0800)]
Fixed bug #70250 (extract() turns array elements to references)
Christopher Jones [Thu, 13 Aug 2015 05:01:24 +0000 (15:01 +1000)]
Merge branch 'PHP-5.6'
Christopher Jones [Thu, 13 Aug 2015 05:01:01 +0000 (15:01 +1000)]
PDO_OCI is not experimental
Xinchen Hui [Thu, 13 Aug 2015 04:19:35 +0000 (12:19 +0800)]
zend_hash_resize seems useless, use zend_hash_extend
Xinchen Hui [Thu, 13 Aug 2015 04:08:57 +0000 (12:08 +0800)]
Fixed bug #70258 and #70253
Xinchen Hui [Thu, 13 Aug 2015 03:55:30 +0000 (11:55 +0800)]
Revert "Updated to version 2015.6 (2015f)"
This reverts commit
7b476a600b64834838b3521b05b1d0d90130483b .
Derick Rethans [Wed, 12 Aug 2015 21:00:15 +0000 (22:00 +0100)]
Updated to version 2015.6 (2015f)
Derick Rethans [Wed, 12 Aug 2015 21:00:15 +0000 (22:00 +0100)]
Empty merge
Derick Rethans [Wed, 12 Aug 2015 21:00:13 +0000 (22:00 +0100)]
Updated to version 2015.6 (2015f)
Christoph M. Becker [Wed, 12 Aug 2015 17:03:35 +0000 (19:03 +0200)]
updated NEWS
Christoph M. Becker [Wed, 12 Aug 2015 17:01:04 +0000 (19:01 +0200)]
Fix #70245: strtotime does not emit warning when 2nd parameter is object or string
Caused by a refactoring strtotime() called
zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ...) instead of
zend_parse_parameters().
Anatol Belski [Wed, 12 Aug 2015 08:58:21 +0000 (10:58 +0200)]
improve condition
same as CSPRNG, break by EOF
Christopher Jones [Wed, 12 Aug 2015 11:57:16 +0000 (21:57 +1000)]
Further PHP 7 compat for OCI8
Bob Weinand [Wed, 12 Aug 2015 10:42:40 +0000 (10:42 +0000)]
Fix valgrind false positives with watchpoints
Xinchen Hui [Wed, 12 Aug 2015 08:46:57 +0000 (16:46 +0800)]
Use the same error msg with resize
Xinchen Hui [Wed, 12 Aug 2015 08:44:51 +0000 (16:44 +0800)]
We should not silently go on if the required size can not be met
Xinchen Hui [Wed, 12 Aug 2015 08:44:18 +0000 (16:44 +0800)]
Revert "We should not silently go on if the required size can not be met."
This reverts commit
d2bcdec980e31d876bdcc4cfb59392fdf215badb .
Xinchen Hui [Wed, 12 Aug 2015 08:40:59 +0000 (16:40 +0800)]
We should not silently go on if the required size can not be met.
Anatol Belski [Wed, 12 Aug 2015 08:20:26 +0000 (10:20 +0200)]
improve condition
read() == 0 is EOL
Anatol Belski [Wed, 12 Aug 2015 06:52:08 +0000 (08:52 +0200)]
second part fixing vc14, type/specifier order also in definitions
Xinchen Hui [Wed, 12 Aug 2015 03:15:09 +0000 (11:15 +0800)]
use efree_size here
Dmitry Stogov [Tue, 11 Aug 2015 23:58:21 +0000 (02:58 +0300)]
Revert "Simplify ZEND_EXIT and count boolean values to it as exit status"
This reverts commit
7c003948c618adb2a6691f529057388f02202f09 .
Dmitry Stogov [Tue, 11 Aug 2015 23:47:37 +0000 (02:47 +0300)]
Attempt to fix Windows build (vc14)
Bob Weinand [Tue, 11 Aug 2015 20:36:47 +0000 (22:36 +0200)]
Simplify ZEND_EXIT and count boolean values to it as exit status
Bob Weinand [Tue, 11 Aug 2015 20:12:06 +0000 (22:12 +0200)]
Fixed bug #70241 (Skipped assertions affect Generator returns)
Anatol Belski [Tue, 11 Aug 2015 15:37:36 +0000 (17:37 +0200)]
update NEWS
Anatol Belski [Tue, 11 Aug 2015 15:36:10 +0000 (17:36 +0200)]
Fixed bug #70198 Checking liveness does not work as expected
Anatol Belski [Tue, 11 Aug 2015 14:52:13 +0000 (16:52 +0200)]
fix news entry
Anatol Belski [Tue, 11 Aug 2015 14:50:53 +0000 (16:50 +0200)]
updated NEWS
Anatol Belski [Tue, 11 Aug 2015 14:49:28 +0000 (16:49 +0200)]
fix bug #69833 mcrypt fd caching not working
Xinchen Hui [Tue, 11 Aug 2015 13:01:56 +0000 (21:01 +0800)]
Fixed bug #70237 (Empty while and do-while segmentation fault with opcode on CLI enabled).
Christoph M. Becker [Mon, 10 Aug 2015 23:36:39 +0000 (01:36 +0200)]
updated NEWS wrt. bug #69487
Christoph M. Becker [Sun, 9 Aug 2015 23:33:20 +0000 (01:33 +0200)]
Fix #69487: SAPI may truncate POST data
If SG(request_info).request_body can't be completely written (e.g. due to a
full drive), only parts of the POST data will be available. This patch changes
this, so that SG(request_info).request_body will be reset in this case, and a
warning will be thrown.
Lior Kaplan [Mon, 10 Aug 2015 08:54:39 +0000 (11:54 +0300)]
Add CVE IDs asigned to #69085 (PHP 5.6.7)
Lior Kaplan [Mon, 10 Aug 2015 08:52:23 +0000 (11:52 +0300)]
Align NEWS with 5.6.12
Lior Kaplan [Mon, 10 Aug 2015 08:49:18 +0000 (11:49 +0300)]
Add entries for phar bug fixes in 5.6.11 (also have CVE assigned)
Christoph M. Becker [Sun, 9 Aug 2015 00:43:41 +0000 (02:43 +0200)]
updated NEWS
wusuopu [Mon, 3 Nov 2014 06:52:16 +0000 (14:52 +0800)]
Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field.
Christoph M. Becker [Sun, 9 Aug 2015 00:36:58 +0000 (02:36 +0200)]
added tests for bug #66606
Ferenc Kovacs [Fri, 7 Aug 2015 06:46:10 +0000 (08:46 +0200)]
fix NEWS
Stanislav Malyshev [Wed, 5 Aug 2015 07:00:54 +0000 (00:00 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.29 next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 5 Aug 2015 06:59:55 +0000 (23:59 -0700)]
5.5.29 next
Stanislav Malyshev [Tue, 4 Aug 2015 23:45:55 +0000 (16:45 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Stanislav Malyshev [Tue, 4 Aug 2015 23:45:32 +0000 (16:45 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test
Stanislav Malyshev [Tue, 4 Aug 2015 23:45:20 +0000 (16:45 -0700)]
fix test
Stanislav Malyshev [Tue, 4 Aug 2015 23:31:57 +0000 (16:31 -0700)]
virtual_file_ex uses emalloc in 5.6+
Stanislav Malyshev [Tue, 4 Aug 2015 23:13:53 +0000 (16:13 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
__wakeup doesn't have to be final
Stanislav Malyshev [Tue, 4 Aug 2015 23:13:43 +0000 (16:13 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
__wakeup doesn't have to be final
Stanislav Malyshev [Tue, 4 Aug 2015 23:13:26 +0000 (16:13 -0700)]
__wakeup doesn't have to be final
Stanislav Malyshev [Tue, 4 Aug 2015 22:29:13 +0000 (15:29 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
fix test
update NEWS
Fix bug #70019 - limit extracted files to given directory
Do not do convert_to_* on unserialize, it messes up references
Fix #69793 - limit what we accept when unserializing exception
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
ignore signatures for packages too
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
Fixed bug #69892
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
Improved fix for Bug #69441
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
Fix bug #70081: check types for SOAP variables
Conflicts:
ext/soap/php_http.c
ext/spl/spl_observer.c
Stanislav Malyshev [Tue, 4 Aug 2015 22:22:59 +0000 (15:22 -0700)]
update NEWS
Nikhil Vimal [Tue, 4 Aug 2015 21:46:47 +0000 (16:46 -0500)]
Docs for find_tested.php
Initial Pass, also fixing the extra space before the extract_tests function name to keep with standards.
Stanislav Malyshev [Tue, 4 Aug 2015 21:46:30 +0000 (14:46 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test
update NEWS
Stanislav Malyshev [Tue, 4 Aug 2015 21:46:19 +0000 (14:46 -0700)]
fix test
Stanislav Malyshev [Tue, 4 Aug 2015 21:37:28 +0000 (14:37 -0700)]
update NEWS
Stanislav Malyshev [Tue, 4 Aug 2015 21:10:57 +0000 (14:10 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #70019 - limit extracted files to given directory
Do not do convert_to_* on unserialize, it messes up references
Fix #69793 - limit what we accept when unserializing exception
Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
ignore signatures for packages too
Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
Fixed bug #69892
Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
Improved fix for Bug #69441
Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
Fix bug #70081: check types for SOAP variables
Conflicts:
.gitignore
ext/date/php_date.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
Stanislav Malyshev [Tue, 4 Aug 2015 21:04:24 +0000 (14:04 -0700)]
Merge branch 'PHP-5.4' into PHP-5.4.44
* PHP-5.4:
Fixed bug #69892
Adjust Git-Rules
Stanislav Malyshev [Tue, 4 Aug 2015 21:00:29 +0000 (14:00 -0700)]
Fix bug #70019 - limit extracted files to given directory
Stanislav Malyshev [Sun, 2 Aug 2015 07:34:09 +0000 (00:34 -0700)]
Do not do convert_to_* on unserialize, it messes up references
Dmitry Stogov [Tue, 4 Aug 2015 15:21:05 +0000 (18:21 +0300)]
Fixed bug #70098 (Real memory usage doesn't decrease)
Anatol Belski [Tue, 4 Aug 2015 14:30:53 +0000 (16:30 +0200)]
run credits script
Dmitry Stogov [Tue, 4 Aug 2015 07:48:32 +0000 (10:48 +0300)]
Fixed possible access to uninitialized data (prevents valgrind issues in Zend/tests/bug70089.phpt)
Dmitry Stogov [Tue, 4 Aug 2015 06:55:54 +0000 (09:55 +0300)]
Added NEWS entry
Dmitry Stogov [Tue, 4 Aug 2015 05:35:40 +0000 (08:35 +0300)]
Get rid of ZEND_FAST_CALL_UNBOUND
Dmitry Stogov [Tue, 4 Aug 2015 04:37:06 +0000 (07:37 +0300)]
Move most "finally" related code-generation from pass_two() to compiler.
Nikita Popov [Fri, 10 Jul 2015 11:30:25 +0000 (13:30 +0200)]
Try to fix finally issue
Christoph M. Becker [Tue, 4 Aug 2015 01:37:41 +0000 (03:37 +0200)]
Merge branch 'pull-request/1449'
* pull-request/1449:
Remove unneded space(s)
Bob Weinand [Mon, 3 Aug 2015 23:22:04 +0000 (01:22 +0200)]
Fix further leaks
Bob Weinand [Mon, 3 Aug 2015 22:00:10 +0000 (00:00 +0200)]
Fix valgrind errors in phpdbg
Revert "We cannot safely assume that all op array will be refcount 0 after execution"
This reverts commit
b6936adb58288a0606ed847802d9226cddb41e2b .
This change turns out to not have been a clever idea and was causing more weirdness than it helped...