diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-08-05 21:30:56 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-08-05 21:30:56 -0700 |
| commit | e0456bfd29825bcda0ca7a137b7ee6675dc89a8b (patch) | |
| tree | 19a797cc900291f768865f7ed59cb5d68464ab6b /ext/mysql/php_mysql.c | |
| parent | f6b530bd5431dbf64a84598014f7cce16daa9350 (diff) | |
| parent | 9e3bc199326ed73d1ea13249284da9b74832e1c3 (diff) | |
| download | php-git-e0456bfd29825bcda0ca7a137b7ee6675dc89a8b.tar.gz | |
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
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions