aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-13Merge branch 'maint'Fredrik Gustafsson
2013-11-13Merge branch 'bsmr-erlang/fix_gen_fsm_example/OTP-11472' into maintFredrik Gustafsson
* bsmr-erlang/fix_gen_fsm_example/OTP-11472: fixed small typo (missing right parenthesis) in gen_fsm example
2013-11-13Merge branch 'maint'Fredrik Gustafsson
2013-11-13Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maintFredrik Gustafsson
* fredrik/doc/syntax_highlight/OTP-11237: erl_docgen: fix code highlighting and warning and note parts in erl_docgen
2013-11-13erl_docgen: fix code highlighting and warning and note parts in erl_docgenFredrik Gustafsson
2013-11-12Merge branch 'maint'Henrik Nord
2013-11-12Merge branch 'henrik/xcomp-arm' into maintHenrik Nord
2013-11-12add erl-xcom-arm-linux.confHenrik Nord
2013-11-11Merge branch 'maint'Sverker Eriksson
2013-11-11Merge branch 'sverk/valgrind-added-leak-check' into maintSverker Eriksson
* sverk/valgrind-added-leak-check: erts: Prevent valgrind from repeating same memory leaks reports
2013-11-11Merge branch 'maint'Fredrik Gustafsson
2013-11-11Merge branch 'klyr/ssl_sni_client/OTP-11460' into maintFredrik Gustafsson
* klyr/ssl_sni_client/OTP-11460: Update documentation Add a new server_name_indication option to ssl:connect Add SSL Server Name Indication (SNI) client support
2013-11-09fixed small typo (missing right parenthesis) in gen_fsm exampleBoris Mühmer
2013-11-08Merge branch 'maint'Fredrik Gustafsson
2013-11-08Merge branch 'robertoaloi/eunit/surefire-printable-chars/OTP-11467' into maintFredrik Gustafsson
* robertoaloi/eunit/surefire-printable-chars/OTP-11467: Do not attempt to detect lists of printable characters in Data
2013-11-07Merge branch 'maint'Fredrik Gustafsson
2013-11-07Merge branch 'asterite/atan2_spec/OTP-11465' into maintFredrik Gustafsson
* asterite/atan2_spec/OTP-11465: Spec for atan2 should be atan2(Y, X), not atan2(X, Y)
2013-11-07Merge branch 'maint'Lukas Larsson
* maint: erts: Add cerl -dump and dumping in z_SUITE
2013-11-07Merge branch 'lukas/cerl_dump/OTP-11468' into maintLukas Larsson
* lukas/cerl_dump/OTP-11468: erts: Add cerl -dump and dumping in z_SUITE
2013-11-07erts: Add cerl -dump and dumping in z_SUITELukas Larsson
2013-11-07Do not attempt to detect lists of printable characters in DataRoberto Aloi
This is to avoid outputting something like "\"%\f" instead of [34,37,12] in the XML.
2013-11-07Merge branch 'maint'Fredrik Gustafsson
2013-11-07Merge branch 'richcarl/sasl-dont-add-undefined-handler/OTP-11464' into maintFredrik Gustafsson
* richcarl/sasl-dont-add-undefined-handler/OTP-11464: Don't try to add the log_mf_h handler in sasl unless configured to do so.
2013-11-06Merge branch 'maint'Fredrik Gustafsson
2013-11-06Merge branch 'maint-r16' into maintFredrik Gustafsson
2013-11-06Update documentationJulien Barbot
2013-11-06Add a new server_name_indication option to ssl:connectJulien Barbot
- Set to disable to explicitly disable SNI support. - Set to a hostname when upgrading from TCP to TLS.
2013-11-06Add SSL Server Name Indication (SNI) client supportJulien Barbot
See RFC 6066 section 3
2013-11-06Merge branch 'maint'Fredrik Gustafsson
2013-11-06Merge branch 'richcarl/xmerl-avoid-code-server-serialization/OTP-11463' into ↵Fredrik Gustafsson
maint * richcarl/xmerl-avoid-code-server-serialization/OTP-11463: Avoid serialization on code_server in xmerl:export()
2013-11-05Merge branch 'maint'Fredrik Gustafsson
2013-11-05Merge branch 'danielwhite/xmerl-xpath-resolve-context-namespaces/OTP-11461' ↵Fredrik Gustafsson
into maint * danielwhite/xmerl-xpath-resolve-context-namespaces/OTP-11461: xmerl: Use context namespace declarations to resolve prefix node tests xmerl: Look up unknown prefixes in xmlContext when matching attributes xmerl: Add tests for XPath queries that resolve the context namespace
2013-11-05Avoid serialization on code_server in xmerl:export()Richard Carlsson
The inheritance mechanism in xmerl used to use 'catch apply(M,F,Args)' to try different modules M until one was found that had a function F/A. However, when M:F/A does not exist, apply/3 will trap to error_handler:undefined_function/3, which will call code:ensure_loaded(M), making a synchronous request to the code server process. If many processes tried to use xmerl:export() concurrently, they would get serialized waiting for the code server process. This patch uses erlang:function_exported/3 instead to check if M:F/A exists. If M exists, it should already have been loaded at that point due to the inheritance checking in the xmerl:callbacks/1 function.
2013-11-05Merge branch 'maint'Sverker Eriksson
2013-11-04Merge branch 'sverk/monitor-memory-leak/OTP-11410' into maintSverker Eriksson
* sverk/monitor-memory-leak/OTP-11410: erts: Fix memory leak for distributed monitors
2013-11-04erts: Prevent valgrind from repeating same memory leaks reportsSverker Eriksson
by using the macro VALGRIND_DO_ADDED_LEAK_CHECK if it exists for system_info({error_checker,memory})
2013-11-04xmerl: Use context namespace declarations to resolve prefix node testsDaniel White
Previously, a match would not be found if the namespace prefix in the XPath query was not contained in the original document. This allows the `namespace' option to provide a prefix that will be resolved to a namespace URI. See Section 2.3 of the XPath 1.0 specification for the behaviour of 'NCName:*' node tests.
2013-11-04xmerl: Look up unknown prefixes in xmlContext when matching attributesDaniel White
The core use case is a query where the original prefix in the scanned document is unknown (or varying). For example: xmerl_xpath:scan("//@ns:name", Doc, [{namespace, [{"ns", Uri}]}]) Previously, this would only return a result if the namespace prefix was an exact match.
2013-11-04xmerl: Add tests for XPath queries that resolve the context namespaceDaniel White
Ensures that both the original namespace prefix and a namespace prefix provided to the xmlContext will both return the same sets of nodes.
2013-11-04Merge branch 'maint'Fredrik Gustafsson
2013-11-04Merge branch 'klyr/fix-ssl-npn-doc-2/OTP-11457' into maintFredrik Gustafsson
* klyr/fix-ssl-npn-doc-2/OTP-11457: Fix client_preferred_next_protocols documentation
2013-11-04Merge branch 'maint'Fredrik Gustafsson
2013-11-04Merge branch 'cmeiklejohn/csm-fix-memsup-problems/OTP-11454' into maintFredrik Gustafsson
* cmeiklejohn/csm-fix-memsup-problems/OTP-11454: Fix incorrect reporting of memory on OS X via memsup.
2013-11-04Merge branch 'maint'Fredrik Gustafsson
2013-11-04Merge branch 'Tonkpils/typo-fix/OTP-11455' into maintFredrik Gustafsson
* Tonkpils/typo-fix/OTP-11455: Update primary bootstrap Typo fix ambigous -> ambiguous
2013-11-04Update release notesErlang/OTP
2013-11-04Merge branch 'anders/diameter/patch_release/OTP-11459' into maint-r16Erlang/OTP
* anders/diameter/patch_release/OTP-11459: Update appup, vsn -> 1.4.4 Fix handling of 5014, DIAMETER_INVALID_AVP_LENGTH Fix broken DWA
2013-11-03Update appup, vsn -> 1.4.4Anders Svensson
2013-11-03Merge branch 'anders/diameter/5014_failure/OTP-11395' into ↵Anders Svensson
anders/diameter/patch_release/OTP-11459 * anders/diameter/5014_failure/OTP-11395: Fix handling of 5014, DIAMETER_INVALID_AVP_LENGTH
2013-11-03Merge branch 'anders/diameter/broken_dwa/OTP-11367' into ↵Anders Svensson
anders/diameter/patch_release/OTP-11459 * anders/diameter/broken_dwa/OTP-11367: Fix broken DWA