Merge branch 'PHP-7.2' into PHP-7.3
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 24 Apr 2019 22:04:37 +0000 (00:04 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 24 Apr 2019 22:04:37 +0000 (00:04 +0200)
commitad0acc0aa9fe4c31f881ca37bc47744d6cc7df8e
tree19c5c6ebd530c1160177b6971d93434e9c9defca
parent191e15309fce3df7839e52b1f488b0be83fa8561
parentfe202d99c8fff957509375411641687f47dfc17b
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77938: socket_get_option error