summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-16Merge branch 'PHP-5.4'HEADmasterXinchen Hui1-0/+3
* PHP-5.4: Fix potential leak in cli server
2012-06-15Fix potential leak in cli serverstealth351-0/+3
2012-06-14Merge branch 'PHP-5.4'Anatoliy Belsky2-1/+109
* PHP-5.4: Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt fails
2012-06-14Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt failsAnatoliy Belsky2-1/+109
2012-06-14Merge branch 'PHP-5.4'Anatoliy Belsky1-5/+18
* PHP-5.4: Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
2012-06-14Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32Anatoliy Belsky1-5/+18
2012-06-13Merge branch 'PHP-5.4'Stanislav Malyshev0-0/+0
Merge reverts from 5.4, but shouldn't actually revert anything * PHP-5.4: Merge PHP 5.3.14 NEWS re-add 61755 to NEWS re-add 61755 to NEWS Revert "Add PBKDF2 support via openssl()" Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell." add CVE
2012-06-13simplify boolval()Stanislav Malyshev1-2/+1
2012-06-13Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter0-0/+0
* PHP-5.3: Merge PHP 5.3.14 NEWS re-add 61755 to NEWS
2012-06-13Merge PHP 5.3.14 NEWSJohannes Schlüter1-2/+55
2012-06-12re-add 61755 to NEWSStanislav Malyshev1-0/+4
2012-06-12re-add 61755 to NEWSStanislav Malyshev1-0/+4
2012-06-12Revert "Add PBKDF2 support via openssl()"Stanislav Malyshev3-93/+0
This reverts commit b5b8ea1050837fba5a6cee55e41b4574ed64158e. Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
2012-06-12Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound ↵Stanislav Malyshev5-32/+32
like a spell." This reverts commit bccd1e672fabc3c788e93075221d47d9f077b167. Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
2012-06-12add CVEStanislav Malyshev1-2/+2
2012-06-11One more timeScott MacVicar1-3/+0
2012-06-11Merge branch '5.4'Scott MacVicar1-0/+4
* 5.4: Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell. Add PBKDF2 support via openssl() Conflicts: ext/openssl/openssl.c
2012-06-11Add PBKDF2 support via openssl()Scott MacVicar1-1/+0
Summary: No easy way to put these in the hash extension since we don't really support optional parameters to certain algorithms. Implemented in openssl for now since it has it already and is pretty stable. Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be changed in the future. Will backport to 5.4 potentially with Stas' approval. Test Plan: Ran newly added tests which came from RFC 6070
2012-06-11Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar5-32/+32
Summary: Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
2012-06-11Add PBKDF2 support via openssl()Scott MacVicar3-0/+93
Summary: No easy way to put these in the hash extension since we don't really support optional parameters to certain algorithms. Implemented in openssl for now since it has it already and is pretty stable. Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be changed in the future. Will backport to 5.4 potentially with Stas' approval. Test Plan: Ran newly added tests which came from RFC 6070
2012-06-11Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar5-32/+32
Summary: Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
2012-06-11- Fixed build (PKCS5_PBKDF2_HMAC is from 1.0.0)Felipe Pena2-2/+10
2012-06-11Merge branch 'PHP-5.4'Anatoliy Belsky1-0/+6
* PHP-5.4: Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt
2012-06-11Fix bug #62271 test bug - ext/wddx/tests/bug48562.phptMatt Ficken1-0/+6
2012-06-11Merge branch '5.4'Scott MacVicar3-0/+85
* 5.4: Add PBKDF2 support via openssl()
2012-06-11Add PBKDF2 support via openssl()Scott MacVicar3-0/+85
Summary: No easy way to put these in the hash extension since we don't really support optional parameters to certain algorithms. Implemented in openssl for now since it has it already and is pretty stable. Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be changed in the future. Will backport to 5.4 potentially with Stas' approval. Test Plan: Ran newly added tests which came from RFC 6070
2012-06-11Merge branch 'PHP-5.4'Stanislav Malyshev1-1/+1
* PHP-5.4: typo fix
2012-06-11typo fixStanislav Malyshev1-1/+1
2012-06-10Merge branch 'PHP-5.4'David Soria Parra0-0/+0
* PHP-5.4: Make travis silent
2012-06-10Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra1-0/+10
* PHP-5.3: Make travis silent
2012-06-10Make travis silentDavid Soria Parra1-0/+10
Travis will always build all branches. As we just have a .travis.yml on master, travis will go ahead and checkout PHP-5.3. It fails and then sends mails. We really don't want to get spammed, so we add a .travis.yml that is just silent.
2012-06-10Merge branch 'PHP-5.4'David Soria Parra1-0/+15
By Stanislav Malyshev (1) and michelangelo (1) * PHP-5.4: Adding a test for ext/posix/tests/posix_getegid_basic.phpt typo
2012-06-10Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra1-0/+15
By Stanislav Malyshev (1) and michelangelo (1) * PHP-5.3: Adding a test for ext/posix/tests/posix_getegid_basic.phpt typo
2012-06-10Adding a test for ext/posix/tests/posix_getegid_basic.phptmichelangelo1-0/+15
2012-06-09Merge branch '5.4'Gustavo André dos Santos Lopes1-2/+11
* 5.4: Fix bug #62266 rearrange news typo NEWS File
2012-06-09Fix bug #62266Gustavo André dos Santos Lopes2-4/+17
Custom extension segfaults during xmlParseFile with FPM SAPI because the regular list is not prepared during the MINIT phase and our custom external entity loader tries to open PHP streams.
2012-06-08Disable email notifications for travis-ciDavid Soria Parra1-5/+1
2012-06-08rearrange newsStanislav Malyshev1-3/+2
2012-06-08typoStanislav Malyshev1-1/+1
2012-06-08typoStanislav Malyshev1-1/+1
2012-06-08NEWS FilePierrick Charron1-0/+4
2012-06-08typoStanislav Malyshev1-1/+1
2012-06-08Merge branch 'PHP-5.4'Stanislav Malyshev1-0/+5
* PHP-5.4: improve overflow checks add NEWS fix potential overflow in _php_stream_scandir
2012-06-08Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev1-0/+5
* PHP-5.3: improve overflow checks fix potential overflow in _php_stream_scandir
2012-06-08improve overflow checksStanislav Malyshev1-5/+5
2012-06-08add NEWSStanislav Malyshev1-0/+2
2012-06-08Merge branch 'PHP-5.4'Stanislav Malyshev1-3/+8
* PHP-5.4: fix potential overflow in _php_stream_scandir
2012-06-08fix potential overflow in _php_stream_scandirStanislav Malyshev1-3/+8
2012-06-08fix potential overflow in _php_stream_scandirStanislav Malyshev2-3/+10
2012-06-07Merge branch 'PHP-5.4'Anatoliy Belsky2-2/+2
* PHP-5.4: set current versions for libzip and zip ext