| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| | |
* PHP-5.6:
Happy new year (Update copyright to 2016)
|
| | |
|
| | |
|
| |
| |
| |
| | |
either remains or merged in from PHP5
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
semantick changes).
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.
All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).
What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.
Also fixes bug #69788.
|
|\ \
| |/
| |
| |
| |
| |
| | |
* PHP-5.6:
fix test description
Fixed Buf #68812 Unchecked return value.
Fixed Buf #68812 Unchecked return value.
|
| |\
| | |
| | |
| | |
| | |
| | | |
* PHP-5.5:
fix test description
Fixed Buf #68812 Unchecked return value.
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* PHP-5.6:
move test
|
| |\ \
| | |/
| | |
| | |
| | | |
* PHP-5.5:
move test
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* PHP-5.6:
fix new test
|
| |\ \
| | |/
| | |
| | |
| | | |
* PHP-5.5:
fix new test
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* PHP-5.6:
NEWS 5.6
NEWS 5.5
Fixed Bug #69667 segfault in php_pgsql_meta_data
fix test output (32bits)
Conflicts:
ext/pgsql/pgsql.c
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
* PHP-5.5:
NEWS 5.5
Fixed Bug #69667 segfault in php_pgsql_meta_data
fix test output (32bits)
|
| | |
| | |
| | |
| | | |
Incomplete fix for #68741
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* PHP-5.6: (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:
Zend/zend_exceptions.c
ext/curl/interface.c
ext/dom/document.c
ext/fileinfo/libmagic/softmagic.c
ext/gd/gd.c
ext/hash/hash.c
ext/pgsql/pgsql.c
ext/phar/phar.c
ext/phar/phar_internal.h
ext/standard/http_fopen_wrapper.c
ext/standard/link.c
ext/standard/streamsfuncs.c
ext/xmlwriter/php_xmlwriter.c
ext/zlib/zlib.c
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* PHP-5.4.40:
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)
Fixed bug #68901 (use after free)
Fixed bug #68740 (NULL Pointer Dereference)
Fix bug #66550 (SQLite prepared statement use-after-free)
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
Fix bug #68601 buffer read overflow in gd_gif_in.c
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
Fixed bug #69293
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
|
| | | | |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
* PHP-5.5:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | | |
* PHP-5.4:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
zend_string_extend() and zend_string_truncate()
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
ext/ereg/config.w32
ext/ereg/config0.m4
ext/ereg/ereg.c
ext/ereg/php_ereg.h
ext/ereg/php_regex.h
ext/ereg/regex/engine.c
ext/ereg/regex/main.c
ext/ereg/regex/regcomp.c
ext/ereg/regex/regerror.c
ext/ereg/tests/split_error_002.phpt
ext/ereg/tests/split_variation_003.phpt
ext/ereg/tests/spliti_error_002.phpt
ext/ereg/tests/spliti_variation_003.phpt
ext/pgsql/pgsql.c
sapi/apache/php_apache_http.h
sapi/apache_hooks/php_apache_http.h
|
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 1981dd9c73ada7ea893b4636b84211f68838ba23.
|
| | | | |
| | | | |
| | | | |
| | | | | |
which also comply with the current semantics for such macros
|
|\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Conflicts:
ext/pgsql/pgsql.c
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
Conflicts:
ext/pgsql/pgsql.c
|
| | | | | |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix indent
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Check if value is "infinity" with strcasestr() to add quotes
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add quotes only if "infinity" values are received.
|