Fix bug #68074 Allow to use system cipher list instead of hardcoded value

Move smart_str implementation into Zend/

So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just m

Move smart_str implementation into Zend/

So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.

show more ...

s/PHP 5/PHP 7/

Merge branch 'PHP-5.6'

* PHP-5.6:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams

Bug #41631: Fix regression from first attempt (6569db8)

Bug #67965: Fix blocking behavior in non-blocking crypto streams

Fix compilation on systems without ecdh_curve

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer

Conflicts:
ext/openssl/xp_ssl.c

Fix stream_select() issue with OpenSSL buffer

Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Fix stream_select() issue with OpenSSL buffer

Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
ext/openssl/xp_ssl.c

show more ...

master renames phase 7

Merge branch 'master' of git.php.net:php-src

# By Daniel Lowrey
# Via Daniel Lowrey
* 'master' of git.php.net:php-src:
Update NEWS
Bug #67850: Build when OpenSSL compiled

Merge branch 'master' of git.php.net:php-src

# By Daniel Lowrey
# Via Daniel Lowrey
* 'master' of git.php.net:php-src:
Update NEWS
Bug #67850: Build when OpenSSL compiled without SSLv3 support

show more ...

Merge branch 'PHP-5.6'

* PHP-5.6:
Bug #67850: Build when OpenSSL compiled without SSLv3 support

master renames phase 1

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
ext/openssl/xp_ssl.c

Bug #67850: Build when OpenSSL compiled without SSLv3 support

ported ext/openssl

Merge remote-tracking branch 'php/master'

Conflicts:
ext/date/lib/parse_date.c

basic macro replacements, all at once

fix wrong pointer indirection

cleanup

cleanup (use zend_string* instead of char*)