| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) | Stanislav Malyshev | 2015-01-21 | 3 | -2/+27 |
| | | | | | | Conflicts: ext/standard/var_unserializer.c | ||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-01-05 | 3 | -6/+6 |
| |\ | | | | | | | | | * PHP-5.5: fix ACLs tests, make it create dir where it has to, not file | ||||
| | * | fix ACLs tests, make it create dir where it has to, not file | Anatol Belski | 2015-01-05 | 3 | -6/+6 |
| | | | |||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-12-16 | 3 | -32/+62 |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | * PHP-5.5: update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Conflicts: ext/standard/var_unserializer.c | ||||
| | * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-12-16 | 3 | -32/+62 |
| | |\ | | | | | | | | | | | | | | | | | | | * PHP-5.4: add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() | ||||
| | | * | Fix bug #68594 - Use after free vulnerability in unserialize() | Stanislav Malyshev | 2014-12-16 | 3 | -32/+62 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrea Faulds | 2014-12-13 | 1 | -2/+2 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix undefined behaviour in strnatcmp update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c | ||||
| | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrea Faulds | 2014-12-13 | 1 | -2/+2 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix undefined behaviour in strnatcmp update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c Conflicts: NEWS | ||||
| | | * | Fix undefined behaviour in strnatcmp | Andrea Faulds | 2014-12-13 | 1 | -2/+2 |
| | | | | |||||
| | | * | move the test to the right place | Anatol Belski | 2014-12-11 | 1 | -0/+11 |
| | | | | |||||
| | | * | Fixed bug #68545 NULL pointer dereference in unserialize.c | Anatol Belski | 2014-12-11 | 2 | -33/+45 |
| | | | | |||||
| | | * | update news | Stanislav Malyshev | 2014-11-30 | 1 | -5/+5 |
| | | | | |||||
| | | * | Bug fixes in light of failing bcrypt tests | Leigh | 2014-11-30 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | Conflicts: ext/standard/crypt.c | ||||
| | | * | Add tests from 1.3. Add missing tests. | Leigh | 2014-11-30 | 1 | -2/+31 |
| | | | | | | | | | | | | | 3 of the missing tests fail. // TODO | ||||
| | | * | Upgrade crypt_blowfish to version 1.3 | Leigh | 2014-11-30 | 1 | -19/+24 |
| | | | | |||||
| | | * | Fixed bug #68044: Integer overflow in unserialize() (32-bits only) | Stanislav Malyshev | 2014-10-13 | 3 | -3/+15 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Julien Pauli | 2014-12-12 | 2 | -0/+27 |
| |\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Fix bug #68532: convert.base64-encode omits padding bytes | ||||
| | * | | Fix bug #68532: convert.base64-encode omits padding bytes | mcq8 | 2014-12-12 | 2 | -0/+27 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-10 | 1 | -0/+11 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: move the test to the right place | ||||
| | * | | move the test to the right place | Anatol Belski | 2014-12-10 | 1 | -0/+11 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-10 | 2 | -33/+45 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #68545 NULL pointer dereference in unserialize.c Conflicts: ext/standard/var_unserializer.c | ||||
| | * | | Fixed bug #68545 NULL pointer dereference in unserialize.c | Anatol Belski | 2014-12-10 | 2 | -33/+45 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-06 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: fixed test | ||||
| | * | | fixed test | Anatol Belski | 2014-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-06 | 1 | -0/+1 |
| |\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: C89 compat add include for missing localeconv_r proto | ||||
| | * | | add include for missing localeconv_r proto | Anatol Belski | 2014-12-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-06 | 2 | -0/+76 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fixed bug #65230 setting locale randomly broken | ||||
| | * | | Fixed bug #65230 setting locale randomly broken | Anatol Belski | 2014-12-06 | 2 | -0/+76 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-05 | 2 | -0/+90 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fixed bug #65769 localeconv() broken in TS builds | ||||
| | * | | Fixed bug #65769 localeconv() broken in TS builds | Anatol Belski | 2014-12-05 | 2 | -0/+90 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-12-05 | 1 | -2/+2 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: fix dir separators in test | ||||
| | * | | fix dir separators in test | Anatol Belski | 2014-12-05 | 1 | -2/+2 |
| | | | | |||||
| | * | | Added more useful warning messages | Tjerk Meesters | 2014-11-30 | 1 | -6/+17 |
| | | | | |||||
| | * | | Changed based on comments and make its behaviour equal to the Windows version | Tjerk Meesters | 2014-11-30 | 2 | -3/+3 |
| | | | | |||||
| | * | | Fix #53092 - dns_get_record does not return false on dns server failure | Tjerk Meesters | 2014-11-30 | 1 | -1/+7 |
| | | | | |||||
| * | | | Fix Bug #68536 Pack for 64bits integer is broken on bigendian. | Remi Collet | 2014-12-02 | 1 | -12/+12 |
| | | | | | | | | | | | | | Covered by ext/standard/tests/strings/pack64.phpt | ||||
| * | | | Added more useful warning messages | Tjerk Meesters | 2014-11-30 | 1 | -6/+17 |
| | | | | |||||
| * | | | Changed based on comments and make its behaviour equal to the Windows version | Tjerk Meesters | 2014-11-30 | 2 | -3/+3 |
| | | | | |||||
| * | | | Fix #53092 - dns_get_record does not return false on dns server failure | Tjerk Meesters | 2014-11-30 | 1 | -1/+7 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-11-30 | 3 | -24/+60 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update news update news update NEWS Apply error-code-salt fix to Windows too Bug fixes in light of failing bcrypt tests Add tests from 1.3. Add missing tests. Upgrade crypt_blowfish to version 1.3 Apply error-code-salt fix to Windows too Bug fixes in light of failing bcrypt tests Add tests from 1.3. Add missing tests. Upgrade crypt_blowfish to version 1.3 | ||||
| | * | | Merge branch 'pull-request/868' into PHP-5.5 | Stanislav Malyshev | 2014-11-30 | 3 | -24/+60 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/868: Apply error-code-salt fix to Windows too Bug fixes in light of failing bcrypt tests Add tests from 1.3. Add missing tests. Upgrade crypt_blowfish to version 1.3 | ||||
| | | * | | Apply error-code-salt fix to Windows too | Leigh | 2014-10-07 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Bug fixes in light of failing bcrypt tests | Leigh | 2014-10-07 | 2 | -2/+4 |
| | | | | | |||||
| | | * | | Add tests from 1.3. Add missing tests. | Leigh | 2014-10-07 | 1 | -2/+31 |
| | | | | | | | | | | | | | | | | | 3 of the missing tests fail. // TODO | ||||
| | | * | | Upgrade crypt_blowfish to version 1.3 | Leigh | 2014-10-07 | 1 | -19/+24 |
| | | | | | |||||
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-11-30 | 1 | -0/+13 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | * PHP-5.5: Added test and review suggestion Fix bug #68335: rmdir doesnt work with file:// stream wrapper | ||||
| | * | | | Added test and review suggestion | mcq8 | 2014-11-30 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | test to function addcslashes | marcosptf | 2014-11-23 | 2 | -0/+23 |
| | | | | | | | | | | | | | | | | | test to function bin2hex | ||||
| * | | | | Fix incorrect argument reflection info for array_multisort() | Alexander Lisachenko | 2014-11-23 | 1 | -6/+3 |
| | | | | | |||||
| * | | | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-23 | 6 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c | ||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |