diff options
| author | Anatol Belski <ab@php.net> | 2014-08-04 09:18:42 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-04 09:18:42 +0200 |
| commit | 860f0ca1aac3c389565011580fcfa8a2f5b54bc6 (patch) | |
| tree | a6853a9c572f282849dcb9eef44fccf362615613 /main/php_variables.c | |
| parent | be8f557e77ccfec5d03b209fe9d394d75fd62325 (diff) | |
| parent | f5deb18b205f89cb6708f97f451b43ad5ece4197 (diff) | |
| download | php-git-860f0ca1aac3c389565011580fcfa8a2f5b54bc6.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (46 commits)
Fix wrong lenght size
Bug #51096 - Remove unnecessary ? for first/last day of
Moved streams related functions to xp_ssl.c
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
We need to turn off any strict mode here for this warning to show up
Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Revert "Fix bug #67064 in a BC safe way"
Updated NEWS for #67693
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
add missing entry to NEWS
add missing entries to NEWS
add NEWS block for the next RC
NEWS entry for #67713
...
Conflicts:
Zend/zend_language_parser.y
ext/odbc/php_odbc.c
ext/openssl/openssl.c
ext/spl/spl_directory.c
ext/spl/spl_iterators.c
ext/sqlite3/sqlite3.c
ext/standard/array.c
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions