summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-06-16Merge branch 'PHP-5.4'HEADmasterXinchen Hui1-0/+3
2012-06-15Fix potential leak in cli serverstealth351-0/+3
2012-06-14Merge branch 'PHP-5.4'Anatoliy Belsky2-1/+109
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
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
2012-06-13simplify boolval()Stanislav Malyshev1-2/+1
2012-06-13Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter0-0/+0
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
2012-06-12Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound li...Stanislav Malyshev5-32/+32
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
2012-06-11Add PBKDF2 support via openssl()Scott MacVicar1-1/+0
2012-06-11Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar5-32/+32
2012-06-11Add PBKDF2 support via openssl()Scott MacVicar3-0/+93
2012-06-11Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.Scott MacVicar5-32/+32
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
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
2012-06-11Add PBKDF2 support via openssl()Scott MacVicar3-0/+85
2012-06-11Merge branch 'PHP-5.4'Stanislav Malyshev1-1/+1
2012-06-11typo fixStanislav Malyshev1-1/+1
2012-06-10Merge branch 'PHP-5.4'David Soria Parra0-0/+0
2012-06-10Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra1-0/+10
2012-06-10Make travis silentDavid Soria Parra1-0/+10
2012-06-10Merge branch 'PHP-5.4'David Soria Parra1-0/+15
2012-06-10Merge branch 'PHP-5.3' into PHP-5.4David Soria Parra1-0/+15
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
2012-06-09Fix bug #62266Gustavo André dos Santos Lopes2-4/+17
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
2012-06-08Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev1-0/+5
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
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