]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4951d16) | patch
Merge branch 'PHP-7.0' into PHP-7.1 php-7.1.5RC1
authorAnatol Belski <ab@php.net>
Thu, 27 Apr 2017 09:11:41 +0000 (11:11 +0200)
committerJoe Watkins <krakjoe@php.net>
Thu, 27 Apr 2017 20:52:47 +0000 (21:52 +0100)
commitee9650c3d2b0ccc9bdeec3de33ad1950b8362005
treeeb3708baebd071a4ab0004bd6d9402dc4a53a2d8tree | snapshot
parent4951d16dba3b04657f09e6a804efd6b91cc9a187commit | diff
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"
ext/standard/tests/streams/parseip-001.phpt [deleted file] blob | history
main/streams/xp_socket.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.