Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Over

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix test
fix type in fix for #69085
fix memory leak & add test
Fix tests
fix CVE num
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
...

Conflicts:
ext/standard/http_fopen_wrapper.c

show more ...

Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
fix memory leak & add test
Fix tests

fix memory leak & add test

Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test

Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug (#69195 Inconsistent stream crypto values across versions)

Conflicts:
ext/standard/http_fopen_wrapper.c

Fixed bug (#69195 Inconsistent stream crypto values across versions)

PHP 5.6.0 altered the semantics of the following constants:

- STREAM_CRYPTO_METHOD_SSLv23_CLIENT
- STREAM_CR

Fixed bug (#69195 Inconsistent stream crypto values across versions)

PHP 5.6.0 altered the semantics of the following constants:

- STREAM_CRYPTO_METHOD_SSLv23_CLIENT
- STREAM_CRYPTO_METHOD_SSLv23_SERVER
- STREAM_CRYPTO_METHOD_TLS_CLIENT
- STREAM_CRYPTO_METHOD_TLS_SERVER

Instead of representing the SSLv23_*() handshake methods the v23
constants were changed to allow only SSLv2 or SSLv3 connections.
Likewise, the TLS methods were modified from using only the TLSv1
handshake to allowing TLS1,1.1, and 1.2. This created a situation
in which users upgrading from previous versions faced a potential
security degradation if they did not update code to use different
constants. In the interest of compatibility across PHP versions
the original semantics have been restored with the following
caveat:

**IMPORTANT**

The SSLv23 client/server methods will no longer negotiate the use
of the insecure SSLv2 or SSLv3 protocols by default. Users wishing
to allow these protocols must explicitly add them to the method
bitmask via the appropriate flags.

show more ...

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

Merged zend_array and HashTable into the single data structure.
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed t

Merged zend_array and HashTable into the single data structure.
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.

show more ...

fix warnings

bump year

bump year

Bump year

trailing whitespace removal

Improved trim/ltrim/rtrim functions.
Now php_trim() operates on zend_string and returns zend_string (it may return the same zend_string).

first shot remove TSRMLS_* things

fix datatype mismatches

Add smart_str_append for appending zend_strings

Also replaces usages in Zend/ and ext/standard

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/

removed the emalloc result check, out of memory will bailout

check emalloc() result

better way to check for an empty string

master renames phase 1

yet more fixes to zpp