clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
103,653 Commits 494 Branches 1,367 Tags 785 MiB
a0d1e0915c
Commit Graph

103653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
afdf7519d1 fix build with old system libsqlite (sqlite3_close_v2 may be missing) 2017-08-02 16:09:36 +02:00
Remi Collet
5e5895a464 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix build with old system libsqlite (sqlite3_errstr may be missing)
 2017-08-02 14:03:23 +02:00
Remi Collet
5f030924c1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix build with old system libsqlite (sqlite3_errstr may be missing)
 2017-08-02 14:03:02 +02:00
Remi Collet
666cb6c802 fix build with old system libsqlite (sqlite3_errstr may be missing) 2017-08-02 14:01:56 +02:00
Joe Watkins
6202c821a9
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fixed #endif comments
 2017-08-02 08:35:51 +01:00
Joe Watkins
9c6262f39b
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fixed #endif comments
 2017-08-02 08:35:38 +01:00
clwu
b2934d2612
fixed #endif comments 2017-08-02 08:35:27 +01:00
Christoph M. Becker
43e7656241 Update NEWS 2017-08-02 00:11:11 +02:00
Sara Golemon
6278f6140f Update NEWS for 7.2.0beta3 2017-08-01 12:50:56 -04:00
Sara Golemon
1b05a2373b Update NEWS for PHP 7.2.0beta2 2017-08-01 12:50:55 -04:00
Christoph M. Becker
fe107cce45 Update to SQLite 3.20.0 2017-08-01 18:26:14 +02:00
Nikita Popov
6c2c7a023d Optimize array_unique() 
In SORT_STRING mode, instead of sorting the array, build a hash of
seen elements.
 2017-08-01 18:08:38 +02:00
Julien Pauli
5069d52189 Updated NEWS 2017-08-01 16:03:00 +02:00
Julien Pauli
4f06b62781 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Updated NEWS
  Updated NEWS
  Fix #75015. Crash in SPL destructors
 2017-08-01 16:02:36 +02:00
Julien Pauli
f0d40286e7 Updated NEWS 2017-08-01 16:02:26 +02:00
Julien Pauli
cd06b5af09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Updated NEWS
  Fix #75015. Crash in SPL destructors
 2017-08-01 16:02:00 +02:00
Julien Pauli
0c0cbb43da Updated NEWS 2017-08-01 16:01:43 +02:00
Julien Pauli
64e6ddc7f7 Fix #75015. Crash in SPL destructors 2017-08-01 15:59:54 +02:00
Julien Pauli
ad5222c3a6 Fix use of uninitialised value in uniqid() where more_entropy=0 2017-08-01 14:58:00 +02:00
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