summaryrefslogtreecommitdiff
path: root/ext
AgeCommit message (Collapse)AuthorFilesLines
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-13simplify boolval()Stanislav Malyshev1-2/+1
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-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-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 Lopes1-2/+11
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-07Merge branch 'PHP-5.4'Anatoliy Belsky2-2/+2
* PHP-5.4: set current versions for libzip and zip ext
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2-2/+2
* PHP-5.3: set current versions for libzip and zip ext
2012-06-07set current versions for libzip and zip extAnatoliy Belsky2-2/+2
2012-06-07Merge branch 'PHP-5.4'Anatoliy Belsky65-713/+2751
* PHP-5.4: zip windows fixes fixed bc break related to #57905 fixed a bit overlooked from the last libzip port brought the fix for #47667 back fixed zip entry freeing rechecked the merged libzip, took also the indents from the original to avoid confusion next time fixed a double freeing crash fixed header include initial libzip upgrade patch to 0.10.1 - BFN
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky65-713/+2751
* PHP-5.3: zip windows fixes fixed bc break related to #57905 fixed a bit overlooked from the last libzip port brought the fix for #47667 back fixed zip entry freeing rechecked the merged libzip, took also the indents from the original to avoid confusion next time fixed a double freeing crash fixed header include initial libzip upgrade patch to 0.10.1 - BFN Conflicts: NEWS
2012-06-07zip windows fixesAnatoliy Belsky3-8/+14
2012-06-07fixed bc break related to #57905Anatoliy Belsky1-2/+10
2012-06-07fixed a bit overlooked from the last libzip portAnatoliy Belsky1-2/+2
2012-06-07brought the fix for #47667 backAnatoliy Belsky1-2/+8
2012-06-07fixed zip entry freeingAnatoliy Belsky1-5/+10
2012-06-07rechecked the merged libzip, took also the indents from the original toAnatoliy Belsky6-28/+18
avoid confusion next time
2012-06-07fixed a double freeing crashAnatoliy Belsky1-2/+0
2012-06-07fixed header includeAnatoliy Belsky1-1/+1
2012-06-07initial libzip upgrade patch to 0.10.1Anatoliy Belsky64-691/+2716
2012-06-07Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3Felipe Pena1-1/+5
2012-06-07Merge branch 'PHP-5.4'Pierrick Charron1-0/+22
* PHP-5.4: Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron1-0/+22
* PHP-5.3: Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that ↵Pierrick Charron1-0/+22
includes a semi-colon) Modify the scanner to check if the first char of the raw data is an opening " in which case we need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
2012-06-07Merge branch 'pull-request/60'David Soria Parra4-0/+50
By David Soria Parra (1) and Jille Timmermans (1) * pull-request/60: NEWS entry for boolval() Implement boolval() with a test
2012-06-07Merge branch 'PHP-5.4'Xinchen Hui10-240/+66
By Gustavo André dos Santos Lopes (4) and others via Felipe Pena (2) and Xinchen Hui (2) * PHP-5.4: Remove unused codes based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe. merge 5.3 entries restore NEWS Fix ext/intl build on ICU < 4.8 Optimization in ext/intl/msgformat Fixed tests in ext/intl Changed XFAILed collator_get_sort_key.phpt
2012-06-07Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui10-240/+66
By Gustavo André dos Santos Lopes (4) and others via Felipe Pena (1) and Xinchen Hui (1) * PHP-5.3: Remove unused codes based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe. Fix ext/intl build on ICU < 4.8 Optimization in ext/intl/msgformat Fixed tests in ext/intl Changed XFAILed collator_get_sort_key.phpt
2012-06-06Implement boolval() with a testJille Timmermans4-0/+50
2012-06-06Fix ext/intl build on ICU < 4.8Gustavo André dos Santos Lopes1-0/+2
2012-06-06Optimization in ext/intl/msgformatGustavo André dos Santos Lopes7-5/+24
Don't transform the string to make it apostrophe friendly in ICU 4.8+ as that it is now the default.
2012-06-05Fixed tests in ext/intlGustavo André dos Santos Lopes2-199/+5
21 is not a valid value for UNUM_PADDING_POSITION. Changed the test to use 2 instead. Remove ICU 4.2- test. No one cares.
2012-06-04- Fixed bug #62227 (Invalid phar stream path causes crash)Felipe Pena1-1/+5
2012-06-04Changed XFAILed collator_get_sort_key.phptGustavo André dos Santos Lopes1-36/+35
Ressurected and limited to ICU 4.8 in the hope that the sort keys will remain stable in more recent ICU versions. I have only tested with ICU 4.8 so far.