]>
granicus.if.org Git - php/log
Aaron Piotrowski [Tue, 5 Jul 2016 21:09:21 +0000 (16:09 -0500)]
Update NEWS and UPGRADING with missed DBA changes
Davey Shafik [Tue, 5 Jul 2016 19:33:22 +0000 (12:33 -0700)]
Bump versions
Davey Shafik [Tue, 5 Jul 2016 19:18:16 +0000 (12:18 -0700)]
Bump versions/dates for release of 7.1.0alpha3
Christoph M. Becker [Tue, 5 Jul 2016 14:59:20 +0000 (16:59 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src
Nikita Popov [Tue, 5 Jul 2016 14:57:32 +0000 (16:57 +0200)]
Merge branch 'PHP-7.0'
Christoph M. Becker [Tue, 5 Jul 2016 14:51:25 +0000 (16:51 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Tue, 5 Jul 2016 14:56:36 +0000 (16:56 +0200)]
Add NEWS entries
Lauri Kenttä [Wed, 25 May 2016 19:06:42 +0000 (22:06 +0300)]
base64_decode: fix bug #72264 ('VV= =' shouldn't fail in strict mode)
Lauri Kenttä [Wed, 25 May 2016 16:52:11 +0000 (19:52 +0300)]
base64_decode: remove redundant code
case 1 is already handled in the first lines of the for loop;
it would only be entered in the invalid case where the string
continues past the defined length (ch != 0 but length-- == 0).
case 2 and case 3 are redundant, since k >= j and later the
string is truncated to j characters anyway.
Lauri Kenttä [Wed, 25 May 2016 17:53:47 +0000 (20:53 +0300)]
base64_decode: fix bug #72263 (skips char after padding)
Lauri Kenttä [Wed, 25 May 2016 18:02:41 +0000 (21:02 +0300)]
base64_decode: fix bug #72152 (fail on NUL bytes in strict mode)
This added check is actually for NOT failing in NON-strict mode.
The ch == -2 check later causes the desired failure in strict mode.
Lauri Kenttä [Wed, 25 May 2016 18:15:52 +0000 (21:15 +0300)]
base64_decode: remove redundant check
If length == 0 || *current != '=' is false, the for loop will always
end up in this same point, until the if statement becomes true.
Thus, the if statement is not needed.
Lauri Kenttä [Wed, 25 May 2016 17:28:45 +0000 (20:28 +0300)]
base64_decode: reorder to fix out of bounds read
Christoph M. Becker [Tue, 5 Jul 2016 14:49:40 +0000 (16:49 +0200)]
Update NEWS
Christoph M. Becker [Tue, 5 Jul 2016 14:43:39 +0000 (16:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/spl/spl_directory.c
Valentin VALCIU [Thu, 21 Apr 2016 16:02:52 +0000 (19:02 +0300)]
Fix bug #55701: GlobIterator throws LogicException
GlobIterator throws LogicException with message 'The parent constructor was
not called' on its first operation when the glob expression doesn't match
any file. It also throws on the first operation after the iteration
completes, when the glob expression matches some files.
# Resolved conflicts:
# ext/spl/spl_directory.c
Jeremy Mikola [Tue, 28 Jun 2016 18:30:58 +0000 (14:30 -0400)]
Export php_date_get_interface_ce() for extension use
Nikita Popov [Tue, 5 Jul 2016 14:10:25 +0000 (16:10 +0200)]
Merge branch 'PHP-7.0'
Adam Baratz [Fri, 1 Jul 2016 19:39:02 +0000 (15:39 -0400)]
Use size_t instead of int for loop counter
Valentin V. Bartenev [Thu, 30 Jun 2016 10:39:10 +0000 (13:39 +0300)]
Removed duplicate php.h include in SAPI.h
It's already included a few lines above.
Valentin V. Bartenev [Wed, 29 Jun 2016 17:57:28 +0000 (20:57 +0300)]
Removed a surplus condition in php_register_variable_ex()
The test for equality to " " implies that the character isn't NUL.
Anatol Belski [Tue, 5 Jul 2016 13:58:55 +0000 (15:58 +0200)]
fix error text
Anatol Belski [Tue, 5 Jul 2016 13:43:01 +0000 (15:43 +0200)]
fix datatypes and add range checks
Nikita Popov [Tue, 5 Jul 2016 13:51:11 +0000 (15:51 +0200)]
Closure::fromCallable(): Getting non-static method statically
As this is new functionality, I'm going directly for a TypeError,
rather than a deprecation warning.
Nikita Popov [Tue, 5 Jul 2016 13:43:27 +0000 (15:43 +0200)]
Closure::fromCallable(): Better LSB handling
The previous fix missed the "late" part of "late static binding" :)
Nikita Popov [Tue, 5 Jul 2016 13:22:13 +0000 (15:22 +0200)]
Closure::fromCallable(): Fix late static binding
Anatol Belski [Tue, 5 Jul 2016 10:09:22 +0000 (12:09 +0200)]
re-add range check
Nikita Popov [Tue, 5 Jul 2016 13:13:36 +0000 (15:13 +0200)]
Closure::fromCallable(): Use fake closures
Nikita Popov [Tue, 5 Jul 2016 12:58:29 +0000 (14:58 +0200)]
Closure::fromCallable(): Fix test files and names
Anatol Belski [Tue, 5 Jul 2016 13:04:10 +0000 (15:04 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix possible optimization bug
Anatol Belski [Tue, 5 Jul 2016 12:57:16 +0000 (14:57 +0200)]
fix possible optimization bug
Nikita Popov [Tue, 5 Jul 2016 12:53:20 +0000 (14:53 +0200)]
Closure::fromCallable(): Fix stack corruption
So the tests work at least...
Nikita Popov [Tue, 5 Jul 2016 12:32:49 +0000 (14:32 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Tue, 5 Jul 2016 12:31:32 +0000 (14:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
Pedro Magalhães [Thu, 30 Jun 2016 07:00:33 +0000 (09:00 +0200)]
Don't enforce LSP if prototype method is private
Fixes bug #72496.
Anatol Belski [Tue, 5 Jul 2016 10:38:14 +0000 (12:38 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix typo
Anatol Belski [Tue, 5 Jul 2016 10:36:55 +0000 (12:36 +0200)]
fix typo
Anatol Belski [Tue, 5 Jul 2016 08:34:25 +0000 (10:34 +0200)]
Revert "fix datatype and add range check"
This reverts commit
14bdd8246c50b55d1ddf838b45de34065e8613c4 .
Dmitry Stogov [Tue, 5 Jul 2016 08:30:55 +0000 (11:30 +0300)]
Fixed tests
Anatol Belski [Tue, 5 Jul 2016 08:03:40 +0000 (10:03 +0200)]
fix datatype and add range check
Xinchen Hui [Tue, 5 Jul 2016 07:31:46 +0000 (15:31 +0800)]
Some cleanup:
1. use c89 comments
2. exception should not be swallowd
3. ZVAL_OBJ may have problem if obj is NULL in the feature(who knows)
Aaron Piotrowski [Tue, 5 Jul 2016 07:29:53 +0000 (02:29 -0500)]
Merge branch 'pull-request/1929'
Aaron Piotrowski [Tue, 5 Jul 2016 07:10:33 +0000 (02:10 -0500)]
Update NEWS and UPGRADING
Aaron Piotrowski [Tue, 5 Jul 2016 07:08:39 +0000 (02:08 -0500)]
Merge branch 'throw-error-in-extensions'
Joe Watkins [Tue, 5 Jul 2016 07:03:00 +0000 (08:03 +0100)]
upgrading entry for Closure::fromCallable
Joe Watkins [Tue, 5 Jul 2016 07:01:31 +0000 (08:01 +0100)]
news entry for Closure::fromCallable
Joe Watkins [Tue, 5 Jul 2016 06:57:06 +0000 (07:57 +0100)]
Merge branch 'pull-request/1906'
Anatol Belski [Tue, 5 Jul 2016 06:10:26 +0000 (08:10 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare next version
Anatol Belski [Tue, 5 Jul 2016 06:09:20 +0000 (08:09 +0200)]
prepare next version
Anatol Belski [Mon, 4 Jul 2016 14:48:59 +0000 (16:48 +0200)]
Increase ODBCVER to 3.5 by default
Anatol Belski [Mon, 4 Jul 2016 09:07:54 +0000 (11:07 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add missing NEWS entry
Anatol Belski [Mon, 4 Jul 2016 09:07:34 +0000 (11:07 +0200)]
add missing news entry
Anatol Belski [Mon, 4 Jul 2016 09:05:49 +0000 (11:05 +0200)]
add missing NEWS entry
Aaron Piotrowski [Mon, 4 Jul 2016 04:35:40 +0000 (23:35 -0500)]
Update NEWS and UPGRADING
Aaron Piotrowski [Mon, 4 Jul 2016 04:12:37 +0000 (23:12 -0500)]
Merge branch 'iterable'
Aaron Piotrowski [Mon, 4 Jul 2016 03:42:10 +0000 (22:42 -0500)]
Merge branch 'master' into iterable
Christoph M. Becker [Mon, 4 Jul 2016 01:20:01 +0000 (03:20 +0200)]
Merge branch 'PHP-7.0'
Christoph M. Becker [Mon, 4 Jul 2016 01:18:50 +0000 (03:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 4 Jul 2016 01:17:17 +0000 (03:17 +0200)]
Fix typo in comment
Ferenc Kovacs [Sun, 3 Jul 2016 21:37:58 +0000 (23:37 +0200)]
Merge branch 'PHP-7.0'
Ferenc Kovacs [Sun, 3 Jul 2016 21:35:00 +0000 (23:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Sun, 3 Jul 2016 21:31:32 +0000 (23:31 +0200)]
this was actually fixed in 5.6.23
Xinchen Hui [Sun, 3 Jul 2016 15:57:42 +0000 (23:57 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
update NEWS
extend test
Fixed bug #72534 stream_socket_get_name crashes
Xinchen Hui [Sun, 3 Jul 2016 15:57:23 +0000 (23:57 +0800)]
Update NEWS
Xinchen Hui [Sun, 3 Jul 2016 15:57:02 +0000 (23:57 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72538 (readline_redisplay crashes php)
Xinchen Hui [Sun, 3 Jul 2016 15:56:27 +0000 (23:56 +0800)]
Fixed bug #72538 (readline_redisplay crashes php)
Anatol Belski [Sun, 3 Jul 2016 15:16:53 +0000 (17:16 +0200)]
update NEWS
Anatol Belski [Sun, 3 Jul 2016 15:16:10 +0000 (17:16 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
extend test
Fixed bug #72534 stream_socket_get_name crashes
Anatol Belski [Sun, 3 Jul 2016 15:15:19 +0000 (17:15 +0200)]
update NEWS
Anatol Belski [Sun, 3 Jul 2016 15:13:46 +0000 (17:13 +0200)]
extend test
Anatol Belski [Sun, 3 Jul 2016 15:09:19 +0000 (17:09 +0200)]
Fixed bug #72534 stream_socket_get_name crashes
Christoph M. Becker [Sun, 3 Jul 2016 10:43:30 +0000 (12:43 +0200)]
Update NEWS and UPGRADING
Christoph M. Becker [Sun, 3 Jul 2016 10:33:27 +0000 (12:33 +0200)]
Merge branch 'pull-request/1945'
Xinchen Hui [Sun, 3 Jul 2016 01:31:06 +0000 (09:31 +0800)]
update NEWS
Xinchen Hui [Sun, 3 Jul 2016 01:30:48 +0000 (09:30 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow)
Xinchen Hui [Sun, 3 Jul 2016 01:30:33 +0000 (09:30 +0800)]
Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow)
Anatol Belski [Fri, 1 Jul 2016 16:45:27 +0000 (18:45 +0200)]
update NEWS
Anatol Belski [Fri, 1 Jul 2016 16:45:02 +0000 (18:45 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Fixed bug #72498 variant_date_from_timestamp null dereference
Anatol Belski [Fri, 1 Jul 2016 16:44:20 +0000 (18:44 +0200)]
update NEWS
Anatol Belski [Fri, 1 Jul 2016 16:41:50 +0000 (18:41 +0200)]
Fixed bug #72498 variant_date_from_timestamp null dereference
Xinchen Hui [Fri, 1 Jul 2016 10:50:35 +0000 (18:50 +0800)]
Fixed bug #72523 (dtrace issue with reflection (failed test))
Dmitry Stogov [Thu, 30 Jun 2016 21:16:54 +0000 (00:16 +0300)]
Prevent inlining through call_user_func() and call_user_func_array()
Dmitry Stogov [Thu, 30 Jun 2016 18:50:57 +0000 (21:50 +0300)]
Fixed ext/opcache/tests/bug70207.phpt
Dmitry Stogov [Thu, 30 Jun 2016 18:40:34 +0000 (21:40 +0300)]
Introduce new CHECK_VAR instruction to keep warnings about undefined variables.
Dmitry Stogov [Thu, 30 Jun 2016 18:05:48 +0000 (21:05 +0300)]
Disable inlining for $this->foo(), because $this may be not in object context
Dmitry Stogov [Thu, 30 Jun 2016 18:03:08 +0000 (21:03 +0300)]
Disable inlining for $this->foo(), because $this may be used not in object context
Dmitry Stogov [Thu, 30 Jun 2016 17:48:16 +0000 (20:48 +0300)]
Fixed incorrect constant propagation
Aaron Piotrowski [Thu, 30 Jun 2016 17:01:29 +0000 (12:01 -0500)]
Switch failure to register class back to E_ERROR
Nikita Popov [Thu, 30 Jun 2016 15:42:57 +0000 (17:42 +0200)]
Fix RT_CONSTANT_EX typo
Dmitry Stogov [Thu, 30 Jun 2016 14:04:25 +0000 (17:04 +0300)]
Inline simple constant functions
Jakub Zelenka [Wed, 29 Jun 2016 19:51:10 +0000 (20:51 +0100)]
Merge branch 'json_api_return_codes'
Jakub Zelenka [Wed, 29 Jun 2016 19:49:14 +0000 (20:49 +0100)]
Remove openssl test 029 as it is incomplete
Aaron Piotrowski [Wed, 29 Jun 2016 15:02:17 +0000 (10:02 -0500)]
Return null instead of false
Aaron Piotrowski [Wed, 29 Jun 2016 14:56:25 +0000 (09:56 -0500)]
Add missed return replacing bail out
Dmitry Stogov [Wed, 29 Jun 2016 14:53:39 +0000 (17:53 +0300)]
clanup
Aaron Piotrowski [Wed, 29 Jun 2016 14:36:33 +0000 (09:36 -0500)]
Swap type check order
Dmitry Stogov [Wed, 29 Jun 2016 08:43:31 +0000 (11:43 +0300)]
Revert "Skip new OpenSSL ECC tests on 32bit"
This reverts commit
0a4f89bc292c3c82ff719cd79e66ef96c2079526 .
Remi Collet [Wed, 29 Jun 2016 04:48:06 +0000 (06:48 +0200)]
Improve php-fpm systemd unit file
- use PrivateTmp, now available everwhere, for better security
- add comment about how to customize the unit file
Jakub Zelenka [Tue, 28 Jun 2016 19:49:38 +0000 (20:49 +0100)]
Add return code from json API functions
It will allow fix few json bugs in a better way
Jakub Zelenka [Tue, 28 Jun 2016 19:39:31 +0000 (20:39 +0100)]
Skip new OpenSSL ECC tests on 32bit
There has been reported that they fail on 32bit so
they will be skipped till the issue is investigated.