diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-06 21:11:02 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-06 21:11:02 +0200 |
| commit | 3b7c58ecd8157320eb467e3f3a585b766ea5dd93 (patch) | |
| tree | c04bc95a455a9b359d8e20df08c4a16b2c3bd8c1 /ext/mysql/php_mysql.c | |
| parent | 64534830b1a6cbd14cc41d4a35273095cb15752b (diff) | |
| parent | 791c87ae484e71316c61808be5b324290dc9bd67 (diff) | |
| download | php-git-3b7c58ecd8157320eb467e3f3a585b766ea5dd93.tar.gz | |
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.
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions