aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-02-27Merge branch 'rokob/eliminate-duplication-app-controller' into maintZandra Hird
* rokob/eliminate-duplication-app-controller: Add helper function to reduce code duplication OTP-12524
2015-02-27Merge branch 'nox/docs-re-unicode' into maintHenrik Nord
* nox/docs-re-unicode: Fix documentation about character types in unicode mode OTP-12521
2015-02-27Merge branch 'kellymclaughlin/crypto-aes-cfb-flexible-key-size/OTP-12467' ↵Henrik Nord
into maint * kellymclaughlin/crypto-aes-cfb-flexible-key-size/OTP-12467: Accept all valid key sizes in aes_cfb functions
2015-02-27Merge branch 'fishcakez/runtime_tools/dbg/OTP-12517' into maintBjörn Gustavsson
* fishcakez/runtime_tools/dbg/OTP-12517: Ensure dbg tracer exits when dbg is stopped
2015-02-26Merge branch 'peppe/common_test/missing_start_flag_in_doc' into maintPeter Andersson
* peppe/common_test/missing_start_flag_in_doc: Add missing -group flag in ct_run help text OTP-12433
2015-02-26Ensure dbg tracer exits when dbg is stoppedJames Fish
Previously the tracer might receive an 'EXIT' message in the trace receive loop and treat it as garbage. Test uses a custom dbg process handler to reliably recreate the race condition, i.e. the message order {trace, ..}, {'EXIT, ..}.
2015-02-25Fix error matching in traffic suiteAnders Svensson
Clause matching error for specific test cases was harmless since the subsequent clause also matched. Errors detected by the server result in Failed-AVP being sent, which should not lead to a decode error in the client.
2015-02-25Don't discard outgoing answers with Result-Code/E-bit errorsAnders Svensson
Outgoing answers missing a Result-Code AVP or setting an E-bit inappropriately were discarded, but there's no particular reason for doing so if the answer can be encoded, and the sender has no way of knowing that their answer has been discarded. It's also inappropriate that the message be discarded in the relay case. Answers are now sent, and an error counter incremented.
2015-02-24Merge branch 'zandra/xcomp-power-pc-dso-linux-fix' into maintZandra Hird
* zandra/xcomp-power-pc-dso-linux-fix: update ppc xcomp file
2015-02-24Merge branch 'nifoc/inet_doc_fixes' into maintZandra Hird
* nifoc/inet_doc_fixes: Fix typos ("received to the socket")
2015-02-23update ppc xcomp fileZandra Hird
2015-02-23Merge remote-tracking branch ↵Peter Andersson
'origin/peppe/common_test/include_file_problems' into maint * origin/peppe/common_test/include_file_problems: Fix failing test case Add valid include path to epp in erl2html2 and fix crashing code OTP-12419
2015-02-20Merge branch 'raimo/infinite-loop-gethostbyname/OTP-12133' into maintRaimo Niskanen
* raimo/infinite-loop-gethostbyname/OTP-12133: Remove infinite loop in inet:gethostbyname_tm/4
2015-02-20Document kernel inet_dist_{listen,connect}_optionsRaimo Niskanen
2015-02-20Test kernel inet_dist_{listen,connect}_optionsRaimo Niskanen
2015-02-20Fix documentation about character types in unicode modeAnthony Ramine
Behaviour of character types \d, \w and \s has always been to not match characters with value above 255, not 128, i.e. they are limited to ISO-Latin-1 and not ASCII.
2015-02-20Merge branch 'ethercrow/export_gen_udp_socket' into maintZandra Hird
* ethercrow/export_gen_udp_socket: Export type gen_udp:socket/0
2015-02-19Fix typos ("received to the socket")Daniel Kempkens
2015-02-19Merge branch 'erland/diameter/time/OTP-12439' into maintErland Schönbeck
* erland/diameter/time/OTP-12439: otp_SUITE: Ignore diameter undefined function errors
2015-02-19Merge branch 'ia/ssl/delete-vs-remove' into maintIngela Anderton Andin
* ia/ssl/delete-vs-remove: ssl: remove -> delete
2015-02-19Implement kernel inet_dist_{listen,connect}_optionsRaimo Niskanen
2015-02-18Add missing -group flag in ct_run help textPeter Andersson
2015-02-18otp_SUITE: Ignore diameter undefined function errorsErland Schönbeck
2015-02-18Merge branch 'richcarl/shell-module-md5-info' into maintZandra Hird
* richcarl/shell-module-md5-info: make c:m/1 show module MD5 OTP-12500
2015-02-18Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [sasl] Make test unreliable of kernel.appup
2015-02-18Merge branch 'stevendanna/eldap-anon-auth-fix' into maintZandra Hird
* stevendanna/eldap-anon-auth-fix: Correctly process anon_auth option for eldap:open()
2015-02-18ssl: remove -> deleteIngela Anderton Andin
Correct mistake
2015-02-18Merge branch 'studzien/ct_cover_paths' into maintZandra Hird
* studzien/ct_cover_paths: Add tests for absolute incl_dirs path and for excl_dirs [ct_cover] Fix paths of incl_dirs in cover spec OTP-12498
2015-02-18Remove infinite loop in inet:gethostbyname_tm/4Raimo Niskanen
An erroneous lookup option is needed to trigger the bug, and that can only enter the system from a parsed file e.g .inetrc. Pinpointed by Emil Holmström
2015-02-17make c:m/1 show module MD5Richard Carlsson
2015-02-17Merge branch 'ia/ssl/os-timestamp' into maintIngela Anderton Andin
* ia/ssl/os-timestamp: ssl: erlang:timestamp -> os:timestamp Complements commit 450773958165539951cd431a9233ce7666ec20e2
2015-02-17ssl: erlang:timestamp -> os:timestampIngela Anderton Andin
Complements commit 450773958165539951cd431a9233ce7666ec20e2
2015-02-16Add helper function to reduce code duplicationAndy Ledvina
I was going through application_controller.erl looking for why something was behaving a certain way, saw a comment about removing this duplicated code one day, and decided to move that a step forward.
2015-02-13Merge branch 'emauton/mnesia_create_table_docfix' into maintZandra Hird
* emauton/mnesia_create_table_docfix: Fix index for #person.address in create_table/2
2015-02-13Merge branch 'crownedgrouse/fix_mnesia_subscribe_doc' into maintZandra Hird
* crownedgrouse/fix_mnesia_subscribe_doc: Fix xml doc return value mnesia:(un)subscribe
2015-02-13Merge branch 'yannayl/patch-1' into maintZandra Hird
* yannayl/patch-1: Fixed fun_test examples
2015-02-12Merge remote branch 'origin/hb/dialyzer/fix_map_type/OTP-12472' into maintHans Bolinder
* origin/hb/dialyzer/fix_map_type/OTP-12472: [dialyzer] Fix a bug concerning map() types
2015-02-11Add tests for absolute incl_dirs path and for excl_dirsRafal Studnicki
2015-02-11Fixed fun_test examplesyannayl
Removed false example from fun_test.erl Removed unused code from fun_test.erl
2015-02-11Merge branch 'derek121/getting-started-typos' into maintZandra Hird
* derek121/getting-started-typos: Fix typos OTP-12478
2015-02-10Merge branch ↵Dan Gudmundsson
'dumbbell/mnesia-hang-if-remote-stopped-after-proto-negotiation' into maint * dumbbell/mnesia-hang-if-remote-stopped-after-proto-negotiation: mnesia: Check nodes after protocol negotiation OTP-12473
2015-02-10mnesia: Check nodes after protocol negotiationJean-Sébastien Pédron
During Mnesia startup, after protocol negotiation, the list of connected nodes is written to "recover_nodes". This list is later used to merge the schema. If Mnesia was stopped on a remote node between the protocol negotiation and the moment the list is stored in "recover_nodes", the remote node is still considered running: the value of "recover_nodes" stored during mnesia_down/1 is overwritten. Therefore, this node may be used to acquire a write lock on the schema in order to perform the merge. In this case, the remote node never answers to the lock request and Mnesia hang forever (application:start(mnesia) never returns). To fix the problem, we check the list one last time and remove from it all nodes where Mnesia is stopped. And because there is still a chance for missing mnesia_down event, handle_cast({mnesia_down, ...}, ...) writes to recover_nodes again, in addition to mnesia_down/1.
2015-02-10[dialyzer] Fix a bug concerning map() typesHans Bolinder
It is allowed in Erlang/OTP 17 to redefine the map() types. However, Dialyzer did not handle local map() types correctly.
2015-02-10Fix failing test casePeter Andersson
2015-02-09Fix typosDerek Brown
Fixed a number of typos.
2015-02-09Merge branch 'ia/ssl/timestamp' into maintIngela Anderton Andin
* ia/ssl/timestamp: ssl: erlang:timestamp -> os:timestamp