aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-17Merge branch 'rickard/otp_patch_apply/OTP-12565' into maintRickard Green
* rickard/otp_patch_apply/OTP-12565: Minor fixes
2015-03-17Minor fixesRickard Green
2015-03-17Merge branch 'rickard/otp_patch_apply/OTP-12565' into maintRickard Green
* rickard/otp_patch_apply/OTP-12565: Add support for patching of individual applications
2015-03-17Add support for patching of individual applicationsRickard Green
2015-03-16Merge branch 'ia/public_key/crls_dialyzer' into maintIngela Anderton Andin
* ia/public_key/crls_dialyzer: public_key: dialyzer fixes
2015-03-16Merge branch 'hans/version_updates' into maintHans Nilsson
2015-03-16ssh: uppdate version in vsn.mkHans Nilsson
2015-03-16eldap: uppdate version in vsn.mkHans Nilsson
2015-03-16Merge branch 'nlmills/docfix' into maintZandra Hird
* nlmills/docfix: Correct typo in erlang(3) documentation
2015-03-13Merge branch 'raimo/infinite-loop-gethostbyname/OTP-12133' into maintRaimo Niskanen
* raimo/infinite-loop-gethostbyname/OTP-12133: Restore lookup order after test
2015-03-13public_key: dialyzer fixesIngela Anderton Andin
2015-03-12Merge branch 'shijiang1130/master' into maintZandra Hird
* shijiang1130/master: Add client example for using the SSH module OTP-12558
2015-03-12Merge branch 'mikpe/hipe-mfait-rwlock' into maintHenrik Nord
* mikpe/hipe-mfait-rwlock: hipe: change mfa_info_table lock to rwmutex OTP-12557
2015-03-12Merge branch 'mikpe/avoid-oversize-bignums' into maintHenrik Nord
* mikpe/avoid-oversize-bignums: don't leave a heap hole in erts_bs_get_integer_2 don't create oversize bignums in binary matching OTP-12556
2015-03-12Merge branch 'bjorn/asn1/double-ellipses/OTP-12546' into maintBjörn Gustavsson
* bjorn/asn1/double-ellipses/OTP-12546: asn1ct_gen: Correct generation of .hrl files for multiple ellipses Fix BER code generation
2015-03-11Merge branch 'dgud/testcasecuddle' into maintDan Gudmundsson
* dgud/testcasecuddle: mnesia: Flush late messages Add Debug info mnesia: better debug info when tests fail mnesia: Ensure tables are loaded before testing them
2015-03-10Merge branch 'josevalim/jv-binary-ets' into maintZandra Hird
* josevalim/jv-binary-ets: Support binary standard input in ets:i/1 OTP-12550
2015-03-09Merge branch 'mururu/fix-type' into maintZandra Hird
* mururu/fix-type: Fix typos in the public_key doc OTP-12549
2015-03-09Merge branch 'erland/ssh/time/OTP-12444' into maintErland Schönbeck
* erland/ssh/time/OTP-12444: Update misleading comment in ssh_basic_SUITE Update new time API and be back-compatible in ssh Use new time API and be back-compatible in ssh otp_SUITE: Ignore undefined functions in ssh
2015-03-09Restore lookup order after testRaimo Niskanen
2015-03-09Merge branch 'ia/public_key/crl/OTP-12547' into maintIngela Anderton Andin
* ia/public_key/crl/OTP-12547: public_key: Improve CRL handling support
2015-03-09public_key: Improve CRL handling supportIngela Anderton Andin
2015-03-07Correct typo in erlang(3) documentationNick Mills
2015-03-06asn1ct_gen: Correct generation of .hrl files for multiple ellipsesBjörn Gustavsson
2015-03-06Fix BER code generationDan Gudmundsson
PKIX1Explicit-2009 did not compile. This commit was cherry-picked from 3ab3b07a already merged into master.
2015-03-06Add client example for using the SSH moduleLinus.yuan
2015-03-06Merge branch 'peppe/common_test/makefile_issue' into maintPeter Andersson
* peppe/common_test/makefile_issue: Have make ignore the chmod command line in the makefile if it fails OTP-12179
2015-03-06Merge branch 'peppe/common_test/ct_telnet_timeout_error' into maintPeter Andersson
* peppe/common_test/ct_telnet_timeout_error: Make sure total_timeout can get triggered before idle_timeout OTP-12335
2015-03-06Merge remote-tracking branch ↵Peter Andersson
'origin/peppe/common_test/inconsistent_return_value' into maint * origin/peppe/common_test/inconsistent_return_value: Add tests Make it possible to skip test case by returning skipped tag OTP-12359
2015-03-06Merge remote-tracking branch 'origin/peppe/common_test/on_tc_fail_log' into ↵Peter Andersson
maint * origin/peppe/common_test/on_tc_fail_log: Modify some tests to verify that new functionality works Make it possible to print in the test case log from on_tc_* hook funcs OTP-12468
2015-03-06Merge branch 'leoliu/master' into maintZandra Hird
* leoliu/master: Two minor fixes OTP-12545
2015-03-05Update misleading comment in ssh_basic_SUITEErland Schönbeck
2015-03-05Merge branch 'anders/diameter/grouped_decode/OTP-12475' into maintAnders Svensson
* anders/diameter/grouped_decode/OTP-12475: Allow encode of decoded diameter_avp list Add testcases for diameter_avp decode Fix handling of length errors on Grouped AVPs Don't discard component diameter_avp list on Grouped AVP decode error Fix process dictionary manipulation during message decode
2015-03-05Merge branch 'egil/fix-break-printout/OTP-12537' into maintBjörn-Egil Dahlberg
* egil/fix-break-printout/OTP-12537: erts: Fix erroneous printout in crashdump
2015-03-05Merge branch 'egil/fix-ts_make-unicode/OTP-12536' into maintBjörn-Egil Dahlberg
* egil/fix-ts_make-unicode/OTP-12536: test_server: Let ts_make have a latin1 fallback
2015-03-05Merge branch 'ia/ssl/TLS_FALLBACK_SCSV/OTP-12458' into maintIngela Anderton Andin
* ia/ssl/TLS_FALLBACK_SCSV/OTP-12458: ssl: Implement support for TLS_FALLBACK_SCSV
2015-03-05Merge branch 'anders/diameter/17/time/OTP-12439' into maintAnders Svensson
* anders/diameter/17/time/OTP-12439: Ignore undefined calls to OTP 18 time api in app suite
2015-03-05Merge branch 'anders/diameter/time/OTP-12439' into maintAnders Svensson
* anders/diameter/time/OTP-12439: Use new time api in test suites Use new time api in implementation
2015-03-05Merge branch 'anders/diameter/pool/OTP-12428' into maintAnders Svensson
* anders/diameter/pool/OTP-12428: Fix SCTP match blunder in suites Be backwards compatible with diameter_sctp listener state Add gen_tcp testcase that fails sporadically Simplify transport suite Remove (ancient) dead code Don't orphan slave nodes in example suite Refresh example code Improve language consistency in diameter(1) Add pool suite to test transport_opt() pool_size Adapt tcp/sctp transport modules for pool_size > 1 Add transport_opt() pool_size
2015-03-05Merge branch 'anders/diameter/shutdown/OTP-12412' into maintAnders Svensson
* anders/diameter/shutdown/OTP-12412: Increase service shutdown timeout Set shutdown = infinity for supervisor children Monitor more efficiently at shutdown
2015-03-05Merge branch 'anders/diameter/retransmission/OTP-12415' into maintAnders Svensson
* anders/diameter/retransmission/OTP-12415: Fix retransmission of messages sent as header/avps list
2015-03-05Merge branch 'anders/diameter/answer_discard/OTP-11492' into maintAnders Svensson
* anders/diameter/answer_discard/OTP-11492: Fix error matching in traffic suite Don't discard outgoing answers with Result-Code/E-bit errors
2015-03-04Allow encode of decoded diameter_avp listAnders Svensson
The decode of an incoming request in a non-relay application results in a deep list of diameter_avp records. Encoding such a list resulted in a function_clause error in diameter_codec:pack_avp/1, which expected a flat list. The list is only flat in the relay case, or in the absence of AVPs of type Grouped. This is also related to code that exists but isn't documented. It's documented that a diameter_app(3) handle_request callback can return {relay, Opts} to relay a request received in the relay application. What's not documented is that it can also return {proxy|resend, Opts} in a non-relay application, but this leads to encode failure when there are Grouped AVPs. This shouldn't be interpreted as meaning that proxy|resend are now supported: they aren't. The two extra terms are a historical relic that should probably be removed. Neither are generally usable since, for example, a proxy agent may want to modify a request before resending it. A specific handle_request return is not needed to implement a proxy agent. Even {relay, Opts} isn't strictly necessary.
2015-03-04Add testcases for diameter_avp decodeAnders Svensson
2015-03-04Fix handling of length errors on Grouped AVPsAnders Svensson
The decode of a Grouped AVP ignored the case that extracting component AVPs with diameter_codec:collect_avps/1 returned a tuple, in the case of a truncated AVP header.
2015-03-02Merge branch 'raimo/inet_tcp_dist-priority-option/OTP-12476' into maintRaimo Niskanen
* raimo/inet_tcp_dist-priority-option/OTP-12476: Document kernel inet_dist_{listen,connect}_options Test kernel inet_dist_{listen,connect}_options Implement kernel inet_dist_{listen,connect}_options
2015-03-02ssl: Implement support for TLS_FALLBACK_SCSVIngela Anderton Andin
2015-03-02Update new time API and be back-compatible in sshErland Schönbeck
2015-03-01Ignore undefined calls to OTP 18 time api in app suiteAnders Svensson
So that the xref testcase is independent of the release it's run on. The code uses the new time api if available, so as to be forward compatible.
2015-02-27Two minor fixesLeo Liu
* Fix documentation on $char for unicode * Remove duplicate declaration for erts_encode_ext_dist_header_size