]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Wed, 6 Aug 2014 04:30:56 +0000 (21:30 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 6 Aug 2014 04:30:56 +0000 (21:30 -0700)
commite0456bfd29825bcda0ca7a137b7ee6675dc89a8b
tree19a797cc900291f768865f7ed59cb5d68464ab6b
parentf6b530bd5431dbf64a84598014f7cce16daa9350
parent9e3bc199326ed73d1ea13249284da9b74832e1c3
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option

Conflicts:
main/streams/xp_socket.c