]>
granicus.if.org Git - php/log
Anatol Belski [Mon, 28 Aug 2017 11:14:08 +0000 (13:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to next bin SDK version for AppVeyor
Anatol Belski [Mon, 28 Aug 2017 11:12:51 +0000 (13:12 +0200)]
Move to next bin SDK version for AppVeyor
Christoph M. Becker [Sun, 27 Aug 2017 11:54:12 +0000 (13:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75124 (gdImageGrayScale() may produce colors)
Christoph M. Becker [Sun, 27 Aug 2017 11:53:39 +0000 (13:53 +0200)]
Fixed bug #75124 (gdImageGrayScale() may produce colors)
We have to make sure to avoid alpha-blending issues by explicitly
switching to `gdEffectReplace` and to restore the old value afterwards.
This is a port of <https://github.com/libgd/libgd/commit/
a7a7ece >.
Nikita Popov [Fri, 25 Aug 2017 20:02:49 +0000 (22:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Thomas Punt [Wed, 23 Aug 2017 22:35:18 +0000 (23:35 +0100)]
Fixed bug #75090
Anatol Belski [Fri, 25 Aug 2017 09:28:54 +0000 (11:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs versions
Anatol Belski [Fri, 25 Aug 2017 09:28:12 +0000 (11:28 +0200)]
update libs versions
Remi Collet [Thu, 24 Aug 2017 08:29:44 +0000 (10:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
From documentation, only the sign of returned value is relevant
Remi Collet [Thu, 24 Aug 2017 08:27:38 +0000 (10:27 +0200)]
From documentation, only the sign of returned value is relevant
With recent glibc, memcmp sometime return a negative value instead of -1
Tianfang Yang [Tue, 22 Aug 2017 05:43:07 +0000 (01:43 -0400)]
Update NEWS
Tianfang Yang [Tue, 22 Aug 2017 05:39:55 +0000 (01:39 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
Tianfang Yang [Tue, 22 Aug 2017 05:10:58 +0000 (01:10 -0400)]
Merge branch 'pull-request/2534' into PHP-7.0
* pull-request/2534:
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
Ingmar Runge [Mon, 22 May 2017 14:21:59 +0000 (16:21 +0200)]
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
Andrea Faulds [Sat, 19 Aug 2017 19:35:22 +0000 (20:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Sat, 19 Aug 2017 19:31:54 +0000 (20:31 +0100)]
Fixed bug #75097 (gethostname fails if your host name is 64 chars long)
PHP contained two different off-by-one errors, which are fixed here. First,
it created a buffer of size HOST_NAME_MAX, not adding space for a null
terminator. Second, it subtracted 1 from the size of that buffer when passing
its size to gethostname(), despite gethostname() expecting it to be a buffer
size including space for a terminating null byte, not a string length.
Anatol Belski [Sat, 19 Aug 2017 00:41:07 +0000 (02:41 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Sat, 19 Aug 2017 00:40:50 +0000 (02:40 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 19 Aug 2017 00:40:17 +0000 (02:40 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 19 Aug 2017 00:01:03 +0000 (02:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix issues with phpt and EXTENSION on windows (BUG 75042)
John Boehr [Sun, 6 Aug 2017 22:04:36 +0000 (15:04 -0700)]
Fix issues with phpt and EXTENSION on windows (BUG 75042)
* Commands are not properly escaped for windows
* Specifying "-n" to check loaded modules causes "Module already loaded"
warning
* Extensions to be loaded need the "php_" prefix on Windows
Bug: https://bugs.php.net/bug.php?id=75042
Add back -n flag to fetch loaded extensions in run-tests.php
Add test for phpt EXTENSIONS directive
Add a second test for bug 75042
Add test to test loading of nonexistent shared module
with the EXTENSIONS phpt block
Pass ini settings when checking loaded extensions
Fix skipifs
Anatol Belski [Fri, 18 Aug 2017 22:31:55 +0000 (00:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix .pgd name for ts build
Anatol Belski [Fri, 18 Aug 2017 22:31:04 +0000 (00:31 +0200)]
Fix .pgd name for ts build
Remi Collet [Fri, 18 Aug 2017 12:52:30 +0000 (14:52 +0200)]
NEWS
Remi Collet [Fri, 18 Aug 2017 12:52:22 +0000 (14:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fixed bug #75093 OpenSSL support not detected
Remi Collet [Fri, 18 Aug 2017 12:52:11 +0000 (14:52 +0200)]
NEWS
Remi Collet [Fri, 18 Aug 2017 12:51:44 +0000 (14:51 +0200)]
Fixed bug #75093 OpenSSL support not detected
Anatol Belski [Fri, 18 Aug 2017 10:06:07 +0000 (12:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix phpize exit status
Anatol Belski [Fri, 18 Aug 2017 09:54:56 +0000 (11:54 +0200)]
Fix phpize exit status
Configure and others are generated, not copied. Seems there's yet much
more to do wrt exit status catching.
Anatol Belski [Fri, 18 Aug 2017 09:09:59 +0000 (11:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add dump env target
Anatol Belski [Fri, 18 Aug 2017 09:08:27 +0000 (11:08 +0200)]
Add dump env target
Joe Watkins [Wed, 16 Aug 2017 15:41:48 +0000 (16:41 +0100)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Do the revert properly, and put back fraction support in 7.1
Joe Watkins [Wed, 16 Aug 2017 15:41:15 +0000 (16:41 +0100)]
bump versions
Derick Rethans [Wed, 16 Aug 2017 14:59:56 +0000 (15:59 +0100)]
Do the revert properly, and put back fraction support in 7.1
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