]> granicus.if.org Git - php/log
php
7 years agoUpdated NEWS
Côme Chilliet [Wed, 27 Sep 2017 15:11:27 +0000 (17:11 +0200)]
Updated NEWS

Added LDAP control support in it

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Wed, 27 Sep 2017 14:18:17 +0000 (17:18 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75255 (Request hangs and not finish)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Wed, 27 Sep 2017 14:17:46 +0000 (17:17 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75255 (Request hangs and not finish)

7 years agoFixed bug #75255 (Request hangs and not finish)
Dmitry Stogov [Wed, 27 Sep 2017 14:16:24 +0000 (17:16 +0300)]
Fixed bug #75255 (Request hangs and not finish)

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:23:52 +0000 (06:23 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fix bug #75222 DateInterval microseconds property always 0

7 years agofix bug #75222 DateInterval microseconds property always 0
jhdxr [Mon, 25 Sep 2017 18:51:33 +0000 (02:51 +0800)]
fix bug #75222 DateInterval microseconds property always 0

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:21:02 +0000 (06:21 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix CGI m4 config message when CGI is disabled

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 27 Sep 2017 05:20:46 +0000 (06:20 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix CGI m4 config message when CGI is disabled

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 27 Sep 2017 05:20:34 +0000 (06:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix CGI m4 config message when CGI is disabled

7 years agoFix CGI m4 config message when CGI is disabled
Peter Kokot [Sun, 24 Sep 2017 19:09:09 +0000 (21:09 +0200)]
Fix CGI m4 config message when CGI is disabled

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:16:24 +0000 (06:16 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #75248 and #75251

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 27 Sep 2017 05:15:59 +0000 (06:15 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #75248 and #75251

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 27 Sep 2017 05:15:26 +0000 (06:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75248 and #75251

7 years agoFix bug #75248 and #75251
Peter Kokot [Fri, 22 Sep 2017 20:41:51 +0000 (22:41 +0200)]
Fix bug #75248 and #75251

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:09:08 +0000 (06:09 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed #75220 - Segfault when calling is_callable on parent

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 27 Sep 2017 05:08:13 +0000 (06:08 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed #75220 - Segfault when calling is_callable on parent

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 27 Sep 2017 05:07:46 +0000 (06:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #75220 - Segfault when calling is_callable on parent

7 years agoFixed #75220 - Segfault when calling is_callable on parent
Nester [Mon, 18 Sep 2017 08:19:47 +0000 (08:19 +0000)]
Fixed #75220 - Segfault when calling is_callable on parent

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Tue, 26 Sep 2017 16:10:37 +0000 (18:10 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: call crypto_pwhash_argon2id() explicitly if required
  ext/sodium: avoid tautological comparisons

7 years agoext/sodium: call crypto_pwhash_argon2id() explicitly if required
Frank Denis [Tue, 26 Sep 2017 16:09:00 +0000 (18:09 +0200)]
ext/sodium: call crypto_pwhash_argon2id() explicitly if required

7 years agoext/sodium: avoid tautological comparisons
Frank Denis [Tue, 26 Sep 2017 15:58:16 +0000 (17:58 +0200)]
ext/sodium: avoid tautological comparisons

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Tue, 26 Sep 2017 15:38:09 +0000 (17:38 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: signing empty messages is fine

7 years agoext/sodium: signing empty messages is fine
Frank Denis [Tue, 26 Sep 2017 15:37:04 +0000 (17:37 +0200)]
ext/sodium: signing empty messages is fine

7 years agoSplit CFG after RECV independently from ZEND_ACC_HAS_TYPE_HINTS flag.
Dmitry Stogov [Tue, 26 Sep 2017 12:40:29 +0000 (15:40 +0300)]
Split CFG after RECV independently from ZEND_ACC_HAS_TYPE_HINTS flag.

7 years agoUpdate NEWS for 7.2.0RC4
Remi Collet [Tue, 26 Sep 2017 09:38:23 +0000 (09:38 +0000)]
Update NEWS for 7.2.0RC4

7 years agoUpdate NEWS for PHP 7.2.0RC3
Remi Collet [Tue, 26 Sep 2017 09:23:07 +0000 (09:23 +0000)]
Update NEWS for PHP 7.2.0RC3

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Tue, 26 Sep 2017 07:21:16 +0000 (09:21 +0200)]
Merge branch 'PHP-7.2'

7 years agoCreate $http_response_header even if not used
Nikita Popov [Tue, 26 Sep 2017 07:20:43 +0000 (09:20 +0200)]
Create $http_response_header even if not used

Extensions are relying on it.

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Mon, 25 Sep 2017 22:47:09 +0000 (00:47 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd

7 years agoMerge branch 'pull-request/2773' into PHP-7.2
Christoph M. Becker [Mon, 25 Sep 2017 22:36:54 +0000 (00:36 +0200)]
Merge branch 'pull-request/2773' into PHP-7.2

* pull-request/2773:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 25 Sep 2017 19:59:09 +0000 (21:59 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 25 Sep 2017 19:58:41 +0000 (21:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 25 Sep 2017 19:58:18 +0000 (21:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoRemove some old sapi/apache_hooks and sapi/apache leftovers
Peter Kokot [Sun, 24 Sep 2017 22:23:59 +0000 (00:23 +0200)]
Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 25 Sep 2017 09:23:11 +0000 (12:23 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Added missed ~

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 25 Sep 2017 09:23:01 +0000 (12:23 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Added missed ~

7 years agoAdded missed ~
Dmitry Stogov [Mon, 25 Sep 2017 09:22:35 +0000 (12:22 +0300)]
Added missed ~

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 25 Sep 2017 09:05:24 +0000 (12:05 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed type inference

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 25 Sep 2017 09:04:13 +0000 (12:04 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed type inference

7 years agoFixed type inference
Dmitry Stogov [Mon, 25 Sep 2017 09:03:47 +0000 (12:03 +0300)]
Fixed type inference

7 years agoFix PHP_GD_TTSTR: command not found warning in ext/gd
Peter Kokot [Mon, 25 Sep 2017 00:37:42 +0000 (02:37 +0200)]
Fix PHP_GD_TTSTR: command not found warning in ext/gd

7 years agoRemove empty and done TODO file for CLI SAPI
Peter Kokot [Sun, 24 Sep 2017 16:16:21 +0000 (18:16 +0200)]
Remove empty and done TODO file for CLI SAPI

[ci skip]

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Sun, 24 Sep 2017 10:01:39 +0000 (18:01 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75230 (Invalid opcode 49/1/8 using opcache)

7 years agoFixed bug #75230 (Invalid opcode 49/1/8 using opcache)
Xinchen Hui [Sun, 24 Sep 2017 10:01:29 +0000 (18:01 +0800)]
Fixed bug #75230 (Invalid opcode 49/1/8 using opcache)

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Sun, 24 Sep 2017 09:25:26 +0000 (17:25 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning

7 years agoUpdate NEWS
Xinchen Hui [Sun, 24 Sep 2017 09:25:11 +0000 (17:25 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Sun, 24 Sep 2017 09:24:57 +0000 (17:24 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning

7 years agoUpdate NEWS
Xinchen Hui [Sun, 24 Sep 2017 09:24:43 +0000 (17:24 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Sun, 24 Sep 2017 09:24:23 +0000 (17:24 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning

7 years agoFixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
Xinchen Hui [Sun, 24 Sep 2017 09:24:11 +0000 (17:24 +0800)]
Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).

7 years agoCompiler warning
Xinchen Hui [Sun, 24 Sep 2017 09:19:05 +0000 (17:19 +0800)]
Compiler warning

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Sun, 24 Sep 2017 06:55:28 +0000 (08:55 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sun, 24 Sep 2017 06:54:56 +0000 (08:54 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 24 Sep 2017 06:54:24 +0000 (08:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed bug #75252
Nikita Popov [Sun, 24 Sep 2017 06:53:27 +0000 (08:53 +0200)]
Fixed bug #75252

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Fri, 22 Sep 2017 10:53:36 +0000 (13:53 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Using "enum" types as bit-fields is not portable.

7 years agoUsing "enum" types as bit-fields is not portable.
Dmitry Stogov [Fri, 22 Sep 2017 10:35:41 +0000 (13:35 +0300)]
Using "enum" types as bit-fields is not portable.

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Thu, 21 Sep 2017 15:46:35 +0000 (17:46 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: avoid negations on unsigned values

7 years agoext/sodium: avoid negations on unsigned values
Frank Denis [Thu, 21 Sep 2017 15:46:01 +0000 (17:46 +0200)]
ext/sodium: avoid negations on unsigned values

7 years agoMerge branch 'master' of git.php.net:/php-src
Côme Chilliet [Thu, 21 Sep 2017 08:50:06 +0000 (10:50 +0200)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Fix thread safety

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 21 Sep 2017 08:33:35 +0000 (10:33 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix thread safety

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 21 Sep 2017 08:33:13 +0000 (10:33 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix thread safety

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 21 Sep 2017 08:32:47 +0000 (10:32 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix thread safety

7 years agoFix thread safety
Anatol Belski [Thu, 21 Sep 2017 08:32:09 +0000 (10:32 +0200)]
Fix thread safety

7 years agoMerge branch 'pull-request/2640'
Côme Chilliet [Thu, 21 Sep 2017 08:21:22 +0000 (10:21 +0200)]
Merge branch 'pull-request/2640'

* pull-request/2640: (31 commits)
  Added support for VLV controls request and response
  Added support for SORT controls
  Added skip when control are not supported by the test ldap server
  Avoid memory leak when creating paged control value
  Fixed ifdef for VLV controls (copy/paste error)
  Added ldap_rename_ext and its test
  Indexing controls by OID when parsing them
  Avoid returning iscritical field when parsing response controls
  Fixed ldap_parse_result comment
  Added ldap_delete_ext and its test
  Added ldap_mod_*_ext methods for modification with controls
  Added ldap_add_ext and preread/postread support and tests
  Added ldap_bind_ext to pass controls and get result object
  Improved a bit error handling to avoid passing commands with incomplete controls
  Added support and test for LDAP_CONTROL_VALUESRETURNFILTER
  Removed client controls alltogether
  Fixed ldap_exop test since rebase remove client controls
  Added support for controls in ldap_modify_batch
  Added controls support to ldap_compare
  Added controls support to ldap_rename
  ...

7 years agoAdded support for VLV controls request and response
Côme Chilliet [Thu, 14 Sep 2017 13:50:05 +0000 (15:50 +0200)]
Added support for VLV controls request and response

7 years agoAdded support for SORT controls
Côme Chilliet [Thu, 14 Sep 2017 12:55:42 +0000 (14:55 +0200)]
Added support for SORT controls

On an openldap server you need the sssvlv overlay for these to work

7 years agoAdded skip when control are not supported by the test ldap server
Côme Chilliet [Thu, 14 Sep 2017 12:03:15 +0000 (14:03 +0200)]
Added skip when control are not supported by the test ldap server

7 years agoAvoid memory leak when creating paged control value
Côme Chilliet [Thu, 14 Sep 2017 08:08:22 +0000 (10:08 +0200)]
Avoid memory leak when creating paged control value

7 years agoFixed ifdef for VLV controls (copy/paste error)
Côme Chilliet [Thu, 14 Sep 2017 08:03:04 +0000 (10:03 +0200)]
Fixed ifdef for VLV controls (copy/paste error)

7 years agoAdded ldap_rename_ext and its test
Côme Chilliet [Tue, 12 Sep 2017 12:56:31 +0000 (14:56 +0200)]
Added ldap_rename_ext and its test

7 years agoIndexing controls by OID when parsing them
Côme Chilliet [Tue, 12 Sep 2017 10:58:46 +0000 (12:58 +0200)]
Indexing controls by OID when parsing them

7 years agoAvoid returning iscritical field when parsing response controls
Côme Chilliet [Tue, 12 Sep 2017 10:04:17 +0000 (12:04 +0200)]
Avoid returning iscritical field when parsing response controls

As stated in RFC4511 Section 4.1.11, this field is always false in
 response controls and only makes sense in request controls

7 years agoFixed ldap_parse_result comment
Côme Chilliet [Tue, 12 Sep 2017 09:40:56 +0000 (11:40 +0200)]
Fixed ldap_parse_result comment

7 years agoAdded ldap_delete_ext and its test
Côme Chilliet [Tue, 12 Sep 2017 09:39:00 +0000 (11:39 +0200)]
Added ldap_delete_ext and its test

7 years agoAdded ldap_mod_*_ext methods for modification with controls
Côme Chilliet [Tue, 12 Sep 2017 09:13:23 +0000 (11:13 +0200)]
Added ldap_mod_*_ext methods for modification with controls

7 years agoAdded ldap_add_ext and preread/postread support and tests
Côme Chilliet [Tue, 12 Sep 2017 07:53:49 +0000 (09:53 +0200)]
Added ldap_add_ext and preread/postread support and tests

7 years agoAdded ldap_bind_ext to pass controls and get result object
Côme Chilliet [Mon, 11 Sep 2017 13:38:32 +0000 (15:38 +0200)]
Added ldap_bind_ext to pass controls and get result object

ldap_bind_ext allows to pass controls and get result object
 from bind operation
Also added a test for it, pretty basic as tests cannot depend upon
 ppolicy overlay

7 years agoImproved a bit error handling to avoid passing commands with incomplete controls
Côme Chilliet [Mon, 11 Sep 2017 09:46:47 +0000 (11:46 +0200)]
Improved a bit error handling to avoid passing commands with incomplete controls

7 years agoAdded support and test for LDAP_CONTROL_VALUESRETURNFILTER
Côme Chilliet [Mon, 11 Sep 2017 09:37:55 +0000 (11:37 +0200)]
Added support and test for LDAP_CONTROL_VALUESRETURNFILTER

7 years agoRemoved client controls alltogether
Côme Chilliet [Thu, 7 Sep 2017 15:03:45 +0000 (17:03 +0200)]
Removed client controls alltogether

Client controls are ldap client lib specific and all the one
 I could find are ignoring client controls anyway.

7 years agoFixed ldap_exop test since rebase remove client controls
Côme Chilliet [Thu, 7 Sep 2017 14:47:59 +0000 (16:47 +0200)]
Fixed ldap_exop test since rebase remove client controls

7 years agoAdded support for controls in ldap_modify_batch
Côme Chilliet [Thu, 7 Sep 2017 12:42:34 +0000 (14:42 +0200)]
Added support for controls in ldap_modify_batch

7 years agoAdded controls support to ldap_compare
Côme Chilliet [Thu, 7 Sep 2017 10:19:36 +0000 (12:19 +0200)]
Added controls support to ldap_compare

Note: for functions like ldap_compare, ldap_delete, ldap_modify,
 a way to get the result object back will need to be added
 so that controls returned by the server may be analyzed.

7 years agoAdded controls support to ldap_rename
Côme Chilliet [Thu, 7 Sep 2017 09:57:13 +0000 (11:57 +0200)]
Added controls support to ldap_rename

7 years agoFixed prototypes in comments
Côme Chilliet [Thu, 7 Sep 2017 09:39:46 +0000 (11:39 +0200)]
Fixed prototypes in comments

7 years agoUsing new control syntax for MANAGEDSAIT control when deleting references
Côme Chilliet [Thu, 7 Sep 2017 09:36:20 +0000 (11:36 +0200)]
Using new control syntax for MANAGEDSAIT control when deleting references

7 years agoFixed wrong argument number error tests
Côme Chilliet [Thu, 7 Sep 2017 09:36:02 +0000 (11:36 +0200)]
Fixed wrong argument number error tests

7 years agoAdded controls support to ldap_delete
Côme Chilliet [Thu, 7 Sep 2017 09:21:47 +0000 (11:21 +0200)]
Added controls support to ldap_delete

7 years agoAdded support for controls in ldap_add, ldap_modify, ldap_mod_*
Côme Chilliet [Thu, 7 Sep 2017 09:04:52 +0000 (11:04 +0200)]
Added support for controls in ldap_add, ldap_modify, ldap_mod_*

Also added workaround for a bug in ldap_create_assertion_control_value
Made sure failed control creation aborts the operation
And added test for assertion control on ldap_modify

7 years agoAdded a test for assertion control
Côme Chilliet [Thu, 7 Sep 2017 07:33:01 +0000 (09:33 +0200)]
Added a test for assertion control

7 years agoAdded a test for PROXY_AUTHZ control on ldap_exop
Côme Chilliet [Wed, 6 Sep 2017 15:54:12 +0000 (17:54 +0200)]
Added a test for PROXY_AUTHZ control on ldap_exop

7 years agoAdded support for assert control value encoding
Côme Chilliet [Wed, 26 Jul 2017 09:51:29 +0000 (11:51 +0200)]
Added support for assert control value encoding

7 years agoAdded controls support to ldap_exop
Côme Chilliet [Wed, 6 Sep 2017 14:39:21 +0000 (16:39 +0200)]
Added controls support to ldap_exop

7 years agoAdded controls support to ldap_search, ldap_list and ldap_read.
Côme Chilliet [Wed, 26 Jul 2017 14:41:44 +0000 (16:41 +0200)]
Added controls support to ldap_search, ldap_list and ldap_read.

7 years agoAdded controls support to ldap_parse_result and ldap_exop_passwd
Côme Chilliet [Thu, 20 Jul 2017 10:17:59 +0000 (12:17 +0200)]
Added controls support to ldap_parse_result and ldap_exop_passwd

Known controls are parsed to and from associative arrays.
Only ppolicy and paged results are implemented for now.

7 years agoMerge branch 'PHP-7.2'
Andrea Faulds [Wed, 20 Sep 2017 23:05:55 +0000 (00:05 +0100)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Andrea Faulds [Wed, 20 Sep 2017 23:04:32 +0000 (00:04 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Wed, 20 Sep 2017 23:03:33 +0000 (00:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix bug #75236
Andrea Faulds [Wed, 20 Sep 2017 23:02:52 +0000 (00:02 +0100)]
Fix bug #75236