Anatol Belski
b8da481a2a
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Test to cover the change in ce1a0d97
2017-08-01 12:51:20 +02:00
Anatol Belski
d9d152b895
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Test to cover the change in ce1a0d97
2017-08-01 12:50:52 +02:00
Anatol Belski
a8e25fdbf8
Test to cover the change in ce1a0d97
2017-08-01 12:49:45 +02:00
Anatol Belski
2164e3a0b8
fix test
2017-08-01 11:56:23 +02:00
Anatol Belski
ce1a0d971b
fix NULL deref
2017-08-01 11:55:32 +02:00
Xinchen Hui
5856becc2b
Update NEWS
2017-07-31 11:52:23 +08:00
Xinchen Hui
9b87b73fec
Req #74963 (Improved error message on fetching property of non-object)
2017-07-31 11:51:23 +08:00
Kalle Sommer Nielsen
c62e5eb0a9
Reduce EXIF test image sizes, there is still one large image left that I will look into reducing if possible (bug50845.jpg)
...
The changes in phpts are due to exiftool, I verified that all the images still remain relevant for testing
2017-07-30 21:59:55 +02:00
Kalle Sommer Nielsen
97ff7bbb36
Lowercase the file extension
2017-07-30 21:59:10 +02:00
Anatol Belski
03383119d2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
remove dup of the binary file, rely on a test runtime copy instead
2017-07-30 17:52:36 +02:00
Anatol Belski
eab66f9068
remove dup of the binary file, rely on a test runtime copy instead
2017-07-30 17:51:27 +02:00
Christoph M. Becker
4db1e1adf2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Shrink another large image
2017-07-30 16:35:07 +02:00
Christoph M. Becker
2d6d1ec55b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Shrink another large image
2017-07-30 16:27:38 +02:00
Christoph M. Becker
2d96fdd54f
Shrink another large image
...
This image is only used for testing `BITMAPV5HEADER` support in
`getimagesize()` (see bf9ad4e
). Therefore it is not necessary to have
a big image; a single pixel is sufficient.
2017-07-30 16:26:06 +02:00
Frank Denis
0c21187363
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
...
* 'PHP-7.2' of git.php.net:php-src:
Shrink test image
2017-07-30 15:42:24 +02:00
Frank Denis
34df3cdafa
sodium ext: skip scrypt if it is not available
...
scrypt was removed from minimal libsodium builds in version 1.0.13
2017-07-30 15:41:34 +02:00
Frank Denis
650f68c36e
sodium ext: fix tests/pwhash_argon2i description
2017-07-30 15:05:21 +02:00
Christoph M. Becker
d53b78c6ed
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Shrink test image
2017-07-30 15:01:59 +02:00
Frank Denis
74d7f1d04e
sodium ext: check hash length for scrypt
2017-07-30 15:00:03 +02:00
Frank Denis
3f45262aa9
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
...
* 'PHP-7.2' of git.php.net:php-src:
It's `--SKIPIF--`, not `--SKIP--`
2017-07-30 14:48:44 +02:00
Frank Denis
85895b2e5b
sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES
...
chacha20poly1305_ietf was implemented in libsodium 1.0.4 which is way earlier
than the minimum version we support.
2017-07-30 14:47:49 +02:00
Frank Denis
1d7e1f845f
sodium ext: check that message sizes are safe, to avoid hitting abort() in libsodium
2017-07-30 14:45:06 +02:00
Christoph M. Becker
82e4ad3983
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Shrink test image
2017-07-30 14:44:52 +02:00
Christoph M. Becker
74a696d53b
Shrink test image
...
The last (`IDAT`) chunk in this file starting at `0x5e265` reports to
have a length of `0x2000` bytes, but there are only `0x1D9B` bytes
left. Simply cutting the first `IDAT` chunk which starts at `0x31` and
also reports a length of `0x2000` at the same offset should produce the
same test results (while reducing the file size to 7.628 bytes).
2017-07-30 14:43:37 +02:00
Frank Denis
ae99959986
sodium ext: use unexpand -t 4 --first-only to convert from spaces to tabs
...
No actual code changes.
Fun fact: macOS' unexpand(1) tool doesn't work as documented, and always
converts everything to tabs, regardless of the -a switch.
2017-07-30 14:34:55 +02:00
Christoph M. Becker
782f45c8e6
It's --SKIPIF--
, not --SKIP--
2017-07-30 14:01:51 +02:00
Christoph M. Becker
71e47c5c13
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Skip this test if ext/gd is not available
2017-07-30 13:37:36 +02:00
Christoph M. Becker
f213ee5952
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Skip this test if ext/gd is not available
2017-07-30 13:30:18 +02:00
Christoph M. Becker
4d6f808c16
Skip this test if ext/gd is not available
2017-07-30 13:24:10 +02:00
Frank Denis
613c8dd7b0
sodium ext: let crypto_pwhash() accept an optional algorithm identifier
2017-07-29 13:04:54 +02:00
Nikita Popov
5d777e56e2
Merge branch 'PHP-7.1' into PHP-7.2
2017-07-28 13:03:26 +02:00
Nikita Popov
c48c638aeb
Merge branch 'PHP-7.0' into PHP-7.1
2017-07-28 13:03:02 +02:00
Nikita Popov
e3d25e78eb
Fixed bug #62934
2017-07-28 13:02:25 +02:00
Anatol Belski
80d839d25a
add missing makefile fragment for .w32
...
ensure correct dir
2017-07-28 07:26:11 +02:00
Anatol Belski
2ae0dd7f61
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
relax test on travis
2017-07-28 00:28:12 +02:00
Anatol Belski
55e7459cea
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
relax test on travis
2017-07-28 00:27:52 +02:00
Anatol Belski
b01336814d
relax test on travis
2017-07-28 00:27:11 +02:00
Sara Golemon
4a6ef8327a
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Simpler fix for #74974
2017-07-27 10:04:59 -04:00
Sara Golemon
b62fb3aa0c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Simpler fix for #74974
2017-07-27 10:04:14 -04:00
Pedro Magalhães
34e5d3a87d
Simpler fix for #74974
2017-07-27 09:25:38 -04:00
Xinchen Hui
262aeb8ae1
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed test
2017-07-27 12:50:41 +08:00
Xinchen Hui
0ddda0dcb7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed test
2017-07-27 12:50:28 +08:00
Xinchen Hui
9fcfe52d03
Fixed test
2017-07-27 12:50:17 +08:00
Xinchen Hui
afc2be8fc8
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS
Fixed bug #74949 (null pointer dereference in _function_string)
2017-07-27 11:24:53 +08:00
Xinchen Hui
f894bb750c
Update NEWS
2017-07-27 11:24:26 +08:00
Xinchen Hui
efb1be547c
Update NEWS
2017-07-27 11:23:52 +08:00
Xinchen Hui
84a18c4782
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74949 (null pointer dereference in _function_string)
2017-07-27 11:23:27 +08:00
Xinchen Hui
e36c04ef48
Fixed bug #74949 (null pointer dereference in _function_string)
2017-07-27 11:23:06 +08:00
Sara Golemon
08fef4cc23
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
2017-07-26 18:56:06 -04:00
Sara Golemon
80f4297c25
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
2017-07-26 18:55:46 -04:00