aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-06-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-10Merge branch 'ia/public_key/crypto/prepare-for-release' into maintIngela Anderton Andin
* ia/public_key/crypto/prepare-for-release: public_key & ssl: Add ASN-1 dependency crypto & public_key: prepare for release
2013-06-10Merge branch 'ia/crypto/avoid-too-big-binaries/OTP-11142' into maintIngela Anderton Andin
* ia/crypto/avoid-too-big-binaries/OTP-11142: Teach crypto.c not to call enif_compute_timeslice with 0 Add enif_consume_timeslice to appropriate crypto NIFs crypto: Add large test data crypto: Avoid big binaries in nifs Crypto: Structure code
2013-06-10Merge branch 'maint'Rickard Green
* maint: Fix bad fix of erts_stale_drv_select()
2013-06-10Merge branch 'rickard/stale-driver-select/OTP-11084' into maintRickard Green
* rickard/stale-driver-select/OTP-11084: Fix bad fix of erts_stale_drv_select()
2013-06-10Fix bad fix of erts_stale_drv_select()Rickard Green
2013-06-10Merge branch 'maint'Rickard Green
* maint: erts: Fix debug code in erts_ptab_test_next_id()
2013-06-10erts: Fix debug code in erts_ptab_test_next_id()Rickard Green
2013-06-10Merge branch 'maint'Raimo Niskanen
Conflicts: lib/kernel/src/inet_db.erl
2013-06-10Merge branch 'raimo/inet-gethostbyname-lowercase-search/OTP-10689' into maintRaimo Niskanen
* raimo/inet-gethostbyname-lowercase-search/OTP-10689: Add test cases for host lookup case (in)sensitivity Improve case (in)sensitivity for host lookups
2013-06-10Merge branch 'maint'Dan Gudmundsson
2013-06-10Merge branch 'dgud/mnesia-unsubscribe-fix' into maintDan Gudmundsson
* dgud/mnesia-unsubscribe-fix: mnesia: Fix (timing issue) testcase mnesia: Fix unsubscribe error handling
2013-06-10Merge branch 'maint'Fredrik Gustafsson
2013-06-10Merge branch 'lh/fix-doc-reserved-words/OTP-11158' into maintFredrik Gustafsson
* lh/fix-doc-reserved-words/OTP-11158: Remove 'query' from the list of reserved words in docs
2013-06-10Merge branch 'maint'Lukas Larsson
* maint: erts: Update spec in preloaded to reflect success typing (again) Conflicts: erts/preloaded/ebin/erlang.beam
2013-06-10Merge branch 'lukas/erts/gc_stat_contention/OTP-10271' into maintLukas Larsson
* lukas/erts/gc_stat_contention/OTP-10271: erts: Update spec in preloaded to reflect success typing (again)
2013-06-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-10Merge branch 'ia/crypto/doc' into maintIngela Anderton Andin
* ia/crypto/doc: crypto & public_key: Clearify documentation.
2013-06-10Merge branch 'ia/ssl/public_key/warnings' into maintIngela Anderton Andin
* ia/ssl/public_key/warnings: ssl: Correct rebase mistakes
2013-06-10Merge branch 'ia/ssl/dialyzer' into maintIngela Anderton Andin
* ia/ssl/dialyzer: ssl: Fix dialyzer warnings
2013-06-10Merge branch 'maint'Björn Gustavsson
* maint: PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensions testConstraints: Improve tests of semi-constrained INTEGERs Test ENUMERATED with many extended values PER, UPER: Fix record name mismatch between HRL file and decoding code UPER: Correct encoding of ENUMERATED with more than 63 extended values Add asn1_test_lib:hex_to_bin/1
2013-06-10Merge branch 'bjorn/asn1/not-small-bugs/OTP-11153' into maintBjörn Gustavsson
* bjorn/asn1/not-small-bugs/OTP-11153: PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensions testConstraints: Improve tests of semi-constrained INTEGERs Test ENUMERATED with many extended values UPER: Correct encoding of ENUMERATED with more than 63 extended values Add asn1_test_lib:hex_to_bin/1
2013-06-10Merge branch 'bjorn/asn1/fix-extension-addition-groups/OTP-11154' into maintBjörn Gustavsson
* bjorn/asn1/fix-extension-addition-groups/OTP-11154: PER, UPER: Fix record name mismatch between HRL file and decoding code
2013-06-10Merge branch 'maint'Fredrik Gustafsson
2013-06-10Merge branch 'fredrik/r16b01/prepare_release' into maintFredrik Gustafsson
* fredrik/r16b01/prepare_release: versions updates for erl_interface, et and os_mon
2013-06-10Remove 'query' from the list of reserved words in docsLoïc Hoguin
Credits go to Matthias Endler for finding it.
2013-06-08PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensionsBjörn Gustavsson
2013-06-08testConstraints: Improve tests of semi-constrained INTEGERsBjörn Gustavsson
Make sure that semi-constrained integers are correctly encoded in the mininum number of bytes. (The roundtrip test does not catch problems with non-minimal encodings.) Also test huge values that must be encoded in 128 or 256 bytes.
2013-06-08Test ENUMERATED with many extended valuesBjörn Gustavsson
2013-06-07PER, UPER: Fix record name mismatch between HRL file and decoding codeBjörn Gustavsson
When a SEQUENCE was defined inline inside extension addition group like this: InlinedSeq ::= SEQUENCE { ..., [[ s SEQUENCE { a INTEGER, b BOOLEAN } ]] } the decoding code would return the contents of the SEQUENCE in a record named 'InlinedSeq_ExtAddGroup1_s', while the record definition in the generated HRL file would be 'InlinedSeq_s'. Since there is no reason to use the longer record name (no risk for ambiguity), correct the name in the decoding code.
2013-06-07erts: Update spec in preloaded to reflect success typing (again)Lukas Larsson
2013-06-07Teach crypto.c not to call enif_compute_timeslice with 0Patrik Nyblom
2013-06-07crypto & public_key: Clearify documentation.Ingela Anderton Andin
2013-06-07Add test cases for host lookup case (in)sensitivityRaimo Niskanen
2013-06-07public_key & ssl: Add ASN-1 dependencyIngela Anderton Andin
As the ASN-1 application relies on a nif in R16 for decodeing (that was not the case in R15), public_key currently has a runtime dependency on ASN-1. Hopefully we will be able to remove this dependency again in the future.
2013-06-07ssl: Fix dialyzer warningsIngela Anderton Andin
2013-06-07ssl: Correct rebase mistakesIngela Anderton Andin
2013-06-07versions updates for erl_interface, et and os_monFredrik Gustafsson
2013-06-07Merge branch 'maint'Fredrik Gustafsson
2013-06-07Merge branch 'fredrik/ssh/appup_r16b01' into maintFredrik Gustafsson
* fredrik/ssh/appup_r16b01: ssh: appup changes
2013-06-07Improve case (in)sensitivity for host lookupsRaimo Niskanen
2013-06-07Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-07Merge branch 'ia/ssl/prepare-for-release' into maintIngela Anderton Andin
* ia/ssl/prepare-for-release: ssl: Prepare for release
2013-06-07UPER: Correct encoding of ENUMERATED with more than 63 extended valuesBjörn Gustavsson
2013-06-07Add asn1_test_lib:hex_to_bin/1Björn Gustavsson
2013-06-05crypto & public_key: prepare for releaseIngela Anderton Andin
2013-06-05Merge branch 'maint'Peter Andersson
2013-06-05Merge branch 'peppe/common_test/ct_testspec_verification.2' into maintPeter Andersson
* peppe/common_test/ct_testspec_verification.2: Fix error with testspec terms not being merged properly Fix problem with tests being wrongly added to separate specs Improve error report if crash due to bad testspec Add verification terms for test specification tests OTP-10857
2013-06-05Fix error with testspec terms not being merged properlyPeter Andersson
2013-06-05Fix problem with tests being wrongly added to separate specsPeter Andersson