]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6453483 791c87a)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 6 Aug 2014 19:11:02 +0000 (21:11 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 6 Aug 2014 19:11:02 +0000 (21:11 +0200)
* 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.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.