From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 6 Aug 2014 19:11:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b7c58ecd8157320eb467e3f3a585b766ea5dd93;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"

  Didn't actually merged the revert as we wan't to keep this in master, but merged it with -s ours.
---

3b7c58ecd8157320eb467e3f3a585b766ea5dd93