summaryrefslogtreecommitdiff
path: root/ext/standard
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-051-1/+5
|\ | | | | | | | | * PHP-7.0: Fix bug #73037, second round
| * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-10-051-1/+5
| |\ | | | | | | | | | | | | * PHP-5.6: Fix bug #73037, second round
| | * Fix bug #73037, second roundAnatol Belski2016-10-051-1/+5
| | |
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-10-0412-84/+48
| |\ \ | | |/ | | | | | | | | | | | | | | | * PHP-5.6: Fixed test Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986 Apparently negative wordwrap is a thing and should work as length = 0.
| | * Fixed testIlia Alshanetsky2016-10-041-32/+2
| | |
| | * Added validation to parse_url() to prohibit restricted characters inside ↵Ilia Alshanetsky2016-10-0411-52/+46
| | | | | | | | | | | | login/pass components based on RFC3986
| | * Apparently negative wordwrap is a thing and should work as length = 0.Stanislav Malyshev2016-10-031-1/+5
| | | | | | | | | | | | I'll leave it as is for now.
| | * Really fix bug #73017Stanislav Malyshev2016-10-031-4/+10
| | |
* | | Skip tests that rely on sessions if sessions aren't availableCraig Duncan2016-10-044-0/+4
| | |
* | | Unwrap reference returns in cufa etcNikita Popov2016-09-301-0/+12
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-302-2/+26
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-302-2/+26
| |\ \ | | |/
| | * Fix #73203: passing additional_parameters causes mail to failChristoph M. Becker2016-09-302-2/+26
| | | | | | | | | | | | We make sure that there's no unsigned underflow, which happened for `y==0`.
| | * fix test (32bits)Remi Collet2016-09-151-1/+1
| | |
| | * Fix bug #73052 - Memory Corruption in During Deserialized-object DestructionStanislav Malyshev2016-09-123-30/+50
| | |
| | * Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)Stanislav Malyshev2016-09-121-0/+4
| | |
| | * Also fix overflow in wordwrapStanislav Malyshev2016-09-121-1/+1
| | |
| | * Add more checks for int overflowStanislav Malyshev2016-09-121-2/+2
| | |
| | * Fix various int size overflows.Stanislav Malyshev2016-09-121-13/+10
| | | | | | | | | | | | | | | Add function for detection of string zvals with length that does not fit INT_MAX.
| * | fix user filter bugJoe Watkins2016-09-302-1/+33
| | |
* | | fix user filter bugJoe Watkins2016-09-302-1/+33
| | |
* | | Ensure symtable exists before checking itNikita Popov2016-09-281-0/+19
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-09-211-1/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed skip
| * | Fixed skipXinchen Hui2016-09-211-1/+7
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-131-4/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: pick up the safe alloc pieces from 19866fb76cf4c95d904ebb0e08592cf38303fae9
| * | pick up the safe alloc pieces fromAnatol Belski2016-09-131-4/+4
| | | | | | | | | | | | 19866fb76cf4c95d904ebb0e08592cf38303fae9
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-122-17/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (22 commits) Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed Fix test Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction Fix bug #73029 - Missing type check when unserializing SplArray Fix bug #72860: wddx_deserialize use-after-free Fix bug #73007: add locale length check Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile sync NEWS Revert "Merge branch 'PHP-5.6' into PHP-7.0" Merge branch 'PHP-5.6' into PHP-7.0 Merge branch 'PHP-5.6' into PHP-7.0 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" fix version sync NEWS Fix bug #72957 set versions ...
| * | Merge branch 'PHP-7.0.11' into PHP-7.0Stanislav Malyshev2016-09-122-17/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0.11: (22 commits) Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed Fix test Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction Fix bug #73029 - Missing type check when unserializing SplArray Fix bug #72860: wddx_deserialize use-after-free Fix bug #73007: add locale length check Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile sync NEWS Revert "Merge branch 'PHP-5.6' into PHP-7.0" Merge branch 'PHP-5.6' into PHP-7.0 Merge branch 'PHP-5.6' into PHP-7.0 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" fix version sync NEWS Fix bug #72957 set versions ...
| | * | I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is neededStanislav Malyshev2016-09-121-6/+0
| | | |
| | * | Add check in fgetcsv in case sizeof(unit) != sizeof(size_t)Anatol Belski2016-09-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 99ac11222cb2a4e9aa6a865f908b28def349c049) Conflicts: ext/standard/file.c
| | * | Fix bug #73052 - Memory Corruption in During Deserialized-object DestructionStanislav Malyshev2016-09-121-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit b6e1e5e0b3e6221c7b14fa10cba30f5c5e719e1b) Conflicts: Zend/zend_objects_API.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re
| | * | Revert "Merge branch 'PHP-5.6' into PHP-7.0"Anatol Belski2016-09-112-25/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 946335ba706b7dbfe70a5fc9a1e74ee46af19cfe, reversing changes made to 3437dbfa0097d3c5be69d4efb26a2ecb3edf5168.
| | * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-111-2/+2
| | | | | | | | | | | | | | | | (cherry picked from commit f93fd8ce3278923dce16b241aebe428a6b9aa79d)
| | * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-111-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit 8f32d609c586fdaab200d50377eb8b2e2667d2d2)
| | * | Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0""Anatol Belski2016-09-112-0/+16
| | | | | | | | | | | | | | | | This reverts commit 62d5bfb5277dd84e1a185c567982f2196cd19437.
| | * | Revert "Merge branch 'PHP-5.6' into PHP-7.0"Anatol Belski2016-08-302-16/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 65f0c163f929e48162efc3491fee918bb5c4c280, reversing changes made to 4b45c0a9a7d48a69edba9e00270c49bbe17af4d1.
* | | | Merge branch 'PHP-7.0' into PHP-7.1Andrea Faulds2016-09-1111-643/+1
|\ \ \ \ | |/ / /
| * | | Remove zpp fallback code (always use Fast ZPP)Andrea Faulds2016-09-1111-643/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 3e27fbb3d22b42d181e15c345f1c59a007b6b58c Author: Andrea Faulds <ajf@ajf.me> Date: Sun Sep 11 19:14:37 2016 +0100 Keep dummy FAST_ZPP macro for compatibility commit 8a7cfd00deaa4a3c5026c97580c49c886c72a5b4 Author: Andrea Faulds <ajf@ajf.me> Date: Mon Sep 5 22:36:03 2016 +0100 Remove FAST_ZPP macro and plain zpp fallback code
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-103-8/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: Bug #73058 crypt broken when salt is 'too' long
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-103-8/+33
| |\ \ \ | | | |/ | | |/| | | | | | | | | * PHP-5.6: Bug #73058 crypt broken when salt is 'too' long
| | * | Bug #73058 crypt broken when salt is 'too' longAnatol Belski2016-09-103-8/+33
| | | |
* | | | Merge branch 'pull-request/2115' into PHP-7.1Christoph M. Becker2016-09-0615-8/+8
|\ \ \ \
| * | | | Fix #72948: Uncatchable "Catchable" fatal error for class to string conversionsChristoph M. Becker2016-09-0315-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E_RECOVERABLE errors are reported as "Catchable fatal error". This is misleading, because they actually can't be caught via try-catch statements. Therefore we change the wording to "Recoverable fatal error" as suggested by Nikita.
* | | | | Followup for bug #72785Nikita Popov2016-09-064-498/+529
| | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect handling of nesting ... need to reset to the old value afterwards.
* | | | | Fix bug #72785 - allowed_classes only applies to outermost unserialize()Stanislav Malyshev2016-09-056-98/+103
| | | | |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Andrea Faulds2016-09-051-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Unbreak FAST_ZPP dead codeAndrea Faulds2016-09-051-2/+2
| | | |
* | | | improve fixAnatol Belski2016-09-021-4/+2
| | | |
* | | | Add skipifs to some mb path testsAnatol Belski2016-09-0232-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were invented primarily to test the multibyte path handling patch on Windows. How it turns out by PR #2105, some test issues on some filesystems are possible. Particularly HFS is configurable to use different ways to save filenames, see https://developer.apple.com/library/mac/qa/qa1173/_index.html This makes it impossible to test the filenames byte wise, while the results are still correct. There are still several other tests using UTF-8 file names spread over other extensions. So far no false positives are to see, they don't need to be touched.
* | | | fix leakAnatol Belski2016-09-022-45/+47
| | | |