summaryrefslogtreecommitdiff
path: root/main/streams/plain_wrapper.c
diff options
context:
space:
mode:
authorDaniel Lowrey <rdlowrey@php.net>2015-03-11 09:45:28 -0600
committerDaniel Lowrey <rdlowrey@php.net>2015-03-11 09:45:28 -0600
commit589374d02723ad71a35e0512fdd65a1c7d18bf69 (patch)
treebf2ad8929af4371229c72677fdebdd003c5a0660 /main/streams/plain_wrapper.c
parentc532376ee78342fb170c5d2b7784b3ab79491494 (diff)
parentc66112145993aaf271acd436a5d830783ad4c5ed (diff)
downloadphp-git-589374d02723ad71a35e0512fdd65a1c7d18bf69.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Don't block on crypto data inside stream_select()
Diffstat (limited to 'main/streams/plain_wrapper.c')
0 files changed, 0 insertions, 0 deletions