]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 16 Aug 2017 06:17:32 +0000 (09:17 +0300)]
Added few more jump threading optimisation patterns
Remi Collet [Wed, 16 Aug 2017 05:46:42 +0000 (07:46 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
cleanup
Remi Collet [Wed, 16 Aug 2017 05:46:23 +0000 (07:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
cleanup
Remi Collet [Wed, 16 Aug 2017 05:46:07 +0000 (07:46 +0200)]
cleanup
Derick Rethans [Tue, 15 Aug 2017 19:24:44 +0000 (20:24 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Derick Rethans [Tue, 15 Aug 2017 19:24:21 +0000 (20:24 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Tue, 15 Aug 2017 19:22:41 +0000 (20:22 +0100)]
Remove removed header files from configuration files.
Derick Rethans [Tue, 15 Aug 2017 14:07:24 +0000 (15:07 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Derick Rethans [Tue, 15 Aug 2017 14:06:18 +0000 (15:06 +0100)]
Merged PHP-7.0 by hand due to conflicts.
Derick Rethans [Tue, 15 Aug 2017 13:09:09 +0000 (14:09 +0100)]
Upgrade timelib to 2017.05beta7
Dmitry Stogov [Tue, 15 Aug 2017 11:46:18 +0000 (14:46 +0300)]
Fixed possible incorrect result of type verification.
Dmitry Stogov [Tue, 15 Aug 2017 10:13:27 +0000 (13:13 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Made test 32/64-bit independent
Dmitry Stogov [Tue, 15 Aug 2017 10:12:54 +0000 (13:12 +0300)]
Made test 32/64-bit independent
Dmitry Stogov [Tue, 15 Aug 2017 10:01:06 +0000 (13:01 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip 64-bit related test
Dmitry Stogov [Tue, 15 Aug 2017 10:00:45 +0000 (13:00 +0300)]
Skip 64-bit related test
Remi Collet [Tue, 15 Aug 2017 08:54:17 +0000 (08:54 +0000)]
Update NEWS for 7.2.0RC1
Remi Collet [Tue, 15 Aug 2017 08:39:24 +0000 (08:39 +0000)]
Update NEWS for PHP 7.2.0beta3
Anatol Belski [Tue, 15 Aug 2017 07:36:41 +0000 (09:36 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
move dev to 7.0.24
Anatol Belski [Tue, 15 Aug 2017 07:36:14 +0000 (09:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move dev to 7.0.24
Anatol Belski [Tue, 15 Aug 2017 07:33:30 +0000 (09:33 +0200)]
move dev to 7.0.24
Xinchen Hui [Tue, 15 Aug 2017 04:35:17 +0000 (12:35 +0800)]
Update NEWS
Xinchen Hui [Tue, 15 Aug 2017 04:35:10 +0000 (12:35 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #75075 (unpack with X* causes infinity loop)
Xinchen Hui [Tue, 15 Aug 2017 04:34:58 +0000 (12:34 +0800)]
Update NEWS
Xinchen Hui [Tue, 15 Aug 2017 04:34:37 +0000 (12:34 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75075 (unpack with X* causes infinity loop)
Xinchen Hui [Tue, 15 Aug 2017 04:34:13 +0000 (12:34 +0800)]
Fixed bug #75075 (unpack with X* causes infinity loop)
Tianfang Yang [Tue, 15 Aug 2017 01:22:17 +0000 (21:22 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
Tianfang Yang [Tue, 15 Aug 2017 01:21:11 +0000 (21:21 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Tianfang Yang [Tue, 15 Aug 2017 01:16:34 +0000 (21:16 -0400)]
Merge branch 'syncoci8' into PHP-7.0
Tianfang Yang [Tue, 15 Aug 2017 01:07:41 +0000 (21:07 -0400)]
Prepare for PECL release
Anatol Belski [Mon, 14 Aug 2017 12:40:26 +0000 (14:40 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Test cleanup improvements, files might be locked in the test process
Anatol Belski [Mon, 14 Aug 2017 12:39:58 +0000 (14:39 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Test cleanup improvements, files might be locked in the test process
Anatol Belski [Mon, 14 Aug 2017 11:08:04 +0000 (13:08 +0200)]
Test cleanup improvements, files might be locked in the test process
Anatol Belski [Mon, 14 Aug 2017 10:56:49 +0000 (12:56 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix test cleanup
Anatol Belski [Mon, 14 Aug 2017 10:55:58 +0000 (12:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test cleanup
Anatol Belski [Mon, 14 Aug 2017 10:55:14 +0000 (12:55 +0200)]
fix test cleanup
Dmitry Stogov [Mon, 14 Aug 2017 10:54:52 +0000 (13:54 +0300)]
Fixed removing dead live ranges
Anatol Belski [Mon, 14 Aug 2017 10:24:51 +0000 (12:24 +0200)]
[ci skip] update NEWS
Anatol Belski [Mon, 14 Aug 2017 10:24:20 +0000 (12:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Anatol Belski [Mon, 14 Aug 2017 10:23:51 +0000 (12:23 +0200)]
[ci skip] update NEWS
Dmitry Stogov [Mon, 14 Aug 2017 09:37:37 +0000 (12:37 +0300)]
Fixed test
Dmitry Stogov [Mon, 14 Aug 2017 09:21:07 +0000 (12:21 +0300)]
Order live ranges according to "start" position
Dmitry Stogov [Mon, 14 Aug 2017 09:11:25 +0000 (12:11 +0300)]
Fixed attempt to free invalid structure (result of ROPE_INIT is not a zval)
Dmitry Stogov [Mon, 14 Aug 2017 09:00:30 +0000 (12:00 +0300)]
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:php-src:
Revert "Fixed live_range removing (bug can be triggred by JIT)"
Dmitry Stogov [Mon, 14 Aug 2017 09:00:02 +0000 (12:00 +0300)]
Revert "Fixed live_range removing (bug can be triggred by JIT)"
This reverts commit
aecf9965100e704339ccc33da6a31eca84c2d926 .
Xinchen Hui [Mon, 14 Aug 2017 08:59:01 +0000 (16:59 +0800)]
Revert "Fixed live_range removing (bug can be triggred by JIT)"
This reverts commit
aecf9965100e704339ccc33da6a31eca84c2d926 .
Tianfang Yang [Mon, 14 Aug 2017 04:36:33 +0000 (00:36 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
Tianfang Yang [Mon, 14 Aug 2017 04:23:41 +0000 (00:23 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Tianfang Yang [Mon, 14 Aug 2017 03:44:24 +0000 (23:44 -0400)]
Sync OCI8 on PHP 7.x branches
Anatol Belski [Sun, 13 Aug 2017 22:51:47 +0000 (00:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75063
Anatol Belski [Sun, 13 Aug 2017 22:44:19 +0000 (00:44 +0200)]
Fixed bug #75063
Christoph M. Becker [Sun, 13 Aug 2017 19:05:18 +0000 (21:05 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #73793 (WDDX uses wrong decimal seperator)
Christoph M. Becker [Sun, 13 Aug 2017 18:53:32 +0000 (20:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73793 (WDDX uses wrong decimal seperator)
Christoph M. Becker [Sun, 13 Aug 2017 18:51:53 +0000 (20:51 +0200)]
Fixed bug #73793 (WDDX uses wrong decimal seperator)
The WDDX specification[1] requires to serialize floats with a decimal
point, but `snprintf()` is locale-dependent and may use a decimal
comma. We fix that afterwards by replacing an eventual comma with a
point.
[1] <http://xml.coverpages.org/wddx0090-dtd-
19980928 .txt>
Christoph M. Becker [Sun, 13 Aug 2017 16:10:37 +0000 (18:10 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip this test if ext/session is not available
Christoph M. Becker [Sun, 13 Aug 2017 16:07:42 +0000 (18:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip this test if ext/session is not available
Christoph M. Becker [Sun, 13 Aug 2017 16:05:45 +0000 (18:05 +0200)]
Skip this test if ext/session is not available
Nikita Popov [Sat, 12 Aug 2017 18:34:44 +0000 (20:34 +0200)]
Note deprecation of $errcontext
Nikita Popov [Sat, 12 Aug 2017 11:17:24 +0000 (13:17 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 12 Aug 2017 11:15:48 +0000 (13:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 12 Aug 2017 11:00:39 +0000 (13:00 +0200)]
Fixed bug #74103 and bug #75054
Directly fail unserialization when trying to acquire an r/R
reference to an UNDEF HT slot. Previously this left an UNDEF and
later deleted the index/key from the HT.
What actually caused the issue here is a combination of two
factors: First, the key deletion was performed using the hash API,
rather than the symtable API, such that the element was not actually
removed if it used an integral string key. Second, a subsequent
deletion operation, while collecting trailing UNDEF ranges, would
mark the element as available for reuse (leaving a corrupted HT
state with nNumOfElemnts > nNumUsed).
Fix this by failing early and dropping the deletion code.
Andrea Faulds [Sat, 12 Aug 2017 00:38:21 +0000 (01:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Andrea Faulds [Sat, 12 Aug 2017 00:37:47 +0000 (01:37 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Sat, 12 Aug 2017 00:35:27 +0000 (01:35 +0100)]
Fix bug #74725 (html_errors=1 breaks unhandled exceptions)
Xinchen Hui [Fri, 11 Aug 2017 13:56:30 +0000 (21:56 +0800)]
Fixed live_range removing (bug can be triggred by JIT)
Jakub Zelenka [Thu, 10 Aug 2017 18:47:58 +0000 (19:47 +0100)]
Reset utf8_invalid in json scanner
Jakub Zelenka [Thu, 10 Aug 2017 18:40:02 +0000 (19:40 +0100)]
Fix possible overflow in json scanner utf8_invalid_count
Xinchen Hui [Thu, 10 Aug 2017 16:33:55 +0000 (00:33 +0800)]
Fixed type infer for FUNC_GET_ARGS
Xinchen Hui [Wed, 9 Aug 2017 03:29:54 +0000 (11:29 +0800)]
Update NEWs
Xinchen Hui [Wed, 9 Aug 2017 03:29:46 +0000 (11:29 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
Xinchen Hui [Wed, 9 Aug 2017 03:29:32 +0000 (11:29 +0800)]
Update NEWS
Xinchen Hui [Wed, 9 Aug 2017 03:29:13 +0000 (11:29 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
Xinchen Hui [Wed, 9 Aug 2017 03:28:53 +0000 (11:28 +0800)]
Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
Anatol Belski [Tue, 8 Aug 2017 17:40:42 +0000 (19:40 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove mistakingly added line
Anatol Belski [Tue, 8 Aug 2017 17:40:28 +0000 (19:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove mistakingly added line
Anatol Belski [Tue, 8 Aug 2017 17:37:55 +0000 (19:37 +0200)]
Remove mistakingly added line
Anatol Belski [Tue, 8 Aug 2017 15:59:44 +0000 (17:59 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync makefile options for phpize
Anatol Belski [Tue, 8 Aug 2017 15:59:15 +0000 (17:59 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync makefile options for phpize
Anatol Belski [Tue, 8 Aug 2017 15:58:10 +0000 (17:58 +0200)]
Sync makefile options for phpize
- run target
- debugger mode
Frank Denis [Tue, 8 Aug 2017 15:50:17 +0000 (17:50 +0200)]
sodium ext: Use _ietf_ vs _IETF_ consistently
Frank Denis [Tue, 8 Aug 2017 15:42:38 +0000 (17:42 +0200)]
sodium ext: No need for #ifdef crypto_aead_chacha20poly1305_IETF_
chacha20poly1305_ietf was implemented in libsodium 1.0.4 which is way earlier
than the minimum version we support.
Frank Denis [Tue, 8 Aug 2017 15:38:13 +0000 (17:38 +0200)]
Sodium ext: Isolate a return statement for consistency
Frank Denis [Tue, 8 Aug 2017 15:37:06 +0000 (17:37 +0200)]
sodium ext: The default password hashing function is not supposed to be Argon2i
Frank Denis [Tue, 8 Aug 2017 15:36:06 +0000 (17:36 +0200)]
sodium ext: long -> zend_long
Frank Denis [Tue, 8 Aug 2017 15:34:20 +0000 (17:34 +0200)]
sodium ext: Add missing "return" statements after zend_throw_exception()
Darek Slusarczyk [Tue, 8 Aug 2017 14:08:19 +0000 (16:08 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
# Conflicts:
# ext/json/config.w32
Darek Slusarczyk [Tue, 8 Aug 2017 14:05:13 +0000 (16:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Darek Slusarczyk [Tue, 8 Aug 2017 13:52:53 +0000 (15:52 +0200)]
JSON: fix config.w32 / Install headers on windows
Andrey Hristov [Tue, 8 Aug 2017 11:57:01 +0000 (14:57 +0300)]
Add new enum options defined in MySQL 5.7
Anatol Belski [Mon, 7 Aug 2017 15:04:15 +0000 (17:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Unify EOL
Anatol Belski [Mon, 7 Aug 2017 15:03:54 +0000 (17:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Unify EOL
Anatol Belski [Mon, 7 Aug 2017 15:03:04 +0000 (17:03 +0200)]
Unify EOL
Anatol Belski [Mon, 7 Aug 2017 14:45:57 +0000 (16:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix test target for phpize
Anatol Belski [Mon, 7 Aug 2017 14:45:41 +0000 (16:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test target for phpize
Anatol Belski [Mon, 7 Aug 2017 14:45:02 +0000 (16:45 +0200)]
fix test target for phpize
Jakub Zelenka [Sun, 6 Aug 2017 16:20:31 +0000 (17:20 +0100)]
Fix segfault in json ignoring of invalid UTF8
Nikita Popov [Fri, 4 Aug 2017 20:17:34 +0000 (22:17 +0200)]
Check for empty string in mb_ord()
Côme Chilliet [Thu, 27 Jul 2017 07:45:37 +0000 (09:45 +0200)]
Added controls parameters to ldap_exop so that control support can be added later
Remi Collet [Fri, 4 Aug 2017 11:28:48 +0000 (13:28 +0200)]
win32 for pdo_sqlite
Remi Collet [Fri, 4 Aug 2017 11:21:54 +0000 (13:21 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
use AC_DEFINE + win32
Remi Collet [Fri, 4 Aug 2017 11:21:41 +0000 (13:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
use AC_DEFINE + win32