| #
2181ed2e |
| 05-Mar-2015 |
Anatol Belski |
started to patch for libmagic.next
everything is broken yet |
|
Revision tags: POST_PHP7_EREG_MYSQL_REMOVALS, PRE_PHP7_EREG_MYSQL_REMOVALS, php-5.6.6, php-5.5.22, php-5.4.38, POST_PHP7_REMOVALS, PRE_PHP7_REMOVALS, php-5.6.6RC1, php-5.5.22RC1, php-5.5.21, php-5.6.5, php-5.4.37, php-5.5.21RC1, php-5.6.5RC1 |
|
| #
b7a7b1a6 |
| 03-Jan-2015 |
Stanislav Malyshev |
trailing whitespace removal |
| #
72331981 |
| 04-Jan-2015 |
Anatol Belski |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
|
| #
28e44f9d |
| 04-Jan-2015 |
Anatol Belski |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #68735 fileinfo out-of-bounds memory access
|
| #
ede59c8f |
| 04-Jan-2015 |
Anatol Belski |
Fixed bug #68735 fileinfo out-of-bounds memory access |
|
Revision tags: POST_NATIVE_TLS_MERGE, PRE_NATIVE_TLS_MERGE, php-5.5.20, php-5.4.36, php-5.6.4 |
|
| #
bdeb220f |
| 13-Dec-2014 |
Anatol Belski |
first shot remove TSRMLS_* things |
|
Revision tags: php-5.6.4RC1, php-5.5.20RC1, php-5.6.3, php-5.5.19, php-5.4.35, php-5.6.3RC1, php-5.5.19RC1, php-5.5.18 |
|
| #
c00424e4 |
| 15-Oct-2014 |
Anatol Belski |
bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream |
|
Revision tags: php-5.4.34, php-5.5.18RC1, php-5.6.1 |
|
| #
26e5f9ba |
| 26-Sep-2014 |
Anatol Belski |
cleanup TSRMLS_FETCH in ext/fileinfo |
|
Revision tags: php-5.6.2 |
|
| #
3bc8a958 |
| 19-Sep-2014 |
Dmitry Stogov |
Fixed useless or duplicated IS_INTERNED() checks |
|
Revision tags: php-5.4.33, php-5.5.17, php-5.6.1RC1, php-5.5.17RC1, php-5.4.33RC1, php-5.6.0, POST_AST_MERGE, PRE_AST_MERGE |
|
| #
af59e92b |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 7 |
| #
c3e3c98e |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 1 |
|
Revision tags: POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32 |
|
| #
63d3f0b8 |
| 19-Aug-2014 |
Anatol Belski |
basic macro replacements, all at once |
|
Revision tags: POST_PHPNG_MERGE, PRE_PHPNG_MERGE, php-5.6.0RC4, php-5.3.29 |
|
| #
4c716e8b |
| 11-Aug-2014 |
Dmitry Stogov |
Merge branch 'master' into test
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and
Merge branch 'master' into test
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631: Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
show more ...
|
| #
3dc9bef8 |
| 06-Aug-2014 |
Andrey Hristov |
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
|
|
Revision tags: php-5.5.16RC1, php-5.4.32RC1 |
|
| #
28786a2f |
| 04-Aug-2014 |
Stanislav Malyshev |
Fix bug #67705 (extensive backtracking in rule regular expression) |
| #
eeaec707 |
| 04-Aug-2014 |
Stanislav Malyshev |
Fix bug #67705 (extensive backtracking in rule regular expression) |
|
Revision tags: php-5.3.29RC1, php-5.6.0RC3, php-5.5.15, php-5.4.31, php-5.4.31RC1, php-5.5.15RC1, php-5.6.0RC2, php-5.4.30, php-5.5.14, php-5.6.0RC1 |
|
| #
dd1c68e6 |
| 12-Jun-2014 |
Dmitry Stogov |
Merge branch 'master' into phpng
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
Merge branch 'master' into phpng
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
show more ...
|
|
Revision tags: php-5.5.14RC1, php-5.4.30RC1 |
|
| #
5e7cb438 |
| 10-Jun-2014 |
Remi Collet |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
|
| #
e77659a8 |
| 10-Jun-2014 |
Remi Collet |
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
Upstream
https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08 |
|
Revision tags: php-5.6.0beta4, php-5.4.29, php-5.5.13, php-5.5.13RC1, php-5.6.0beta3, php-5.4.29RC1 |
|
| #
449ea00a |
| 07-May-2014 |
Dmitry Stogov |
Fixed ext/fileinfo conversion mistakes |
| #
9ef21b76 |
| 07-May-2014 |
Xinchen Hui |
Refactor fileinfo |
|
Revision tags: php-5.6.0beta2, php-5.5.12, php-5.4.28, php-5.4.28RC1, php-5.5.12RC1, php-5.6.0beta1, php-5.4.27, php-5.5.11, php-5.5.11RC1, php-5.4.27RC1, php-5.5.10, php-5.4.26 |
|
| #
9a9add6b |
| 04-Mar-2014 |
Remi Collet |
fix merge
|
| #
a33759fd |
| 04-Mar-2014 |
Remi Collet |
Fixed Bug #66820 out-of-bounds memory access in fileinfo
Upstream fix:
https://github.com/glensc/file/commit/447558595a3650db2886cd2f416ad0beba965801
Notice, test changed, with
Fixed Bug #66820 out-of-bounds memory access in fileinfo
Upstream fix:
https://github.com/glensc/file/commit/447558595a3650db2886cd2f416ad0beba965801
Notice, test changed, with upstream agreement:
-define OFFSET_OOB(n, o, i) ((n) < (o) || (i) >= ((n) - (o)))
+define OFFSET_OOB(n, o, i) ((n) < (o) || (i) > ((n) - (o)))
show more ...
|
| #
834b719c |
| 04-Mar-2014 |
Remi Collet |
fix merge
|
| #
731013ee |
| 04-Mar-2014 |
Remi Collet |
Improves fix for memory leak, keep in sync with upstream.
Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2
Upstream fix:
Improves fix for memory leak, keep in sync with upstream.
Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2
Upstream fix:
https://github.com/glensc/file/commit/c0c0032b9e9eb57b91fefef905a3b018bab492d9
show more ...
|
