From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 07:06:28 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b013e7935efb73e27ebc7d40dce7ef9a3644b14;p=php

Merge branch 'PHP-7.1'

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

5b013e7935efb73e27ebc7d40dce7ef9a3644b14