Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
ext/mysqlnd/mysqlnd.c

show more ...

Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Switch position of ce in exception ce variable names

Change zend_exception_get_default() to zend_exception_ce

Cleanup (avoid reallocation)

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

Get rid of more ZVAL_ZVAL() macros

Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places).
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)

Fixed bug #68901 (use after free)

Always throw TypeException on throwing zpp failures

Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,

Always throw TypeException on throwing zpp failures

Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.

Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.

Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.

show more ...

Merge branch 'InternalClassClean'

* InternalClassClean:
Fixed test
Patch improvement:
Fixed indentation. Fixed comment style. Fixed commented out code.
Reverted chang

Merge branch 'InternalClassClean'

* InternalClassClean:
Fixed test
Patch improvement:
Fixed indentation. Fixed comment style. Fixed commented out code.
Reverted change to function name and added note of why it is different from the class it is actually changing.
Made UConverter throw an exception if the constructor fails.
Fixed PDO constructor to not return null.
Fixed fileinfo behaviour.
Made Phar throw exception on bad constructor.
Converted intl extension to use IntlException in constructors.
Fixed SplFixedArray and tests.
Fixed ReflectionExtension and ReflectionProperty.
Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
Fixed PDORow behaviour and message.

show more ...

Patch improvement:

Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.

Merge branch 'PHP-5.6'

* PHP-5.6:
BFN
Fixed bug #64931

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #64931

Fixed bug #64931

phar_add_file is too restrive on filename

Check for any of '/', '\\', '\0' after ".phar".

Merge branch 'InternalClassClean' of github.com:Danack/php-src into InternalClassClean

* 'InternalClassClean' of github.com:Danack/php-src:
Fixed indentation. Fixed comment style. Fixe

Merge branch 'InternalClassClean' of github.com:Danack/php-src into InternalClassClean

* 'InternalClassClean' of github.com:Danack/php-src:
Fixed indentation. Fixed comment style. Fixed commented out code.
Reverted change to function name and added note of why it is different from the class it is actually changing.
Made UConverter throw an exception if the constructor fails.
Fixed PDO constructor to not return null.
Fixed fileinfo behaviour.
Made Phar throw exception on bad constructor.
Converted intl extension to use IntlException in constructors.
Fixed SplFixedArray and tests.
Fixed ReflectionExtension and ReflectionProperty.
Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
Fixed PDORow behaviour and message.

show more ...

Made Phar throw exception on bad constructor.

Fix some memory leaks in WebPhar

Revert "Fixed phar file action failure after engine exception rfc been merged"

This reverts commit f174859acdb9d99176440a30b6608388a383de3f.

Fixed phar file action failure after engine exception rfc been merged

Remove PHAR_GLOBALS (make it respect ZEND_ENABLE_STATIC_TSRMLS_CACHE)

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

Merge branch 'PHP-5.6'

Conflicts:
ext/phar/phar_object.c

Merge branch 'PHP-5.5' into PHP-5.6

Fixed bug #68901 (use after free)