[commits] Socket_Client branch FRAMEWORK_5_2 updated. 4a6b85a484cca2c54e274ec43b04889cc881b0e7

[jan at horde.org]

The branch "FRAMEWORK_5_2" has been updated.
The following is a summary of the commits.

from: a4da536f8f8adb67a3ac5b29aa6f9ce88011722d

a12851b Fix SSL socket options overrides
e3aca07 [jan] Fix setting 'verify' context parameters (Christoph Wurst <christoph at winzerhof-wurst.at>, GH PR #3).
ad6b034 Released Socket_Client-2.1.3
4a6b85a Development mode for Socket_Client-2.1.4

Summary: https://github.com/horde/Socket_Client/compare/a4da536f8f8a...4a6b85a484cc

-----------------------------------------------------------------------

commit a12851b82d011ac736074dbc8083638748bebef2
Author: Christoph Wurst <christoph at winzerhof-wurst.at>
Date:   Sun, 15 Mar 2020 19:02:38 +0100

Fix SSL socket options overrides

Php's `array_merge_recursive` can't be used for custom SSL options as it
combines duplicate key values into an array. Hence a passed context of

```php
[
  'ssl' => [
    'verify_peer' => true,
    'verify_peer_name' => true,
]
```

resulted in

```php
[
  'ssl' => [
    'verify_peer' => [true, false],
    'verify_peer_name' => [true, false],
]
```

`array_replace_recursive` does the expected replacement.

Proof: https://3v4l.org/bNfs2

This is neccessary to do peer verification with the Horde libs, as
discussed at https://bugs.horde.org/ticket/13730

Signed-off-by: Christoph Wurst <christoph at winzerhof-wurst.at>

 M lib/Horde/Socket/Client.php

https://github.com/horde/Socket_Client/commit/a12851b82d011ac736074dbc8083638748bebef2

-----------------------------------------------------------------------

commit e3aca074d73a3b1350a3fc76da4a30a7ccfec2e5
Author: Jan Schneider <jan at horde.org>
Date:   Sun, 15 Mar 2020 19:02:46 +0100

[jan] Fix setting 'verify' context parameters (Christoph Wurst <christoph at winzerhof-wurst.at>, GH PR #3).

 M doc/Horde/Socket/Client/changelog.yml

https://github.com/horde/Socket_Client/commit/e3aca074d73a3b1350a3fc76da4a30a7ccfec2e5

-----------------------------------------------------------------------

commit ad6b034780ab4ab394728fa7da60b3c88b72e9a3
Author: Jan Schneider <jan at horde.org>
Date:   Sun, 15 Mar 2020 19:03:29 +0100

Released Socket_Client-2.1.3

 M composer.json
 M doc/Horde/Socket/Client/CHANGES
 M doc/Horde/Socket/Client/changelog.yml
 M package.xml

https://github.com/horde/Socket_Client/commit/ad6b034780ab4ab394728fa7da60b3c88b72e9a3

-----------------------------------------------------------------------

commit 4a6b85a484cca2c54e274ec43b04889cc881b0e7
Author: Jan Schneider <jan at horde.org>
Date:   Sun, 15 Mar 2020 19:03:40 +0100

Development mode for Socket_Client-2.1.4

 M .horde.yml
 M composer.json
 M doc/Horde/Socket/Client/CHANGES
 M doc/Horde/Socket/Client/changelog.yml
 M package.xml

https://github.com/horde/Socket_Client/commit/4a6b85a484cca2c54e274ec43b04889cc881b0e7