aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-02-18Merge branch 'lukas/erts/file_read_line_opt/OTP-10859'Lukas Larsson
* lukas/erts/file_read_line_opt/OTP-10859: invoke_read_line now remembers read_ahead settings
2013-02-18Merge branch 'lukas/erts/writev_osx_fix/OTP-10858'Lukas Larsson
* lukas/erts/writev_osx_fix/OTP-10858: Do not use writev on osx snow leopard
2013-02-18Merge branch 'bjorn/asn1/bug-fixes/OTP-10853'Björn Gustavsson
* bjorn/asn1/bug-fixes/OTP-10853: asn1ct: Eliminate use of obsolete size/1 Eliminate use of obsolete size/1 in generated code BER: Fix broken table constraints inside a SET OF/SEQUENCE OF Smoke test the 'der' option der: Correct code generation for checking of empty sets per,uper: Fix breakage of compilation of InformationFramework Add NullTest asn1_SUITE: Shorten the path to case-specific directory asn1_SUITE: Don't add priv_dir to the code path asn1 tests: Remove obsolete duplicates of ASN.1 specs
2013-02-18Merge branch 'anders/diameter/5xxx_errors/OTP-10759'Anders Svensson
* anders/diameter/5xxx_errors/OTP-10759: Add testcases for application_opt() request_errors = answer Answer 5xxx errors with application_opt() request_errors = answer Comments and minor Result-Code fix
2013-02-18Merge branch 'anders/diameter/result_code/OTP-10761'Anders Svensson
* anders/diameter/result_code/OTP-10761: Add testcases to 3xxx suite Minor traffic suite fix Be less brutal in setting Result-Code/Failed-AVP
2013-02-18Merge branch 'anders/diameter/3xxx_callback/OTP-10686'Anders Svensson
* anders/diameter/3xxx_callback/OTP-10686: Add 3xxx suite for testing application_opt() request_errors Minor suite simplification Add application_opt() request_errors
2013-02-18Merge branch 'ia/odbc/port_info'Ingela Anderton Andin
* ia/odbc/port_info: odbc: Use erlang:port_info to make sure test cases chooses the correct port
2013-02-17Add testcases for application_opt() request_errors = answerAnders Svensson
2013-02-17Answer 5xxx errors with application_opt() request_errors = answerAnders Svensson
RFC 3588 allowed only 3xxx result codes in an answer-message (that is, an answer that sets the E-bit) while RFC 6733 also allows 5xxx result codes. Setting request_errors = answer tells diameter to answer 5xxx errors itself. Returning {answer_message, integer()} from a handle_request callback allows both 3xxx and 5xxx result codes to be set. {protocol_error, integer()} is retained for 3xxx result codes.
2013-02-16Comments and minor Result-Code fixAnders Svensson
In particular, don't put an error tuple in the errors field of a #diameter_packet{} when Result-Code and the E-bit are in conflict, put {integer(), #diameter_avp{}}.
2013-02-16Add testcases to 3xxx suiteAnders Svensson
2013-02-16Minor traffic suite fixAnders Svensson
2013-02-16Be less brutal in setting Result-Code/Failed-AVPAnders Svensson
When receiving a request for which errors have been detected during decode, diameter previously used the errors list in the decoded diameter_packet record to unconditionally set Result-Code and Failed-AVP in the outgoing answer. It wasn't particularly delicate in doing so however and would happily set a 5xxx Result-Code even if a handle_request callback returned an answer-message, leading to an encode error. This behaviour became even less endearing as of commit ac452e28, which made it possible to handle_request to take place even for protocol errors. (ie. When a callback typically should return an answer-message.) This commit fixes the behaviour by only setting a value that's appropriate for the answer in question, either a 3xxx or a 5xxx, depending on if the answer's an answer-message or not. It also allows handle_request to prevent diameter from setting anything by setting errors = false in a returned diameter_packet. Ideally it should have been errors = [] but the empty list is the default value for the errors field and changing the default (ideally there shouldn't have been one) would require recompilation of all modules including diameter.hrl: choose the less attractive 'false' to avoid such backwards incompatibility. The request reception is also refactored somewhat to shorten some call chains.
2013-02-16Add 3xxx suite for testing application_opt() request_errorsAnders Svensson
2013-02-16Minor suite simplificationAnders Svensson
2013-02-16Add application_opt() request_errorsAnders Svensson
Configuring the value 'callback' all errors detected in incoming requests to result in a handle_request callback. The default value 'answer_3xxx' is the previous behaviour in which diameter answers protocol errors without a callback.
2013-02-16asn1ct: Eliminate use of obsolete size/1Björn Gustavsson
Also teach otp_SUITE:call_to_size/1 that calls to size/1 is no longer allowed within the asn1 application.
2013-02-16Eliminate use of obsolete size/1 in generated codeBjörn Gustavsson
It is recommended to use byte_size/1 or tuple_size/1 instead of size/1.
2013-02-15Merge branch 'lukas/erts/add_sha_to_shell_title/OTP-10838'Lukas Larsson
* lukas/erts/add_sha_to_shell_title/OTP-10838: Remove could not find warning
2013-02-15Remove could not find warningLukas Larsson
2013-02-15invoke_read_line now remembers read_ahead settingsLukas Larsson
2013-02-15Merge remote branch 'origin/peppe/common_test/ct_master_evh'Peter Andersson
* origin/peppe/common_test/ct_master_evh: Fix problem with hanging event handler OTP-10634
2013-02-15BER: Fix broken table constraints inside a SET OF/SEQUENCE OFBjörn Gustavsson
2013-02-15Merge branch 'hb/stdlib/unicode_corrections/OTP-10820'Hans Bolinder
* hb/stdlib/unicode_corrections/OTP-10820: [stdlib] Add documentation of ~tp [stdlib] Correct handling of Unicode filenames
2013-02-15[stdlib] Add documentation of ~tpHans Bolinder
A short description of how ~tp works now.
2013-02-15[stdlib] Correct handling of Unicode filenamesHans Bolinder
2013-02-15Merge branch 'hb/stdlib/new_l_modifier/otp-10755'Hans Bolinder
* hb/stdlib/new_l_modifier/otp-10755: [stdlib] Add new SDTLIB application variable 'shell_strings' [stdlib] Add control sequence modifier 'l'
2013-02-15[stdlib] Add new SDTLIB application variable 'shell_strings'Hans Bolinder
Use the new function shell:strings/1 to toggle how the Erlang shell outputs lists of integers.
2013-02-15[stdlib] Add control sequence modifier 'l'Hans Bolinder
The modifier 'l' can be used for turning off the string recognition of ~p and ~P.
2013-02-15Merge branch 'fredrik/ssh/versions-R16B'Fredrik Gustafsson
* fredrik/ssh/versions-R16B: Versions and appup ssh, R16B
2013-02-15Versions and appup ssh, R16BFredrik Gustafsson
2013-02-15Merge branch 'fredrik/ssh/better-error-messages/OTP-10553'Fredrik Gustafsson
* fredrik/ssh/better-error-messages/OTP-10553: Added event/3 and clarified error message Error msg to be returned together with Key exchange failed Returning the actual reason why key exchange failed
2013-02-15Added event/3 and clarified error messageFredrik Gustafsson
2013-02-15Error msg to be returned together with Key exchange failedFredrik Gustafsson
2013-02-15Returning the actual reason why key exchange failedFredrik Gustafsson
2013-02-15Do not use writev on osx snow leopardLukas Larsson
writev will for large files return 0 indefinetely causing the efile driver to go into an infinite loop.
2013-02-15Merge branch 'ks/xcomp-powerpc64-bgq/OTP-10849'Fredrik Gustafsson
* ks/xcomp-powerpc64-bgq/OTP-10849: Add an xcomp file for Blue Gene/Q
2013-02-15Merge branch 'sc/gen_tcp_send_error_closed/OTP-10839'Fredrik Gustafsson
* sc/gen_tcp_send_error_closed/OTP-10839: Fix type of error Reason on gen_tcp:send/2
2013-02-14Merge branch 'rickard/erl_drv_consume_timeslice/OTP-10810'Rickard Green
* rickard/erl_drv_consume_timeslice/OTP-10810: Implement erl_drv_consume_timeslice()
2013-02-14Merge branch 'rickard/win-drv-bugfix/OTP-10807'Rickard Green
* rickard/win-drv-bugfix/OTP-10807: Fix flush of fd-driver on Windows
2013-02-14Merge branch 'rickard/win-drv-bugfix/OTP-10803'Rickard Green
* rickard/win-drv-bugfix/OTP-10803: Fix unsafe accesses to driver data from win32 fd/vanilla/spawn drivers
2013-02-14Merge branch 'rickard/win-drv-bugfix/OTP-10802'Rickard Green
* rickard/win-drv-bugfix/OTP-10802: Fix unsafe driver_select() from win32 vanilla/spawn drivers
2013-02-14Merge branch 'rickard/r16b/port-optimizations-fixes/OTP-10809'Rickard Green
* rickard/r16b/port-optimizations-fixes/OTP-10809: Add erl_drv_busy_msgq_limits() to driver API on Windows Fix driver port accesses Fix port exit
2013-02-14Merge branch 'rickard/r16b/notes-fix'Rickard Green
* rickard/r16b/notes-fix: Fix erts-5.10 release notes
2013-02-14Merge branch 'rickard/small-build'Rickard Green
* rickard/small-build: Include apps needed for tests and doc in small build
2013-02-14Smoke test the 'der' optionBjörn Gustavsson
2013-02-14der: Correct code generation for checking of empty setsBjörn Gustavsson
The ASN.1 compiler would generate an Erlang module with incorrect syntax for: T DEFINITIONS AUTOMATIC TAGS ::= BEGIN Empty ::= SET { } S ::= SEQUENCE { e Empty DEFAULT {} } END
2013-02-14per,uper: Fix breakage of compilation of InformationFrameworkBjörn Gustavsson
Commit f16f43446a04c459486356c0b4ad517cc9201895 broke compilation of InformationFramework for per and uper.
2013-02-14Add NullTestBjörn Gustavsson
Was broken in some backends in R15. Make sure that we will notice if it breaks again.
2013-02-14asn1_SUITE: Shorten the path to case-specific directoryBjörn Gustavsson
On Windows, there is a limit to the number of characters in a filename. Therefore, we don't want unnecessarily use any longer path than necessary for case-specific directory. Since all test cases that put anything into priv_dir is asn1_SUITE, it is not necessary to include "asn1_SUITE" as part of the case-specific directory.