Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().

fix warning

Add FAST_ZPP to various important stream funcs

This can not be true

Cleanup (avoid reallocation)

Cleanup (avoid reallocatios and side effects in php_strip_tags)

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).

Improved zend_string API (Francois Laupretre)

Squashed commit of the following:

commit d96eab8d79b75ac83d49d49ae4665f948d15a804
Author: Francois Laupretre <francois@tekwire.net>

Improved zend_string API (Francois Laupretre)

Squashed commit of the following:

commit d96eab8d79b75ac83d49d49ae4665f948d15a804
Author: Francois Laupretre <francois@tekwire.net>
Date: Fri Jun 26 01:23:31 2015 +0200

Use the new 'ZSTR' macros in the rest of the code.

Does not change anything to the generated code (thanks to compat macros) but cleaner.

commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8
Author: Francois Laupretre <francois@tekwire.net>
Date: Thu Jun 25 13:45:06 2015 +0200

Improve zend_string API

Add missing methods

show more ...

cleanup redundant S_IFDIR declaration

Fixes for x32 ABI

I'm assuming that we want to have 64bit zend_longs on x32 here.

This fixes two typos in __x86_64__ macros and adds sign-extension
when assigning STREAM_COPY_AL

Fixes for x32 ABI

I'm assuming that we want to have 64bit zend_longs on x32 here.

This fixes two typos in __x86_64__ macros and adds sign-extension
when assigning STREAM_COPY_ALL to zend_long.

show more ...

Merge branch 'PHP-5.6'

* PHP-5.6:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file

Merge branch 'PHP-5.6'

* PHP-5.6:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list

Conflicts:
Zend/zend_alloc.c
Zend/zend_operators.c
ext/ftp/ftp.c
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/dir.c
ext/standard/file.c
ext/standard/pack.c
ext/standard/string.c
main/rfc1867.c

show more ...

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forg

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list

Conflicts:
ext/standard/pack.c

show more ...

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forg

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list

Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt

show more ...

Fixed bug #69418 - more s->p fixes for filenames

Fixed bug #68887 (resources are not freed correctly)

Fixed bug #69325 (php_copy_file_ex does not pass the argument)

Revert "Add stream_socket_crypto_info() function"

This reverts commit 13acb7ec653c543c56437ed417c3889fbf54f608.

With the added capability to negotiate application layer protocols

Revert "Add stream_socket_crypto_info() function"

This reverts commit 13acb7ec653c543c56437ed417c3889fbf54f608.

With the added capability to negotiate application layer protocols
via the TLS ALPN extension userland needs a method to access the
negotiated protocol on a given stream. The reverted commit added
a new stream_socket_crypto_info() function for this purpose.

This original approach was discarded in favor of using the
already-existing stream_get_meta_data() API which specifically
exists for just such purposes and requires the addition of no new
functions.

show more ...

Merge branch 'tls-alpn'

* tls-alpn:
Improve test to target specific issue
Misc updates/cleanup
Add TLS ALPN extension support in crypto client/server streams
Add stre

Merge branch 'tls-alpn'

* tls-alpn:
Improve test to target specific issue
Misc updates/cleanup
Add TLS ALPN extension support in crypto client/server streams
Add stream_socket_crypto_info() function
Update for compatibility with newer openssl libs

show more ...

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

Add TLS ALPN extension support in crypto client/server streams

Add stream_socket_crypto_info() function

Merge branch 'PHP-5.6'

* PHP-5.6:
revisit fix for bug #65272

Conflicts:
ext/standard/file.c

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
revisit fix for bug #65272

Conflicts:
ext/standard/file.c

revisit fix for bug #65272

Fixed initialization of global variables in ZTS (this caused valgrind reports on few PHPT tests)