From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 07:06:11 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c961beb5de556dc18ea167e17857a41827876564;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74400 (phpdbg comparing socket function to int)
---

c961beb5de556dc18ea167e17857a41827876564