ed9bff5352
oops, name test right
2016-07-06 13:57:37 -05:00
90e326c620
change long to zend_long, for uniformity
2016-07-06 13:57:37 -05:00
fcda3c8ada
Fix to not attempt to call if handler is long. Idea for this came
...
from comment on PR.
2016-07-06 13:57:37 -05:00
217dcbcd91
Fix #72409 - return previous handler
...
This patch addresses https://bugs.php.net/bug.php?id=72409
This patch is applied to master compared to PR#1952 which was
patching 5.6.x branch of PHP
This patch takes into account discussions on PR #1978
Addressing that rather than have pcntl_signal() return a value
to create a new function that can be used to get the current
value of the signal handler.
2016-07-06 13:57:37 -05:00
cc89a46a89
Updated to version 2016.6 (2016f)
2016-07-06 11:15:46 +01:00
c03ccfe78d
Asynchronous signal handling without TICKs.
...
Squashed commit of the following:
commit eda931df18dmitry@zend.com >
Date: Wed Jul 6 10:53:30 2016 +0300
Replace pcntl.async_signals INI direcrive with pcntl_async_signals() function.
commit bfbf7dd7c2dmitry@zend.com >
Date: Fri Jun 24 12:25:31 2016 +0300
Asynchronous signal handling without TICKs.
2016-07-06 13:11:47 +03:00
e2e72e1f5c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Rewrite test to avoid sending emails
2016-07-06 07:10:10 +02:00
ff7c981d19
Rewrite test to avoid sending emails
...
A properly configured email server was generating bounce emails when running
the test.
2016-07-06 07:08:43 +02:00
c196cac71e
Bump versions/dates for release of 7.1.0alpha3
2016-07-05 12:29:02 -07:00
5cb774faf1
Merge branch 'master' of http://git.php.net/repository/php-src
2016-07-05 16:59:20 +02:00
441d44c2eb
Merge branch 'PHP-7.0'
2016-07-05 16:57:32 +02:00
411c809787
Merge branch 'PHP-7.0'
2016-07-05 16:56:39 +02:00
3380acbdd4
base64_decode: fix bug #72264 ('VV= =' shouldn't fail in strict mode)
2016-07-05 16:51:36 +02:00
77e8c299ba
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.
2016-07-05 16:51:36 +02:00
6d17ee744f
base64_decode: fix bug #72263 (skips char after padding)
2016-07-05 16:51:36 +02:00
260c07db85
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.
2016-07-05 16:51:36 +02:00
fbc74bb5f9
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.
2016-07-05 16:51:36 +02:00
59d36bfcf2
base64_decode: reorder to fix out of bounds read
2016-07-05 16:51:36 +02:00
c015095042
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/spl/spl_directory.c
2016-07-05 16:43:39 +02:00
4c24f170ea
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
2016-07-05 16:39:25 +02:00
7aaa310d7b
Export php_date_get_interface_ce() for extension use
2016-07-05 16:19:45 +02:00
cc909a8923
Merge branch 'PHP-7.0'
2016-07-05 16:10:25 +02:00
f22bc6438d
Use size_t instead of int for loop counter
2016-07-05 16:09:27 +02:00
4a522e3b17
fix error text
2016-07-05 15:58:55 +02:00
28ed30df53
fix datatypes and add range checks
2016-07-05 15:54:57 +02:00
de643ead3e
re-add range check
2016-07-05 15:15:20 +02:00
5920445a5f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix possible optimization bug
2016-07-05 15:04:10 +02:00
4576c41291
fix possible optimization bug
2016-07-05 14:57:16 +02:00
41622c86bd
Revert "fix datatype and add range check"
...
This reverts commit 14bdd8246c
2016-07-05 10:35:19 +02:00
818a47c24a
Fixed tests
2016-07-05 11:30:55 +03:00
14bdd8246c
fix datatype and add range check
2016-07-05 10:04:23 +02:00
24237027bc
Merge branch 'throw-error-in-extensions'
2016-07-05 02:08:39 -05:00
4b9362d347
Increase ODBCVER to 3.5 by default
2016-07-04 16:48:59 +02:00
d9a9cf8eca
Merge branch 'master' into iterable
2016-07-03 22:42:10 -05:00
c2b29a58bc
Merge branch 'PHP-7.0'
2016-07-04 03:20:01 +02:00
60fc27f912
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-04 03:18:50 +02:00
717a043a32
Fix typo in comment
2016-07-04 03:17:17 +02:00
f6aaaf02a9
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
2016-07-03 23:57:42 +08:00
ee2d662434
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72538 (readline_redisplay crashes php)
2016-07-03 23:57:02 +08:00
612aff3a8a
Fixed bug #72538 (readline_redisplay crashes php)
2016-07-03 23:56:27 +08:00
b60ecc890e
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
extend test
Fixed bug #72534 stream_socket_get_name crashes
2016-07-03 17:16:10 +02:00
8b229bfeeb
extend test
2016-07-03 17:13:46 +02:00
ea9da7529c
Fixed bug #72534 stream_socket_get_name crashes
2016-07-03 17:09:19 +02:00
73303b6c24
Merge branch 'pull-request/1945'
2016-07-03 12:33:27 +02:00
72ec312f23
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow)
2016-07-03 09:30:48 +08:00
6744737577
Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow)
2016-07-03 09:30:33 +08:00
dad2a3ef67
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
Fixed bug #72498 variant_date_from_timestamp null dereference
2016-07-01 18:45:02 +02:00
3455848dfe
Fixed bug #72498 variant_date_from_timestamp null dereference
2016-07-01 18:41:50 +02:00
acdafc0a27
Prevent inlining through call_user_func() and call_user_func_array()
2016-07-01 00:16:54 +03:00
f2e4fc307b
Fixed ext/opcache/tests/bug70207.phpt
2016-06-30 21:50:57 +03:00
David Walker