]>
granicus.if.org Git - php/log
Joe Watkins [Wed, 16 Aug 2017 15:41:15 +0000 (16:41 +0100)]
bump versions
Derick Rethans [Wed, 16 Aug 2017 14:20:45 +0000 (15:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Wed, 16 Aug 2017 14:19:18 +0000 (15:19 +0100)]
Revert "Upgrade timelib to 2017.05beta7"
This reverts commit
bdd56f31078bf1f34341943603cf6aaa72e0db5c .
Derick Rethans [Wed, 16 Aug 2017 14:19:11 +0000 (15:19 +0100)]
Revert "Remove removed header files from configuration files."
This reverts commit
3df753c6ca3ebc95dc0e837b2d4dc20753b5aea2 .
Derick Rethans [Wed, 16 Aug 2017 10:14:47 +0000 (11:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Wed, 16 Aug 2017 10:14:41 +0000 (11:14 +0100)]
Fixed stupid test
Derick Rethans [Wed, 16 Aug 2017 08:51:28 +0000 (09:51 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Wed, 16 Aug 2017 08:51:21 +0000 (09:51 +0100)]
Added timelib version to phpinfo()
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: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: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 10:12:54 +0000 (13:12 +0300)]
Made test 32/64-bit independent
Dmitry Stogov [Tue, 15 Aug 2017 10:00:45 +0000 (13:00 +0300)]
Skip 64-bit related test
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: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: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: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: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
Anatol Belski [Mon, 14 Aug 2017 10:23:51 +0000 (12:23 +0200)]
[ci skip] update NEWS
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:44:19 +0000 (00:44 +0200)]
Fixed bug #75063
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: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 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: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 [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: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: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
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
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: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
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
Remi Collet [Fri, 4 Aug 2017 11:21:28 +0000 (13:21 +0200)]
use AC_DEFINE + win32
Anatol Belski [Thu, 3 Aug 2017 13:07:47 +0000 (15:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Increase expected timing on Travis
Anatol Belski [Thu, 3 Aug 2017 13:05:22 +0000 (15:05 +0200)]
Increase expected timing on Travis
If 5ms to read/write 8 bytes still has issue, probably next this test
should skip on Travis to avoid false positive fails.
Anatol Belski [Wed, 2 Aug 2017 19:50:26 +0000 (21:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Wed, 2 Aug 2017 19:49:56 +0000 (21:49 +0200)]
[ci skip] update NEWS
Anatol Belski [Wed, 2 Aug 2017 19:49:21 +0000 (21:49 +0200)]
update NEWS
Nikita Popov [Wed, 2 Aug 2017 16:49:48 +0000 (18:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Andreas Treichel [Sun, 23 Jul 2017 03:29:18 +0000 (05:29 +0200)]
Bug #74975: Different serialization for classes
Nikita Popov [Wed, 2 Aug 2017 16:16:56 +0000 (18:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 2 Aug 2017 16:16:18 +0000 (18:16 +0200)]
Merge remote-tracking branch 'php-src/PHP-7.0' into PHP-7.0
Nikita Popov [Wed, 2 Aug 2017 16:08:58 +0000 (18:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Fabien Villepinte [Fri, 28 Jul 2017 11:41:09 +0000 (13:41 +0200)]
Fix Bug #75001: Wrong reflection on mb_eregi_replace
Fabien Villepinte [Fri, 28 Jul 2017 12:38:51 +0000 (14:38 +0200)]
Fix test transliterator_create_inverse_basic.phpt
George Wang [Wed, 2 Aug 2017 15:59:41 +0000 (11:59 -0400)]
take care of compile warnings.
Anatol Belski [Wed, 2 Aug 2017 14:41:48 +0000 (16:41 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75002 Null Pointer Dereference in timelib_time_clone
Derick Rethans [Wed, 2 Aug 2017 14:40:48 +0000 (16:40 +0200)]
Fixed bug #75002 Null Pointer Dereference in timelib_time_clone
Remi Collet [Wed, 2 Aug 2017 12:03:02 +0000 (14:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix build with old system libsqlite (sqlite3_errstr may be missing)
Remi Collet [Wed, 2 Aug 2017 12:01:56 +0000 (14:01 +0200)]
fix build with old system libsqlite (sqlite3_errstr may be missing)
Joe Watkins [Wed, 2 Aug 2017 07:35:38 +0000 (08:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fixed #endif comments
clwu [Wed, 2 Aug 2017 02:49:10 +0000 (10:49 +0800)]
fixed #endif comments
Julien Pauli [Tue, 1 Aug 2017 14:02:26 +0000 (16:02 +0200)]
Updated NEWS
Julien Pauli [Tue, 1 Aug 2017 14:02:00 +0000 (16:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Updated NEWS
Fix #75015. Crash in SPL destructors
Julien Pauli [Tue, 1 Aug 2017 14:01:43 +0000 (16:01 +0200)]
Updated NEWS
Julien Pauli [Tue, 1 Aug 2017 10:59:19 +0000 (12:59 +0200)]
Fix #75015. Crash in SPL destructors
Anatol Belski [Tue, 1 Aug 2017 10:50:52 +0000 (12:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Test to cover the change in
ce1a0d97
Anatol Belski [Tue, 1 Aug 2017 10:49:45 +0000 (12:49 +0200)]
Test to cover the change in
ce1a0d97
Anatol Belski [Sun, 30 Jul 2017 15:51:27 +0000 (17:51 +0200)]
remove dup of the binary file, rely on a test runtime copy instead
Christoph M. Becker [Sun, 30 Jul 2017 14:27:38 +0000 (16:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Shrink another large image
Christoph M. Becker [Sun, 30 Jul 2017 14:24:40 +0000 (16:24 +0200)]
Shrink another large image
This image is only used for testing `BITMAPV5HEADER` support in
`getimagesize()` (see
bf9ad4e ). Therefore it is not necessary to have
a big image; a single pixel is sufficient.
Christoph M. Becker [Sun, 30 Jul 2017 12:44:52 +0000 (14:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Shrink test image
Christoph M. Becker [Sun, 30 Jul 2017 12:43:37 +0000 (14:43 +0200)]
Shrink test image
The last (`IDAT`) chunk in this file starting at `0x5e265` reports to
have a length of `0x2000` bytes, but there are only `0x1D9B` bytes
left. Simply cutting the first `IDAT` chunk which starts at `0x31` and
also reports a length of `0x2000` at the same offset should produce the
same test results (while reducing the file size to 7.628 bytes).
Christoph M. Becker [Sun, 30 Jul 2017 11:30:18 +0000 (13:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip this test if ext/gd is not available
Christoph M. Becker [Sun, 30 Jul 2017 11:24:10 +0000 (13:24 +0200)]
Skip this test if ext/gd is not available
Nikita Popov [Fri, 28 Jul 2017 11:02:52 +0000 (13:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 28 Jul 2017 11:02:25 +0000 (13:02 +0200)]
Fixed bug #62934
Anatol Belski [Thu, 27 Jul 2017 22:27:52 +0000 (00:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
relax test on travis
Anatol Belski [Thu, 27 Jul 2017 22:27:11 +0000 (00:27 +0200)]
relax test on travis
Sara Golemon [Thu, 27 Jul 2017 14:04:14 +0000 (10:04 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Simpler fix for #74974
Pedro Magalhães [Sun, 23 Jul 2017 12:41:50 +0000 (14:41 +0200)]
Simpler fix for #74974
Xinchen Hui [Thu, 27 Jul 2017 04:50:28 +0000 (12:50 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed test
Xinchen Hui [Thu, 27 Jul 2017 04:50:17 +0000 (12:50 +0800)]
Fixed test
Xinchen Hui [Thu, 27 Jul 2017 03:23:52 +0000 (11:23 +0800)]
Update NEWS
Xinchen Hui [Thu, 27 Jul 2017 03:23:27 +0000 (11:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74949 (null pointer dereference in _function_string)
Xinchen Hui [Thu, 27 Jul 2017 03:23:06 +0000 (11:23 +0800)]
Fixed bug #74949 (null pointer dereference in _function_string)
Sara Golemon [Wed, 26 Jul 2017 22:55:46 +0000 (18:55 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
Sara Golemon [Wed, 26 Jul 2017 21:59:29 +0000 (17:59 -0400)]
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods