com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/ tests/streams/stream_socket_enable_crypto.phpt
| From: | Nikita Popov | Date: | Sun, 07 Aug 2016 16:38:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/ tests/streams/stream_socket_enable_crypto.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93666@lists.php.net to get a copy of this message | ||
Commit: 56d7e98ddf8ccf18d41771482bc5434d3c615c35
Author: Nikita Popov <nikic@php.net> Sun, 7 Aug 2016 18:38:28 +0200
Parents: dd7cdab8e4a0779e714975f52950b277e565ccda 40d237df1f3f556394a100e052c8fb4d05fd1893
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56d7e98ddf8ccf18d41771482bc5434d3c615c35
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM ext/standard/tests/streams/stream_socket_enable_crypto.phpt
Diff: