]>
granicus.if.org Git - php/log
Christoph M. Becker [Tue, 24 Oct 2017 15:09:14 +0000 (17:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #65148 (imagerotate may alter image dimensions)
Christoph M. Becker [Tue, 24 Oct 2017 12:42:03 +0000 (14:42 +0200)]
Fixed bug #65148 (imagerotate may alter image dimensions)
We apply the respective patches from external libgd, work around the
still missing `gdImageClone()`, and fix the special cased rotation
routines according to Pierre's patch
(https://gist.github.com/pierrejoye/
59d72385ed1888cf8894a7ed437235ae ).
We also cater to bug73272.phpt whose result obviously changes a bit.
Derick Rethans [Tue, 24 Oct 2017 13:55:48 +0000 (14:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Tue, 24 Oct 2017 13:55:13 +0000 (14:55 +0100)]
Update timezonemap.h, which needs to match the bundled TZ db
Anatol Belski [Tue, 24 Oct 2017 12:58:01 +0000 (14:58 +0200)]
Fix test
Anatol Belski [Tue, 24 Oct 2017 12:21:11 +0000 (14:21 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:19:45 +0000 (14:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:18:59 +0000 (14:18 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:17:21 +0000 (14:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:16:54 +0000 (14:16 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 24 Oct 2017 12:05:18 +0000 (14:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72535 arcfour encryption stream filter crashes php
Anatol Belski [Tue, 24 Oct 2017 12:04:08 +0000 (14:04 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72535 arcfour encryption stream filter crashes php
Anatol Belski [Tue, 24 Oct 2017 11:59:18 +0000 (13:59 +0200)]
Fixed bug #72535 arcfour encryption stream filter crashes php
Anatol Belski [Tue, 24 Oct 2017 11:44:03 +0000 (13:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Apply upstream patch for CVE-2016-1283
Anatol Belski [Tue, 24 Oct 2017 11:38:48 +0000 (13:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Apply upstream patch for CVE-2016-1283
Anatol Belski [Tue, 24 Oct 2017 09:28:17 +0000 (11:28 +0200)]
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Anatol Belski [Thu, 28 Sep 2017 13:40:49 +0000 (15:40 +0200)]
Apply upstream patch for CVE-2016-1283
Fix bug #75207, see also
https://bugzilla.redhat.com/show_bug.cgi?id=
1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636
(cherry picked from commit
d11fceab151cd0410645f81eb7444af4388470c3 )
Sara Golemon [Mon, 23 Oct 2017 18:56:10 +0000 (14:56 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS entry for pg_close() fix
Sara Golemon [Mon, 23 Oct 2017 18:55:32 +0000 (14:55 -0400)]
NEWS entry for pg_close() fix
Sara Golemon [Mon, 23 Oct 2017 18:44:28 +0000 (14:44 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix#75419 Fix clearing of default link during pg_close()
Sara Golemon [Mon, 23 Oct 2017 18:41:44 +0000 (14:41 -0400)]
Bugfix#75419 Fix clearing of default link during pg_close()
Derick Rethans [Mon, 23 Oct 2017 16:31:21 +0000 (17:31 +0100)]
Updated to version 2017.3 (2017c)
Derick Rethans [Mon, 23 Oct 2017 16:31:21 +0000 (17:31 +0100)]
Empty merge
Derick Rethans [Mon, 23 Oct 2017 16:31:20 +0000 (17:31 +0100)]
Updated to version 2017.3 (2017c)
Anatol Belski [Mon, 23 Oct 2017 13:40:05 +0000 (15:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix memory leak
Anatol Belski [Mon, 23 Oct 2017 13:26:08 +0000 (15:26 +0200)]
Fix memory leak
Anatol Belski [Mon, 23 Oct 2017 05:13:51 +0000 (07:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Renaming cache folder is not a solution, too. Disable cache for now.
Revert "Rename build cache folder and separate sdk"
Anatol Belski [Mon, 23 Oct 2017 05:13:00 +0000 (07:13 +0200)]
Renaming cache folder is not a solution, too. Disable cache for now.
Anatol Belski [Mon, 23 Oct 2017 05:12:33 +0000 (07:12 +0200)]
Revert "Rename build cache folder and separate sdk"
This reverts commit
58dd892156bc0a45a5b78316e8023fd2dc7cca4b .
Anatol Belski [Mon, 23 Oct 2017 05:09:35 +0000 (07:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Rename build cache folder and separate sdk
Revert "Invalidate the whole cache when .appveyor.yml was changed"
Anatol Belski [Mon, 23 Oct 2017 05:08:45 +0000 (07:08 +0200)]
Rename build cache folder and separate sdk
Anatol Belski [Mon, 23 Oct 2017 05:05:48 +0000 (07:05 +0200)]
Revert "Invalidate the whole cache when .appveyor.yml was changed"
This reverts commit
25d40602cb618cfe989b1d048ef38618a243f6ff .
Anatol Belski [Mon, 23 Oct 2017 05:01:43 +0000 (07:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Invalidate the whole cache when .appveyor.yml was changed
Anatol Belski [Mon, 23 Oct 2017 05:00:36 +0000 (07:00 +0200)]
Invalidate the whole cache when .appveyor.yml was changed
Jakub Zelenka [Sun, 22 Oct 2017 17:57:14 +0000 (18:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 22 Oct 2017 17:54:15 +0000 (18:54 +0100)]
Fix clean up for openssl_pkcs12_export_to_file_basic
Jelle van der Waa [Fri, 11 Aug 2017 23:46:34 +0000 (01:46 +0200)]
openssl: Fix openssl_pkcs12_export extracerts test
Fix the openssl_pkcs12_export testcase for extracerts, the 'extracerts'
option needs to be the key of the certificate value otherwise
openssl_pkcs12_export will ignore it.
Anatol Belski [Sat, 21 Oct 2017 15:24:15 +0000 (17:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
With ICU 58+, set the default restriction level to high
Anatol Belski [Sat, 21 Oct 2017 15:21:41 +0000 (17:21 +0200)]
With ICU 58+, set the default restriction level to high
Further experiments show, that CJK scripts should be ok. If there are
any issues, the moderate level can still be set later.
Anatol Belski [Sat, 21 Oct 2017 10:00:02 +0000 (12:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Reenable AppVeyor cache
Anatol Belski [Sat, 21 Oct 2017 09:59:22 +0000 (11:59 +0200)]
Reenable AppVeyor cache
Anatol Belski [Sat, 21 Oct 2017 08:52:22 +0000 (10:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Disable AppVeyor cache to unlock build
Anatol Belski [Sat, 21 Oct 2017 08:49:20 +0000 (10:49 +0200)]
Disable AppVeyor cache to unlock build
Anatol Belski [Sat, 21 Oct 2017 08:30:14 +0000 (10:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60
Anatol Belski [Sat, 21 Oct 2017 08:29:04 +0000 (10:29 +0200)]
Rework these new tests to match with diffs in ICU 58, 59 and upcoming 60
Anatol Belski [Fri, 20 Oct 2017 18:47:36 +0000 (20:47 +0200)]
[skip ci] Update NEWS
Anatol Belski [Fri, 20 Oct 2017 18:47:16 +0000 (20:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Update NEWS
Anatol Belski [Fri, 20 Oct 2017 18:46:42 +0000 (20:46 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 20 Oct 2017 18:14:08 +0000 (20:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73655 Spoofchecker::isSuspicious behavior change due to upstream changes
Add test for newer ICU version
Anatol Belski [Fri, 20 Oct 2017 17:14:22 +0000 (19:14 +0200)]
Fixed bug #73655 Spoofchecker::isSuspicious behavior change due to upstream changes
There are significant changes in the spoof checking reflecting
http://www.unicode.org/reports/tr39/tr39-15.html and relying on the
restriction levels. ICU 58+ removes WSC and MSC handling and otherwise
undergoes big changes in both code and data areas. Keep up with the
basic points for now, as we need to move forward and provide an
acceptable experience to PHP users linking to a newer ICU. The most
distros ATM don't provide ICU > 57.1, though. We'll need for sure to
keep up with the BC breach in ICU 58+ in possible further aspects.
Anatol Belski [Fri, 20 Oct 2017 17:02:42 +0000 (19:02 +0200)]
Add test for newer ICU version
Anatol Belski [Fri, 20 Oct 2017 16:40:26 +0000 (18:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Further test fixes for ICU >= 58
Anatol Belski [Fri, 20 Oct 2017 16:39:46 +0000 (18:39 +0200)]
Further test fixes for ICU >= 58
Anatol Belski [Fri, 20 Oct 2017 16:26:14 +0000 (18:26 +0200)]
Version checks
Anatol Belski [Fri, 20 Oct 2017 14:54:47 +0000 (16:54 +0200)]
Yet two wrong version checks
Anatol Belski [Fri, 20 Oct 2017 13:25:01 +0000 (15:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix version checks in tests
Anatol Belski [Fri, 20 Oct 2017 13:24:43 +0000 (15:24 +0200)]
Fix version checks in tests
Anatol Belski [Fri, 20 Oct 2017 13:23:09 +0000 (15:23 +0200)]
Fix version checks in tests
Anatol Belski [Fri, 20 Oct 2017 11:57:44 +0000 (13:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync some tests for compat with ICU 58.1+
Anatol Belski [Fri, 20 Oct 2017 11:56:58 +0000 (13:56 +0200)]
Sync some tests for compat with ICU 58.1, PHP 7.1+ part
Anatol Belski [Fri, 20 Oct 2017 11:55:32 +0000 (13:55 +0200)]
Sync some tests for compat with ICU 58.1+
Anatol Belski [Fri, 20 Oct 2017 09:28:51 +0000 (11:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add skip for incompatible ICU version
Anatol Belski [Fri, 20 Oct 2017 09:27:54 +0000 (11:27 +0200)]
Add skip for incompatible ICU version
Joe Watkins [Thu, 19 Oct 2017 11:02:34 +0000 (12:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
Nester [Mon, 9 Oct 2017 14:26:44 +0000 (14:26 +0000)]
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
Joe Watkins [Thu, 19 Oct 2017 10:53:50 +0000 (11:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update .editorconfig with some more configs
Peter Kokot [Wed, 11 Oct 2017 21:20:57 +0000 (23:20 +0200)]
Update .editorconfig with some more configs
Added support for .awk, .w32, .bat, .mk, .frag, .m4, .sh, .php, .phpt,
and Markdown files based on the current most used coding style in the
php-src repository.
Herman J. Radtke III [Sat, 14 Oct 2017 17:50:30 +0000 (10:50 -0700)]
Fix issue with zend signals in php_request_startup
The zend_signals_activate() function is called in php_request_startup()
even if `--disable-zend-signals` is used. This causes uninitialized
variables to be used on ZTS builds.
This was removed in 7.1 in
c870633 . Removing guards from the SAPIs
should be fine, but removing the guard from main/main.c prevents anyone
using the static embedded library to integrate PHP into their programs.
For more details, see the "Additional remark" section in
https://bugs.php.net/bug.php?id=74149
Joe Watkins [Thu, 19 Oct 2017 10:40:05 +0000 (11:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Escape newline on curl config.m4
Ryan Volz [Thu, 19 Oct 2017 00:49:17 +0000 (20:49 -0400)]
Escape newline on curl config.m4
Anatol Belski [Wed, 18 Oct 2017 15:46:40 +0000 (17:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to php-sdk-2.0.0beta3 for Appveyor
Anatol Belski [Wed, 18 Oct 2017 15:45:33 +0000 (17:45 +0200)]
Move to php-sdk-2.0.0beta3 for Appveyor
Supposed to fix sporadic tool crashes on the test image
Anatol Belski [Wed, 18 Oct 2017 14:24:23 +0000 (16:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Backport
7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+
Anatol Belski [Wed, 18 Oct 2017 14:02:56 +0000 (16:02 +0200)]
Anatol Belski [Tue, 17 Oct 2017 13:34:42 +0000 (15:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
One more folder to delete in AppVeyor image
Anatol Belski [Tue, 17 Oct 2017 13:32:47 +0000 (15:32 +0200)]
One more folder to delete in AppVeyor image
Tianfang Yang [Mon, 16 Oct 2017 23:21:44 +0000 (19:21 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Tianfang Yang [Mon, 16 Oct 2017 23:20:24 +0000 (19:20 -0400)]
Fixed valgrind issue
Tianfang Yang [Mon, 16 Oct 2017 23:16:30 +0000 (19:16 -0400)]
Fixed valgrind issue
Anatol Belski [Mon, 16 Oct 2017 16:06:38 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to next binary SDK version for AppVeyor
Anatol Belski [Mon, 16 Oct 2017 16:05:56 +0000 (18:05 +0200)]
Move to next binary SDK version for AppVeyor
Dmitry Stogov [Mon, 16 Oct 2017 16:02:07 +0000 (19:02 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Dmitry Stogov [Mon, 16 Oct 2017 16:00:12 +0000 (19:00 +0300)]
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Christoph M. Becker [Mon, 16 Oct 2017 09:11:34 +0000 (11:11 +0200)]
[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
Jakub Zelenka [Sun, 15 Oct 2017 19:31:25 +0000 (20:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 15 Oct 2017 19:25:58 +0000 (20:25 +0100)]
Properly fix #75363 and address some other leaks with cert
Christoph M. Becker [Sun, 15 Oct 2017 11:58:20 +0000 (13:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
Jelle van der Waa [Mon, 9 Oct 2017 18:35:53 +0000 (20:35 +0200)]
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
enchant_broker_get_dict_path segfaults when the dict path is not setup,
instead of segfaulting return false instead.
Christoph M. Becker [Sun, 15 Oct 2017 11:21:37 +0000 (13:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75365 (Enchant still reports version 1.1.0)
Christoph M. Becker [Thu, 12 Oct 2017 13:37:47 +0000 (15:37 +0200)]
Fixed bug #75365 (Enchant still reports version 1.1.0)
Since Enchant is bundled, we make `PHP_ENCHANT_VERSION` an alias of
`PHP_VERSION` and also drop the rather meaningless revision hash from
the PHP info.
Xinchen Hui [Sun, 15 Oct 2017 02:29:10 +0000 (10:29 +0800)]
Update NEWS
Xinchen Hui [Sun, 15 Oct 2017 02:28:46 +0000 (10:28 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
Xinchen Hui [Sun, 15 Oct 2017 02:28:28 +0000 (10:28 +0800)]
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
Dmitry Stogov [Fri, 13 Oct 2017 10:56:23 +0000 (13:56 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
Dmitry Stogov [Fri, 13 Oct 2017 10:56:06 +0000 (13:56 +0300)]
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
Bob Weinand [Thu, 12 Oct 2017 10:31:20 +0000 (12:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Thu, 12 Oct 2017 10:30:20 +0000 (12:30 +0200)]
Fixed bug #75363 (openssl_x509_parse leaks memory)
Anatol Belski [Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
It looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 20:21:34 +0000 (22:21 +0200)]
It looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 18:30:40 +0000 (20:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Put php-sdk-2.0.12beta1 for AppVeyor