]>
granicus.if.org Git - php/log
Anatol Belski [Thu, 24 Aug 2017 15:15:36 +0000 (17:15 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Switch to non deprecated PGO options
Anatol Belski [Thu, 24 Aug 2017 15:14:24 +0000 (17:14 +0200)]
Switch to non deprecated PGO options
Frank Denis [Thu, 24 Aug 2017 14:18:02 +0000 (16:18 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
sodium ext: if it's a length, call it "length"!
Frank Denis [Thu, 24 Aug 2017 14:17:41 +0000 (16:17 +0200)]
sodium ext: if it's a length, call it "length"!
Frank Denis [Thu, 24 Aug 2017 14:14:27 +0000 (16:14 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
sodium ext: add bindings for sodium_pad() and sodium_unpad()
Frank Denis [Thu, 24 Aug 2017 14:12:18 +0000 (16:12 +0200)]
sodium ext: add bindings for sodium_pad() and sodium_unpad()
Christoph M. Becker [Thu, 24 Aug 2017 12:07:50 +0000 (14:07 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image)
Christoph M. Becker [Thu, 24 Aug 2017 10:39:45 +0000 (12:39 +0200)]
Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image)
Crafted BMP images can cause dynamicSeek() to be called with a negative
position which must not be allowed, since dynamicSeek() works like
fseek() in SEEK_SET mode. We solve this by bailing out if `pos` is
negative, and let the image reading fail gracefully.
Frank Denis [Thu, 24 Aug 2017 09:01:34 +0000 (11:01 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
sodium ext: restore sodium_remove_param_values_from_backtrace() call
sodium ext: sync sodium_crypto_kdf_derive_from_key() with the standalone ext
Frank Denis [Thu, 24 Aug 2017 09:01:08 +0000 (11:01 +0200)]
sodium ext: restore sodium_remove_param_values_from_backtrace() call
Frank Denis [Thu, 24 Aug 2017 08:59:02 +0000 (10:59 +0200)]
sodium ext: sync sodium_crypto_kdf_derive_from_key() with the standalone ext
Use libsodium's native function if available, use correct constant names
in error messages
Frank Denis [Thu, 24 Aug 2017 08:51:25 +0000 (10:51 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
sodium ext: Constants were renamed SODIUM_* Adjust error messages accordingly.
Frank Denis [Thu, 24 Aug 2017 08:50:34 +0000 (10:50 +0200)]
sodium ext: Constants were renamed SODIUM_*
Adjust error messages accordingly.
Remi Collet [Thu, 24 Aug 2017 08:30:22 +0000 (10:30 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
From documentation, only the sign of returned value is relevant
Remi Collet [Thu, 24 Aug 2017 08:30:06 +0000 (10:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
From documentation, only the sign of returned value is relevant
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
Kalle Sommer Nielsen [Thu, 24 Aug 2017 06:59:52 +0000 (08:59 +0200)]
Jani is not a member of the QA team anymore, and have not been for years
Kalle Sommer Nielsen [Thu, 24 Aug 2017 00:31:52 +0000 (02:31 +0200)]
Kill compiler warnings in ext/phar
Kalle Sommer Nielsen [Wed, 23 Aug 2017 23:36:14 +0000 (01:36 +0200)]
Kill compiler warnings in ext/standard
Kalle Sommer Nielsen [Wed, 23 Aug 2017 23:09:16 +0000 (01:09 +0200)]
Kill compiler warnings in ext/xml
Kalle Sommer Nielsen [Wed, 23 Aug 2017 23:05:26 +0000 (01:05 +0200)]
Kill compiler warnings in ext/hash
Kalle Sommer Nielsen [Wed, 23 Aug 2017 23:00:33 +0000 (01:00 +0200)]
Kill a compiler warning in ext/mysqlnd
Kalle Sommer Nielsen [Wed, 23 Aug 2017 22:52:48 +0000 (00:52 +0200)]
Kill compiler warnings in ext/com_dotnet
Kalle Sommer Nielsen [Wed, 23 Aug 2017 22:44:29 +0000 (00:44 +0200)]
Kill a compiler warning
Fabien Potencier [Wed, 23 Aug 2017 17:48:11 +0000 (10:48 -0700)]
Fixed typo in FPM error message
Thomas Punt [Tue, 22 Aug 2017 12:32:47 +0000 (13:32 +0100)]
Use ZEND_HASH_APPLY_SHIFT macro instead of hard-coded literal
Sara Golemon [Wed, 23 Aug 2017 18:44:36 +0000 (14:44 -0400)]
Consolidate Valgrind logic into a single var and class
Sara Golemon [Wed, 23 Aug 2017 18:08:43 +0000 (14:08 -0400)]
constify some vars that are never changed once set
Dmitry Stogov [Tue, 22 Aug 2017 13:55:03 +0000 (16:55 +0300)]
Initial implementation of Escape Analysis (disabled yet).
Remi Collet [Tue, 22 Aug 2017 10:55:29 +0000 (12:55 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
timelib now have a function for this, use it
Remi Collet [Tue, 22 Aug 2017 10:55:13 +0000 (12:55 +0200)]
timelib now have a function for this, use it
Frank Denis [Tue, 22 Aug 2017 07:47:51 +0000 (09:47 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
sodium ext: If sodium_init() returns 1, this is fine.
Frank Denis [Tue, 22 Aug 2017 07:39:01 +0000 (09:39 +0200)]
sodium ext: If sodium_init() returns 1, this is fine.
We actually want to do this so that multiple extensions using libsodium
can be loaded simultaneously.
Tianfang Yang [Tue, 22 Aug 2017 05:52:48 +0000 (01:52 -0400)]
Update NEWS
Tianfang Yang [Tue, 22 Aug 2017 05:51:15 +0000 (01:51 -0400)]
Update NEWS
Tianfang Yang [Tue, 22 Aug 2017 05:46:36 +0000 (01:46 -0400)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
Tianfang Yang [Tue, 22 Aug 2017 05:44:20 +0000 (01:44 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
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)
Anatol Belski [Mon, 21 Aug 2017 17:38:44 +0000 (19:38 +0200)]
Correct default value in master
Anatol Belski [Mon, 21 Aug 2017 17:38:17 +0000 (19:38 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Correct default value
Anatol Belski [Mon, 21 Aug 2017 17:37:41 +0000 (19:37 +0200)]
Correct default value
Xinchen Hui [Mon, 21 Aug 2017 10:53:12 +0000 (18:53 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Attempt to fix unstable test
Xinchen Hui [Mon, 21 Aug 2017 10:51:03 +0000 (18:51 +0800)]
Attempt to fix unstable test
Xinchen Hui [Mon, 21 Aug 2017 08:35:35 +0000 (16:35 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed type-infer
Xinchen Hui [Mon, 21 Aug 2017 08:35:07 +0000 (16:35 +0800)]
Fixed type-infer
Andrea Faulds [Sat, 19 Aug 2017 20:09:54 +0000 (21:09 +0100)]
Merge branch 'PHP-7.2'
Andrea Faulds [Sat, 19 Aug 2017 20:09:18 +0000 (21:09 +0100)]
Retroactively correct NEWS omission
Andrea Faulds [Sat, 19 Aug 2017 19:38:51 +0000 (20:38 +0100)]
Merge branch 'PHP-7.2'
Andrea Faulds [Sat, 19 Aug 2017 19:38:02 +0000 (20:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
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 15:03:37 +0000 (17:03 +0200)]
Use wide char API for the event log
Christoph M. Becker [Sat, 19 Aug 2017 14:10:46 +0000 (16:10 +0200)]
Merge branch 'pull-request/2695'
* pull-request/2695:
Replace magic values with constants
Anatol Belski [Sat, 19 Aug 2017 14:04:10 +0000 (16:04 +0200)]
[ci skip] update NEWS
Jelle van der Waa [Fri, 11 Aug 2017 23:20:43 +0000 (01:20 +0200)]
openssl: add basic openssl_get_cert_locations test
Add a simple test for openssl_get_cert_locations, verifying the returned
array structure.
Thomas Punt [Tue, 15 Aug 2017 09:43:09 +0000 (10:43 +0100)]
Fix fast ZPP macro definition
Nikita Popov [Sat, 19 Aug 2017 13:19:12 +0000 (15:19 +0200)]
Merge branch 'PHP-7.2'
Sammy Kaye Powers [Thu, 17 Aug 2017 19:53:18 +0000 (14:53 -0500)]
Remove param values from backtrace in exception thrown from ZPP throw
Sammy Kaye Powers [Thu, 17 Aug 2017 19:45:46 +0000 (14:45 -0500)]
Change zend_parse_parameters() to zend_parse_parameters_throw() in ext/sodium
Andreas Treichel [Sat, 19 Aug 2017 12:28:22 +0000 (14:28 +0200)]
Replace magic values with constants
Anatol Belski [Sat, 19 Aug 2017 11:49:45 +0000 (13:49 +0200)]
Follow up on
ed9c16ad5def47d1c8ae2787f53dccfac893ce5f
The event log is not line based, passing the message as is here is just
fine. Otherwise we'd create multiple event log items with partial
messages.
Philip Prindeville [Thu, 10 Aug 2017 02:55:25 +0000 (20:55 -0600)]
Turn php_syslog() into wrapper for syslog and split lines
Xinchen Hui [Sat, 19 Aug 2017 10:56:18 +0000 (18:56 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed for RESOURCE too
Xinchen Hui [Sat, 19 Aug 2017 10:55:56 +0000 (18:55 +0800)]
Fixed for RESOURCE too
Xinchen Hui [Sat, 19 Aug 2017 10:51:34 +0000 (18:51 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed RC1 Hanlding
Xinchen Hui [Sat, 19 Aug 2017 10:51:17 +0000 (18:51 +0800)]
Fixed RC1 Hanlding
Xinchen Hui [Sat, 19 Aug 2017 10:48:31 +0000 (18:48 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed type-info for ZEND_FETCH_DIIM_UNSET
Xinchen Hui [Sat, 19 Aug 2017 10:48:10 +0000 (18:48 +0800)]
Fixed type-info for ZEND_FETCH_DIIM_UNSET
Anatol Belski [Sat, 19 Aug 2017 00:41:37 +0000 (02:41 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Sat, 19 Aug 2017 00:41:24 +0000 (02:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
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:02:13 +0000 (02:02 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix issues with phpt and EXTENSION on windows (BUG 75042)
Anatol Belski [Sat, 19 Aug 2017 00:01:23 +0000 (02:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix issues with phpt and EXTENSION on windows (BUG 75042)
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:32:25 +0000 (00:32 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix .pgd name for ts build
Anatol Belski [Fri, 18 Aug 2017 22:32:11 +0000 (00:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix .pgd name for ts build
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
Anatol Belski [Fri, 18 Aug 2017 17:41:27 +0000 (19:41 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] update NEWS
Anatol Belski [Fri, 18 Aug 2017 17:40:43 +0000 (19:40 +0200)]
[ci skip] update NEWS
Anatol Belski [Fri, 18 Aug 2017 15:40:26 +0000 (17:40 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix skipifs
Fix issues with phpt and EXTENSION on windows (BUG 75042)
Anatol Belski [Fri, 18 Aug 2017 15:38:16 +0000 (17:38 +0200)]
Fix skipifs
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
Remi Collet [Fri, 18 Aug 2017 12:53:05 +0000 (14:53 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
NEWS
NEWS
NEWS
Fixed bug #75093 OpenSSL support not detected
Remi Collet [Fri, 18 Aug 2017 12:52:58 +0000 (14:52 +0200)]
NEWS
Remi Collet [Fri, 18 Aug 2017 12:52:43 +0000 (14:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
NEWS
Fixed bug #75093 OpenSSL support not detected
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
Dmitry Stogov [Fri, 18 Aug 2017 11:57:31 +0000 (14:57 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #75089 (preg_grep() is not reporting PREG_BAD_UTF8_ERROR after first input string)
Dmitry Stogov [Fri, 18 Aug 2017 11:56:28 +0000 (14:56 +0300)]
Fixed bug #75089 (preg_grep() is not reporting PREG_BAD_UTF8_ERROR after first input string)
Anatol Belski [Fri, 18 Aug 2017 10:06:28 +0000 (12:06 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix phpize exit status