]>
granicus.if.org Git - php/log
Dmitry Stogov [Mon, 30 Oct 2017 09:32:22 +0000 (12:32 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:17:55 +0000 (10:17 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Remove status check on the SDK repo and add version check
Anatol Belski [Mon, 30 Oct 2017 09:17:25 +0000 (10:17 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove status check on the SDK repo and add version check
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
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.
Dmitry Stogov [Mon, 30 Oct 2017 09:11:35 +0000 (12:11 +0300)]
Merge branch 'master' into rc_debug
* master: (26 commits)
Better fix for bug #75451 (Assertion fails while foreach on empty xpath query)
Catch with the latest AppVeyor unzip errors
Fixed type inference
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Fix compiler warnings
We don't use a specific model for a MAKERNOTE so remove these checks that doesn't do anything anyway
Remove these old comments, as for the TODO, there is already a FR for this
Re-enable AppVeyor cache
make sure run-tests reports exit status upon prerequisite error
Remove implicit constants from test case
Fix invalid read in zend_use_undefined_constant()
Fix invalid read in mb_ord()
Remove --with-libmbfl configure option
Fixed bug #75451 (Assertion fails while foreach on empty xpath query)
Add tests for UConverter::getStandards()
convert spaces to tabs in ext/ftp/tests/server.inc
Add tests for ftp_rename
Fix bug #75434 Wrong reflection for mysqli_fetch_all function
Don't optimize input arrays with suffix holes
Fix bug #75307 Wrong reflection for openssl_open function
...
Dmitry Stogov [Mon, 30 Oct 2017 09:05:45 +0000 (12:05 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Catch with the latest AppVeyor unzip errors
Dmitry Stogov [Mon, 30 Oct 2017 09:04:15 +0000 (12:04 +0300)]
Better fix for bug #75451 (Assertion fails while foreach on empty xpath query)
Anatol Belski [Mon, 30 Oct 2017 07:58:16 +0000 (08:58 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Catch with the latest AppVeyor unzip errors
Anatol Belski [Mon, 30 Oct 2017 07:57:29 +0000 (08:57 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Catch with the latest AppVeyor unzip errors
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
Dmitry Stogov [Mon, 30 Oct 2017 07:44:25 +0000 (10:44 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed type inference
Dmitry Stogov [Mon, 30 Oct 2017 07:44:12 +0000 (10:44 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed type inference
Anatol Belski [Mon, 30 Oct 2017 07:42:59 +0000 (08:42 +0100)]
Catch with the latest AppVeyor unzip errors
Dmitry Stogov [Mon, 30 Oct 2017 07:41:27 +0000 (10:41 +0300)]
Fixed type inference
Joe Watkins [Mon, 30 Oct 2017 06:56:08 +0000 (06:56 +0000)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Joe Watkins [Mon, 30 Oct 2017 06:55:43 +0000 (06:55 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
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
Fabien Villepinte [Sun, 29 Oct 2017 08:14:56 +0000 (09:14 +0100)]
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
Kalle Sommer Nielsen [Sun, 29 Oct 2017 15:43:21 +0000 (16:43 +0100)]
Fix compiler warnings
Kalle Sommer Nielsen [Sun, 29 Oct 2017 15:42:13 +0000 (16:42 +0100)]
We don't use a specific model for a MAKERNOTE so remove these checks that doesn't do anything anyway
Kalle Sommer Nielsen [Sun, 29 Oct 2017 15:36:34 +0000 (16:36 +0100)]
Remove these old comments, as for the TODO, there is already a FR for this
Anatol Belski [Sun, 29 Oct 2017 09:10:10 +0000 (10:10 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Re-enable AppVeyor cache
Anatol Belski [Sun, 29 Oct 2017 09:09:45 +0000 (10:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Re-enable AppVeyor cache
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
Anatol Belski [Sun, 29 Oct 2017 09:08:31 +0000 (10:08 +0100)]
Re-enable AppVeyor cache
Joe Watkins [Sun, 29 Oct 2017 04:38:20 +0000 (04:38 +0000)]
Merge branch 'PHP-7.2'
* PHP-7.2:
make sure run-tests reports exit status upon prerequisite error
Joe Watkins [Sun, 29 Oct 2017 04:38:08 +0000 (04:38 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
make sure run-tests reports exit status upon prerequisite error
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
Joe Watkins [Sun, 29 Oct 2017 04:37:21 +0000 (04:37 +0000)]
make sure run-tests reports exit status upon prerequisite error
Christoph M. Becker [Sat, 28 Oct 2017 16:00:10 +0000 (18:00 +0200)]
Remove implicit constants from test case
`FILTER_FLAG_SCHEME_REQUIRED` and `FILTER_FLAG_HOST_REQUIRED` are
implicitly used for `FILTER_VALIDATE_URL` so there is no need to
specify them explicitly.
Cf. https://bugs.php.net/75442.
Nikita Popov [Sat, 28 Oct 2017 14:55:23 +0000 (16:55 +0200)]
Fix invalid read in zend_use_undefined_constant()
Nikita Popov [Sat, 28 Oct 2017 14:44:32 +0000 (16:44 +0200)]
Fix invalid read in mb_ord()
Peter Kokot [Sun, 8 Oct 2017 19:11:53 +0000 (21:11 +0200)]
Remove --with-libmbfl configure option
The bundled libmbfl library is no longer API or ABI compatible with
the (currently unmaintained) upstream library. As such, building
against an external libmbfl is no longer possible.
Xinchen Hui [Sat, 28 Oct 2017 13:38:26 +0000 (21:38 +0800)]
Fixed bug #75451 (Assertion fails while foreach on empty xpath query)
Fabien Villepinte [Wed, 25 Oct 2017 07:49:54 +0000 (09:49 +0200)]
Add tests for UConverter::getStandards()
Michael Kliewe [Thu, 26 Oct 2017 19:21:29 +0000 (12:21 -0700)]
convert spaces to tabs in ext/ftp/tests/server.inc
Michael Kliewe [Thu, 26 Oct 2017 19:13:07 +0000 (12:13 -0700)]
Add tests for ftp_rename
Nikita Popov [Sat, 28 Oct 2017 10:58:43 +0000 (12:58 +0200)]
Merge branch 'PHP-7.2'
Nikita Popov [Sat, 28 Oct 2017 10:58:11 +0000 (12:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 28 Oct 2017 10:57:36 +0000 (12:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Fabien Villepinte [Sat, 28 Oct 2017 08:40:00 +0000 (10:40 +0200)]
Fix bug #75434 Wrong reflection for mysqli_fetch_all function
Sara Golemon [Fri, 27 Oct 2017 17:07:50 +0000 (13:07 -0400)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Don't optimize input arrays with suffix holes
Sara Golemon [Fri, 27 Oct 2017 17:05:38 +0000 (13:05 -0400)]
Don't optimize input arrays with suffix holes
Joe Watkins [Fri, 27 Oct 2017 15:07:10 +0000 (16:07 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix bug #75307 Wrong reflection for openssl_open function
Joe Watkins [Fri, 27 Oct 2017 15:06:38 +0000 (16:06 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75307 Wrong reflection for openssl_open function
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
Fabien Villepinte [Fri, 27 Oct 2017 12:14:04 +0000 (14:14 +0200)]
Fix bug #75307 Wrong reflection for openssl_open function
Anatol Belski [Fri, 27 Oct 2017 14:24:22 +0000 (16:24 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Skip test on PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 14:23:50 +0000 (16:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip test on PostgreSQL 10
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
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.
Sara Golemon [Fri, 27 Oct 2017 14:13:17 +0000 (10:13 -0400)]
array_slice() passthrough for preserve_keys=true as well
Sara Golemon [Fri, 27 Oct 2017 14:00:17 +0000 (10:00 -0400)]
Do not create a new array when slicing all of input array.
Anatol Belski [Fri, 27 Oct 2017 13:05:15 +0000 (15:05 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix test compat for PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 13:04:54 +0000 (15:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix test compat for PostgreSQL 10
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
Anatol Belski [Fri, 27 Oct 2017 12:58:43 +0000 (14:58 +0200)]
Fix test compat for PostgreSQL 10
Anatol Belski [Fri, 27 Oct 2017 12:18:55 +0000 (14:18 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Apply upstream patch for CVE-2017-14107
Backport and apply upstream patch for CVE-2017-14107
Anatol Belski [Fri, 27 Oct 2017 12:18:27 +0000 (14:18 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Apply upstream patch for CVE-2017-14107
Backport and apply upstream patch for CVE-2017-14107
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
Dmitry Stogov [Fri, 27 Oct 2017 11:59:09 +0000 (14:59 +0300)]
Merge branch 'master' into rc_debug
* master:
Use per-request heap instead of system one
Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
Makrk persistent resources and references with GC_PERSISTENT flag
Dmitry Stogov [Fri, 27 Oct 2017 11:45:54 +0000 (14:45 +0300)]
Use per-request heap instead of system one
Dmitry Stogov [Fri, 27 Oct 2017 11:44:21 +0000 (14:44 +0300)]
Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
Dmitry Stogov [Fri, 27 Oct 2017 11:42:06 +0000 (14:42 +0300)]
Makrk persistent resources and references with GC_PERSISTENT flag
Anatol Belski [Fri, 27 Oct 2017 11:20:15 +0000 (13:20 +0200)]
Apply upstream patch for CVE-2017-14107
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
Anatol Belski [Fri, 27 Oct 2017 11:16:56 +0000 (13:16 +0200)]
Backport and apply upstream patch for CVE-2017-14107
Dmitry Stogov [Thu, 26 Oct 2017 22:28:58 +0000 (01:28 +0300)]
Encapsulate reference-counting primitives.
Prohibit direct update of GC_REFCOUNT(), GC_SET_REFCOUNT(), GC_ADDREF() and GC_DELREF() shoukf be instead.
Added mactros to validate reference-counting (disabled for now).
These macros are going to be used to eliminate race-condintions during reference-counting on data shared between threads.
Dmitry Stogov [Thu, 26 Oct 2017 19:43:45 +0000 (22:43 +0300)]
Reverted constant related change (this should be handled togrther with ohter constant related places)
Anatol Belski [Thu, 26 Oct 2017 19:27:32 +0000 (21:27 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Binary SDK 2.0.12 stable
Anatol Belski [Thu, 26 Oct 2017 19:27:09 +0000 (21:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Binary SDK 2.0.12 stable
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
Anatol Belski [Thu, 26 Oct 2017 19:25:08 +0000 (21:25 +0200)]
Binary SDK 2.0.12 stable
Dmitry Stogov [Thu, 26 Oct 2017 16:13:53 +0000 (19:13 +0300)]
Removed useless reallocations
Dmitry Stogov [Thu, 26 Oct 2017 13:17:49 +0000 (16:17 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed indirect modification of magic ArrayAccess method arguments
Dmitry Stogov [Thu, 26 Oct 2017 13:07:49 +0000 (16:07 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed indirect modification of magic ArrayAccess method arguments
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
Dmitry Stogov [Thu, 26 Oct 2017 13:03:42 +0000 (16:03 +0300)]
Fixed indirect modification of magic ArrayAccess method arguments
Dmitry Stogov [Thu, 26 Oct 2017 11:12:58 +0000 (14:12 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Backport tests
Dmitry Stogov [Thu, 26 Oct 2017 11:12:45 +0000 (14:12 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Backport tests
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
Dmitry Stogov [Thu, 26 Oct 2017 11:12:08 +0000 (14:12 +0300)]
Backport tests
Dmitry Stogov [Thu, 26 Oct 2017 11:04:42 +0000 (14:04 +0300)]
Restore object copying on magic method calls (It was removed in master only).
Dmitry Stogov [Thu, 26 Oct 2017 10:35:39 +0000 (13:35 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed indirect modification of magic method arguments.
Dmitry Stogov [Thu, 26 Oct 2017 10:12:52 +0000 (13:12 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed indirect modification of magic method arguments.
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.
Dmitry Stogov [Thu, 26 Oct 2017 10:05:23 +0000 (13:05 +0300)]
Fixed indirect modification of magic method arguments.
Dmitry Stogov [Thu, 26 Oct 2017 06:45:02 +0000 (09:45 +0300)]
Avoid reallocations when concatenate with empty string
Xinchen Hui [Thu, 26 Oct 2017 02:24:06 +0000 (10:24 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed test
Xinchen Hui [Thu, 26 Oct 2017 02:24:00 +0000 (10:24 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed test
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
Xinchen Hui [Thu, 26 Oct 2017 02:23:43 +0000 (10:23 +0800)]
Fixed test
Xinchen Hui [Thu, 26 Oct 2017 02:16:55 +0000 (10:16 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Update NEWS
Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)
Conflicts:
Zend/zend_object_handlers.c
Xinchen Hui [Thu, 26 Oct 2017 02:11:13 +0000 (10:11 +0800)]
Update NEWS
Xinchen Hui [Thu, 26 Oct 2017 02:09:57 +0000 (10:09 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)
Xinchen Hui [Thu, 26 Oct 2017 02:09:41 +0000 (10:09 +0800)]
Update NEWS
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
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)
Dmitry Stogov [Wed, 25 Oct 2017 21:26:38 +0000 (00:26 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fix typo in comments
Fix typo in comments