1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

100836 Commits

Author SHA1 Message Date
Joe Watkins f2eeb47797 Revert "Merge branch 'PHP-7.1'"
This reverts commit 7eac2fdf53, reversing
changes made to 15b80f105c.
2017-01-01 06:53:29 +00:00
Joe Watkins a9aefe5b9b add news entry for PR #2263 2017-01-01 06:50:37 +00:00
Joe Watkins 7eac2fdf53 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix dom class can't be inherited by the internal class
2017-01-01 06:48:24 +00:00
dreamszhu 705f60e481 Fix dom class can't be inherited by the internal class 2017-01-01 06:48:02 +00:00
Joe Watkins 15b80f105c Merge branch 'pull-request/2261'
* pull-request/2261:
  Add PHPAPI php_session_flush and php_session_destroy
2017-01-01 06:44:14 +00:00
dreamszhu e10425fe8b Add PHPAPI php_session_flush and php_session_destroy 2017-01-01 07:30:22 +08:00
Sara Golemon 61a43195f5 Use new param API in pdo_sqlite 2016-12-31 09:01:20 -08:00
Sara Golemon 8bbfe174a8 Use new param API in tokenizer 2016-12-31 09:01:20 -08:00
Sara Golemon bf422c56ab Use new param API in PDO 2016-12-31 09:01:15 -08:00
Sara Golemon a470a8c0a0 Use new param API in libxml 2016-12-31 08:38:14 -08:00
Sara Golemon 6007eb7584 Use new param API in json 2016-12-31 08:35:07 -08:00
Joe Watkins ae1ecf1173 Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
  Fix bug #73847
2016-12-31 13:55:17 +00:00
Joe Watkins 890ae17fb0 Merge branch 'pull-request/2260'
* pull-request/2260:
  Add PHPAPI for session class entry and related entries
2016-12-31 13:54:54 +00:00
Nikita Popov b767370496 Merge branch 'PHP-7.1' 2016-12-31 13:34:09 +01:00
Nikita Popov 242d924e59 Fix bug #73847 2016-12-31 13:33:21 +01:00
dreamszhu f7f32ba422 Add PHPAPI for session class entry 2016-12-31 18:03:58 +08:00
Joe Watkins e95afee191 Merge branch 'pull-request/2264'
* pull-request/2264:
  Fix header_remove function, the name parameter is optional
2016-12-31 08:35:50 +00:00
Mitch Hagstrand 32ab889ea4 Fix header_remove function, the name parameter is optional 2016-12-30 19:13:46 -08:00
Sara Golemon 07959c1cae Use new param API in standard 2016-12-30 18:28:54 -08:00
Sara Golemon 2ea5b64d9a Use new param API in standard/file 2016-12-30 18:07:35 -08:00
Sara Golemon a23f08a33c Use new param API in standard 2016-12-30 17:28:55 -08:00
Sara Golemon 331dcf08df Use new param API in standard/string 2016-12-30 16:40:45 -08:00
Sara Golemon 5c919ee30b Use new param API in standard/basic_functions 2016-12-30 16:13:14 -08:00
Sara Golemon b71b12843c Use new param API in standard 2016-12-30 13:36:51 -08:00
Sara Golemon 625304fa76 Use new param API in standard 2016-12-30 13:17:52 -08:00
Sara Golemon c714152e58 Use new param API in standard/math 2016-12-30 13:02:59 -08:00
Sara Golemon 6f3945a9f1 Use new param API in standard 2016-12-30 12:56:21 -08:00
Adam Harvey c9a42b58a7 Merge branch 'PHP-7.1'
* PHP-7.1:
  Document the changes to lexical scoping in 7.1.
2016-12-30 11:42:12 -08:00
Adam Harvey eb25e14962 Document the changes to lexical scoping in 7.1.
Fixes bug #73844 (Cannot use lexical variable $variable as a parameter
name inside array_walk()).
2016-12-30 11:39:45 -08:00
Sara Golemon 1b0edb3c6c Use new param API in standard/array 2016-12-30 10:35:45 -08:00
Sara Golemon 54c13295a6 Use new param API in standard 2016-12-30 09:12:17 -08:00
Christoph M. Becker c5cc583473 Merge branch 'PHP-7.1'
* PHP-7.1:
  Update UPGRADING wrt. bug #72785
2016-12-30 14:18:31 +01:00
Christoph M. Becker f5bf19ee3a Update UPGRADING wrt. bug #72785 2016-12-30 14:17:38 +01:00
Sara Golemon 523afbf63f Use new param API in standard/streamsfuncs 2016-12-29 21:28:38 -08:00
Sara Golemon 85e88d1d6e Use new params API for throwable constructors in date 2016-12-29 18:26:27 -08:00
Sara Golemon 52db03b3e5 Support ZEND_PARSE_PARAMS_THROW in new ZPP API 2016-12-29 18:26:19 -08:00
Nikita Popov 78132cc424 Merge branch 'PHP-7.1' 2016-12-29 22:07:03 +01:00
Nikita Popov 2497ae031b Don't check for precise length in ecc.phpt
Again, this can be off by one.
2016-12-29 22:05:38 +01:00
Nikita Popov d719ac929e Merge branch 'PHP-7.1' 2016-12-29 21:41:28 +01:00
Nikita Popov 12922f2a58 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-29 21:41:21 +01:00
Nikita Popov 432660f73f Another try at making concat_003 more reliable
Use array_fill() for the array population loop -- this isn't the
part that is being tested and on PHP 7.0 w/o opcache this duplicates
the inner array a lot.
2016-12-29 21:39:40 +01:00
Nikita Popov 270f1ffd19 Merge branch 'PHP-7.1' 2016-12-29 21:18:58 +01:00
David Walker b09c2f899e Fixed bug #73783
Bug #73783 raises an issue with signal handling when using SIG_IGN.
With PHP7.1 ZEND_SIGNALS is defaulted to on, which will for all
signals set the handler as zend_signal_handler_defer.  This is
problematic for syscalls like sleep(), which will only return when the
requisite number of seconds have elapsed, or, a non-ignored signal is
raised.  In this case we want to SIG_IGN SIGCHLD, however, SIG_IGN is
only stored in the SIGG(handlers) array, and the actual system level
handler is defined.  This prevents proper signal ignoring when requeted.
2016-12-29 21:18:22 +01:00
Nikita Popov 30029d137f Merge branch 'PHP-7.1' 2016-12-29 21:00:34 +01:00
Nikita Popov 7746ed9d5f Merge branch 'PHP-7.0' into PHP-7.1 2016-12-29 21:00:14 +01:00
Nikita Popov 78675ebd9a Fix flaky openssl_pkey_new test
Public key size may vary by one bit... switch to using %d for
key sizes.
2016-12-29 20:59:28 +01:00
Mitch Hagstrand d0fcc74110 Make Opcache tests using the cli server more reliable
Same fix already applied to ext/curl/tests/server.inc
and sapi/cli/tests/php_cli_server.inc

1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
2016-12-29 20:56:45 +01:00
Christoph M. Becker 60b4e312ae Merge branch 'PHP-7.1'
* PHP-7.1:
  Revert "Fix #73530: Unsetting result set may reset other result set"
2016-12-29 13:58:14 +01:00
Christoph M. Becker f4d884dc6e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Revert "Fix #73530: Unsetting result set may reset other result set"
2016-12-29 13:54:11 +01:00
Christoph M. Becker 88d1a2c5aa Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Revert "Fix #73530: Unsetting result set may reset other result set"

# Conflicts:
#	ext/sqlite3/sqlite3.c
2016-12-29 13:47:28 +01:00