]> granicus.if.org Git - php/log
php
7 years agoAvoid overflow
Xinchen Hui [Mon, 13 Nov 2017 03:18:56 +0000 (11:18 +0800)]
Avoid overflow

7 years agoFixed bug #75511 (fread not free unused buffer)
Xinchen Hui [Mon, 13 Nov 2017 03:05:05 +0000 (11:05 +0800)]
Fixed bug #75511 (fread not free unused buffer)

7 years ago[ci skip] update NEWS
Anatol Belski [Fri, 10 Nov 2017 10:41:16 +0000 (11:41 +0100)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 10 Nov 2017 10:40:47 +0000 (11:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Fri, 10 Nov 2017 10:40:16 +0000 (11:40 +0100)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 8 Nov 2017 10:54:18 +0000 (11:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #75384 PHP seems incompatible with OneDrive files on demand
  Fixed ext/date tests due to changes in Olson database

7 years agoFixed #75384 PHP seems incompatible with OneDrive files on demand
Anatol Belski [Wed, 8 Nov 2017 10:52:42 +0000 (11:52 +0100)]
Fixed #75384 PHP seems incompatible with OneDrive files on demand

7 years agobump versions
Joe Watkins [Tue, 7 Nov 2017 15:35:14 +0000 (15:35 +0000)]
bump versions

7 years agoFixed ext/date tests due to changes in Olson database
Derick Rethans [Tue, 7 Nov 2017 11:34:55 +0000 (11:34 +0000)]
Fixed ext/date tests due to changes in Olson database

7 years agoFixed ext/date tests due to changes in Olson database
Derick Rethans [Tue, 7 Nov 2017 11:25:28 +0000 (11:25 +0000)]
Fixed ext/date tests due to changes in Olson database

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 7 Nov 2017 09:09:52 +0000 (10:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  7.0.27 next

7 years ago7.0.27 next
Anatol Belski [Tue, 7 Nov 2017 09:07:52 +0000 (10:07 +0100)]
7.0.27 next

7 years agofix wrong check of definition_phi->constraint.range.max_ssa_var
MITSUNARI Shigeo [Fri, 3 Nov 2017 05:06:27 +0000 (14:06 +0900)]
fix wrong check of definition_phi->constraint.range.max_ssa_var

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 2 Nov 2017 21:44:27 +0000 (22:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update libs_version.txt

7 years agoUpdate libs_version.txt
Anatol Belski [Thu, 2 Nov 2017 21:41:12 +0000 (22:41 +0100)]
Update libs_version.txt

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 2 Nov 2017 19:56:25 +0000 (20:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix ext/soap/tests/bug69137.phpt
Nikita Popov [Thu, 2 Nov 2017 19:55:10 +0000 (20:55 +0100)]
Fix ext/soap/tests/bug69137.phpt

Switch to example.org. Also mark it as an online test.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 2 Nov 2017 11:38:32 +0000 (12:38 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Sync and fix tests for ICU 60.1 compat

7 years agoSync and fix tests for ICU 60.1 compat
Anatol Belski [Thu, 2 Nov 2017 11:37:04 +0000 (12:37 +0100)]
Sync and fix tests for ICU 60.1 compat

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 2 Nov 2017 08:22:25 +0000 (09:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Yet one /nologo

7 years agoYet one /nologo
Anatol Belski [Thu, 2 Nov 2017 08:21:22 +0000 (09:21 +0100)]
Yet one /nologo

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 31 Oct 2017 09:35:59 +0000 (10:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix year
  Add /nologo

7 years agoFix year
Anatol Belski [Tue, 31 Oct 2017 09:25:15 +0000 (10:25 +0100)]
Fix year

7 years agoAdd /nologo
Anatol Belski [Tue, 31 Oct 2017 09:24:34 +0000 (10:24 +0100)]
Add /nologo

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 17:16:03 +0000 (18:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add missing ICU version check

7 years agoAdd missing ICU version check
Anatol Belski [Mon, 30 Oct 2017 17:15:26 +0000 (18:15 +0100)]
Add missing ICU version check

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Mon, 30 Oct 2017 16:42:23 +0000 (16:42 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoPrevent leaking x509 and csr resources if it is not requested
Jakub Zelenka [Mon, 30 Oct 2017 16:36:38 +0000 (16:36 +0000)]
Prevent leaking x509 and csr resources if it is not requested

All functions using php_openssl_x509_from_zval or php_openssl_csr_from_zval
with makeresource equal to 0 do not deref the resource which means there
is a leak till the end of the request. This can cause issues for long
running apps. It is a generic solution for bug #75363 which also covers
other functions.

7 years agoExtend and speed up pkey export tests
Jakub Zelenka [Mon, 30 Oct 2017 16:05:00 +0000 (16:05 +0000)]
Extend and speed up pkey export tests

7 years agoRewrite openssl_csr_get_subject test to improve coverage
Jakub Zelenka [Mon, 30 Oct 2017 14:29:05 +0000 (14:29 +0000)]
Rewrite openssl_csr_get_subject test to improve coverage

7 years agoAdd openssl_csr_get_public_key test
Jakub Zelenka [Mon, 30 Oct 2017 14:28:18 +0000 (14:28 +0000)]
Add openssl_csr_get_public_key test

7 years agoExtend openssl_pkcs7_* tests to cover resource cert
Jakub Zelenka [Mon, 30 Oct 2017 14:16:03 +0000 (14:16 +0000)]
Extend openssl_pkcs7_* tests to cover resource cert

7 years agoFix cleaning tmp output file in openssl_csr_export_to_file test
Jakub Zelenka [Mon, 30 Oct 2017 14:15:23 +0000 (14:15 +0000)]
Fix cleaning tmp output file in openssl_csr_export_to_file test

7 years agoopenssl: add basic openssl_csr_export_to_file tests
Jelle van der Waa [Fri, 11 Aug 2017 22:58:59 +0000 (00:58 +0200)]
openssl: add basic openssl_csr_export_to_file tests

Add a basic test for openssl_csr_export_to_file.

7 years agoExtend openssl_csr_sign test to cover cert resource
Jakub Zelenka [Mon, 30 Oct 2017 13:57:51 +0000 (13:57 +0000)]
Extend openssl_csr_sign test to cover cert resource

7 years agoSet different invalid path in openssl_pkcs12_export so it is more unlikely to exist
Jakub Zelenka [Mon, 30 Oct 2017 13:40:06 +0000 (13:40 +0000)]
Set different invalid path in openssl_pkcs12_export so it is more unlikely to exist

7 years agoExtend openssl_x509_parse to cover cert resource
Jakub Zelenka [Mon, 30 Oct 2017 13:36:32 +0000 (13:36 +0000)]
Extend openssl_x509_parse to cover cert resource

7 years agoRename and test resource cert in openssl_x509_checkpurpose test
Jakub Zelenka [Mon, 30 Oct 2017 13:17:32 +0000 (13:17 +0000)]
Rename and test resource cert in openssl_x509_checkpurpose test

7 years agoExtend openssl_x509_check_private_key to test resource cert
Jakub Zelenka [Mon, 30 Oct 2017 13:01:27 +0000 (13:01 +0000)]
Extend openssl_x509_check_private_key to test resource cert

7 years agoExtend openssl_x509_fingerprint test to cover resource cert with sha1
Jakub Zelenka [Mon, 30 Oct 2017 12:55:29 +0000 (12:55 +0000)]
Extend openssl_x509_fingerprint test to cover resource cert with sha1

7 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Joe Watkins [Mon, 30 Oct 2017 14:16:27 +0000 (14:16 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Yet one attempt to mitigate the unzip error on AppVeyor
  Ensure SDK is checked out before asking for version
  Fix fetching the SDK version
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
  Remove status check on the SDK repo and add version check
  Use abbrev
  Catch with the latest AppVeyor unzip errors
  Fixed type inference

7 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Joe Watkins [Mon, 30 Oct 2017 14:16:16 +0000 (14:16 +0000)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  Yet one attempt to mitigate the unzip error on AppVeyor
  Ensure SDK is checked out before asking for version
  Fix fetching the SDK version
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
  Remove status check on the SDK repo and add version check
  Catch with the latest AppVeyor unzip errors

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 30 Oct 2017 14:13:16 +0000 (14:13 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders

7 years agoFix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
Fabien Villepinte [Mon, 30 Oct 2017 12:25:40 +0000 (13:25 +0100)]
Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 11:17:53 +0000 (12:17 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Yet one attempt to mitigate the unzip error on AppVeyor

7 years agoYet one attempt to mitigate the unzip error on AppVeyor
Anatol Belski [Mon, 30 Oct 2017 11:16:53 +0000 (12:16 +0100)]
Yet one attempt to mitigate the unzip error on AppVeyor

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 11:08:50 +0000 (12:08 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Ensure SDK is checked out before asking for version

7 years agoEnsure SDK is checked out before asking for version
Anatol Belski [Mon, 30 Oct 2017 11:07:27 +0000 (12:07 +0100)]
Ensure SDK is checked out before asking for version

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 10:29:40 +0000 (11:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix fetching the SDK version

7 years agoFix fetching the SDK version
Anatol Belski [Mon, 30 Oct 2017 10:28:32 +0000 (11:28 +0100)]
Fix fetching the SDK version

7 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Xinchen Hui [Mon, 30 Oct 2017 10:20:20 +0000 (18:20 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script

7 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Xinchen Hui [Mon, 30 Oct 2017 10:17:27 +0000 (18:17 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Remove status check on the SDK repo and add version check

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 10:15:51 +0000 (11:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script

7 years agoFix SDK version comparison and add more verbosity
Anatol Belski [Mon, 30 Oct 2017 09:53:12 +0000 (10:53 +0100)]
Fix SDK version comparison and add more verbosity

7 years agoDon't use the cache dependency, SDK version is handled in script
Anatol Belski [Mon, 30 Oct 2017 09:34:11 +0000 (10:34 +0100)]
Don't use the cache dependency, SDK version is handled in script

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 09:16:39 +0000 (10:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove status check on the SDK repo and add version check

7 years agoRemove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:14:05 +0000 (10:14 +0100)]
Remove status check on the SDK repo and add version check

If Appveyor fails to unzip, .git would be in an arbitrary state anyway.
Thus this check doesn't help. For the version check - rely on the branch
naming scheme in the SDK.

7 years agoUse abbrev
Xinchen Hui [Mon, 30 Oct 2017 08:26:59 +0000 (16:26 +0800)]
Use abbrev

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 30 Oct 2017 07:56:52 +0000 (08:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Catch with the latest AppVeyor unzip errors

7 years agoCatch with the latest AppVeyor unzip errors
Anatol Belski [Mon, 30 Oct 2017 07:42:59 +0000 (08:42 +0100)]
Catch with the latest AppVeyor unzip errors

7 years agoFixed type inference
Dmitry Stogov [Mon, 30 Oct 2017 07:41:27 +0000 (10:41 +0300)]
Fixed type inference

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 30 Oct 2017 06:55:13 +0000 (06:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect

7 years agoFix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Fabien Villepinte [Sun, 29 Oct 2017 08:14:56 +0000 (09:14 +0100)]
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 29 Oct 2017 09:09:18 +0000 (10:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Re-enable AppVeyor cache

7 years agoRe-enable AppVeyor cache
Anatol Belski [Sun, 29 Oct 2017 09:08:31 +0000 (10:08 +0100)]
Re-enable AppVeyor cache

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sun, 29 Oct 2017 04:37:55 +0000 (04:37 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  make sure run-tests reports exit status upon prerequisite error

7 years agomake sure run-tests reports exit status upon prerequisite error
Joe Watkins [Sun, 29 Oct 2017 04:37:21 +0000 (04:37 +0000)]
make sure run-tests reports exit status upon prerequisite error

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 28 Oct 2017 10:57:36 +0000 (12:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix bug #75434 Wrong reflection for mysqli_fetch_all function
Fabien Villepinte [Sat, 28 Oct 2017 08:40:00 +0000 (10:40 +0200)]
Fix bug #75434 Wrong reflection for mysqli_fetch_all function

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 27 Oct 2017 15:06:12 +0000 (16:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75307 Wrong reflection for openssl_open function

7 years agoFix bug #75307 Wrong reflection for openssl_open function
Fabien Villepinte [Fri, 27 Oct 2017 12:14:04 +0000 (14:14 +0200)]
Fix bug #75307 Wrong reflection for openssl_open function

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 27 Oct 2017 14:23:19 +0000 (16:23 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Skip test on PostgreSQL 10

7 years agoSkip test on PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 14:19:42 +0000 (16:19 +0200)]
Skip test on PostgreSQL 10

The 42P18 error is not produced by the server anymore.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 27 Oct 2017 13:04:29 +0000 (15:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix test compat for PostgreSQL 10

7 years agoFix test compat for PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 12:58:43 +0000 (14:58 +0200)]
Fix test compat for PostgreSQL 10

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 27 Oct 2017 12:17:57 +0000 (14:17 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107

7 years agoApply upstream patch for CVE-2017-14107
Anatol Belski [Fri, 27 Oct 2017 11:20:15 +0000 (13:20 +0200)]
Apply upstream patch for CVE-2017-14107

7 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 27 Oct 2017 11:18:41 +0000 (13:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Backport and apply upstream patch for CVE-2017-14107

7 years agoBackport and apply upstream patch for CVE-2017-14107
Anatol Belski [Fri, 27 Oct 2017 11:16:56 +0000 (13:16 +0200)]
Backport and apply upstream patch for CVE-2017-14107

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 26 Oct 2017 19:26:03 +0000 (21:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Binary SDK 2.0.12 stable

7 years agoBinary SDK 2.0.12 stable
Anatol Belski [Thu, 26 Oct 2017 19:25:08 +0000 (21:25 +0200)]
Binary SDK 2.0.12 stable

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Thu, 26 Oct 2017 13:04:20 +0000 (16:04 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed indirect modification of magic ArrayAccess method arguments

7 years agoFixed indirect modification of magic ArrayAccess method arguments
Dmitry Stogov [Thu, 26 Oct 2017 13:03:42 +0000 (16:03 +0300)]
Fixed indirect modification of magic ArrayAccess method arguments

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Thu, 26 Oct 2017 11:12:33 +0000 (14:12 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Backport tests

7 years agoBackport tests
Dmitry Stogov [Thu, 26 Oct 2017 11:12:08 +0000 (14:12 +0300)]
Backport tests

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Thu, 26 Oct 2017 10:11:59 +0000 (13:11 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed indirect modification of magic method arguments.

7 years agoFixed indirect modification of magic method arguments.
Dmitry Stogov [Thu, 26 Oct 2017 10:05:23 +0000 (13:05 +0300)]
Fixed indirect modification of magic method arguments.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 26 Oct 2017 02:23:52 +0000 (10:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed test

7 years agoFixed test
Xinchen Hui [Thu, 26 Oct 2017 02:23:43 +0000 (10:23 +0800)]
Fixed test

7 years agoUpdate NEWS
Xinchen Hui [Thu, 26 Oct 2017 02:09:41 +0000 (10:09 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Thu, 26 Oct 2017 02:08:39 +0000 (10:08 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

Conflicts:
Zend/zend_object_handlers.c

7 years agoFixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)
Xinchen Hui [Thu, 26 Oct 2017 02:07:08 +0000 (10:07 +0800)]
Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 25 Oct 2017 19:59:51 +0000 (20:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix typo in comments

7 years agoFix typo in comments
Fabien Villepinte [Wed, 25 Oct 2017 08:42:13 +0000 (10:42 +0200)]
Fix typo in comments

7 years agoDon't create plist files when using clang analyzer
Anatol Belski [Wed, 25 Oct 2017 16:06:56 +0000 (18:06 +0200)]
Don't create plist files when using clang analyzer

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 25 Oct 2017 12:47:11 +0000 (14:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt

7 years agoFix the SKIPIF part in /ext/gd/tests/bug75437.phpt
Fabien Villepinte [Wed, 25 Oct 2017 11:53:52 +0000 (13:53 +0200)]
Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 25 Oct 2017 10:56:25 +0000 (12:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75437 Wrong reflection on imagewebp

7 years agoFix bug #75437 Wrong reflection on imagewebp
Fabien Villepinte [Wed, 25 Oct 2017 10:06:54 +0000 (12:06 +0200)]
Fix bug #75437 Wrong reflection on imagewebp

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 25 Oct 2017 01:40:49 +0000 (03:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1