Anatol Belski
b204b3abd1
further normalizations, uint vs uint32_t
...
fix merge mistake
yet one more replacement run
2016-11-26 17:29:01 +01:00
Christoph M. Becker
1b7e014d1c
Merge branch 'PHP-7.1'
2016-11-26 16:11:08 +01:00
Christoph M. Becker
09085ac02c
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-26 16:09:45 +01:00
Christoph M. Becker
003727d851
Fix #73612 : preg_*() may leak memory
...
We have to make sure that collectible zvals end up in the GC root
buffer, to avoid memory leaks.
2016-11-26 15:34:27 +01:00
Stanislav Malyshev
b1ff0c5270
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 18:58:06 -08:00
Stanislav Malyshev
fe994fd9a4
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 18:57:18 -08:00
Stanislav Malyshev
1229b2be26
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix more size_t/int implicit conversions
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 18:57:06 -08:00
Stanislav Malyshev
f9a80a0a29
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix more size_t/int implicit conversions
2016-11-25 15:32:59 -08:00
Stanislav Malyshev
8be94d46f8
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 15:31:50 -08:00
Stanislav Malyshev
bcc913fa8b
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 15:31:50 -08:00
Stanislav Malyshev
ffb65ba833
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
...
* 'PHP-7.1' of git.php.net:php-src:
Fix #73582 : Failing ext/gd/tests/imagettftext_charmap_order.phpt
2016-11-25 15:31:22 -08:00
Stanislav Malyshev
7010547c4e
Fix more size_t/int implicit conversions
...
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
2016-11-25 15:30:20 -08:00
Anatol Belski
b8645ef29e
fix oniguruma.h copying
2016-11-25 23:55:27 +01:00
Christoph M. Becker
a35359f8b7
Merge branch 'PHP-7.1'
2016-11-25 23:33:02 +01:00
Christoph M. Becker
51ba53ed0f
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-25 23:27:13 +01:00
Christoph M. Becker
bc979aee6d
Merge branch 'PHP-5.6' into PHP-7.0
2016-11-25 23:16:18 +01:00
Christoph M. Becker
7f529e3dee
Fix #73582 : Failing ext/gd/tests/imagettftext_charmap_order.phpt
...
This test is not supposed to work with JIS-mapped Japanese font support
enabled.
2016-11-25 23:14:08 +01:00
Anatol Belski
6a34065bf0
fix tests
2016-11-25 23:04:15 +01:00
Stanislav Malyshev
2cc3df3252
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 13:43:59 -08:00
Stanislav Malyshev
cb6bcaa61f
Fix int/size_t confusion in isValidPharFilename (bug #73580 )
2016-11-25 13:42:35 -08:00
Anatol Belski
04eb73638b
remove generated file
2016-11-25 22:07:00 +01:00
Anatol Belski
2a76d2282a
upgrade to Oniguruma 6.1.2
2016-11-25 22:00:53 +01:00
Anatol Belski
35a3c6e2b9
fix spelling
2016-11-25 19:27:01 +01:00
Anatol Belski
714ded8049
update UPGRADING
2016-11-25 19:01:13 +01:00
Nikita Popov
5af586bec5
Remove more PHP 6 leftovers from tests
2016-11-24 22:39:39 +01:00
Anatol Belski
895a82695c
Merge branch 'PHP-7.1'
...
* PHP-7.1:
add test for bug #57547
2016-11-24 19:28:56 +01:00
Anatol Belski
c26e96a05d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
add test for bug #57547
2016-11-24 19:27:50 +01:00
Anatol Belski
a36dd1dfd8
add test for bug #57547
2016-11-24 19:25:47 +01:00
Sebastian Bergmann
13dcab0328
Bump Zend Engine version
2016-11-24 18:43:00 +01:00
Anatol Belski
99c7ad7aa8
add test for FILEINFO_EXTENSION flag
2016-11-24 18:05:11 +01:00
Anatol Belski
52f5b9659f
Add test for bug #67516
2016-11-24 17:59:09 +01:00
Anatol Belski
4c00c5ebed
fix test
2016-11-24 17:44:05 +01:00
Anatol Belski
31a3956053
apply the current Fedora's data patches
2016-11-24 17:43:16 +01:00
Anatol Belski
5f4699c0ca
fix c/p mistake
2016-11-24 16:41:57 +01:00
Anatol Belski
6b14989001
catch up with new finfo constant
2016-11-24 16:23:35 +01:00
Anatol Belski
020b87a40d
update libmagic.patch
2016-11-24 14:58:54 +01:00
Anatol Belski
0e9912dc6f
maintain patch level
2016-11-24 14:56:30 +01:00
Anatol Belski
918e626338
the vanilla data is used for now, seems everything is incorporated
2016-11-24 14:50:55 +01:00
Anatol Belski
3ef069d26c
more fileinfo test fixes
...
Note the behavior change, FILEINFO_CONTINUE will now always
append a string \012-. I'm leaving this as is for now, as this is
the behavior change in libmagic.
2016-11-24 14:48:33 +01:00
Anatol Belski
c62b732696
fix tests
2016-11-24 14:36:49 +01:00
Anatol Belski
411e97c72d
Upgraded libmagic to 5.29
...
yet unfinished port to libmagic 5.28
catch with missing libmagic port pieces
regenerate data file with magic from 5.28
test magic files from 5.28
missing files
fix path
pure c99 is still not supported
move right to 5.29, yet some bugs present
more sync with orig lib
more ZMM usage
use unpatched data for now
partial revert according to bug #67705
Revert "more ZMM usage"
This reverts commit 5e3c9b851034b455942b219b18bdc49c8315c3ee.
several fixes, so it's now closer to the clean port
2016-11-24 13:44:04 +01:00
Derick Rethans
b8664adc9b
Updated to version 2016.10 (2016j)
2016-11-24 10:40:17 +00:00
Derick Rethans
4a96b93715
Empty merge
2016-11-24 10:40:16 +00:00
Derick Rethans
ec366eac5f
Updated to version 2016.10 (2016j)
2016-11-24 10:40:15 +00:00
Derick Rethans
54b9cd5443
Empty merge
2016-11-24 10:40:15 +00:00
Derick Rethans
c38f2c2a6b
Updated to version 2016.10 (2016j)
2016-11-24 10:40:14 +00:00
Derick Rethans
0fcb39dbaa
Empty merge
2016-11-24 10:40:13 +00:00
Derick Rethans
6785ea2340
Updated to version 2016.10 (2016j)
2016-11-24 10:40:11 +00:00
Xinchen Hui
fd8797298b
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Update NEWS
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)
2016-11-24 12:05:07 +08:00
Xinchen Hui
f6bbeab67f
Update NEWS
2016-11-24 12:04:03 +08:00
