aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2013-11-06Merge branch 'bmk/snmp/handling_corrupt_atl_when_converting/OTP-11453' into ↵Micael Karlberg
bmk/snmp/handling_corrupt_atl_when_converting/r16/OTP-11453 Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
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-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-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 '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 '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-01Typo fix ambigous -> ambiguousLeo Correa
2013-11-01Fix client_preferred_next_protocols documentationJulien Barbot
2013-11-01Merge branch 'tsloughter/ssh_doc_fix/OTP-11449' into maintFredrik Gustafsson
* tsloughter/ssh_doc_fix/OTP-11449: fix private_key type documentation in ssh_server_key_api
2013-10-31[snmp] Improving ATL handling of corrupt logsMicael Karlberg
When converting an Audit Trail Log to text a corrupt log entry could cause the entire conversion to fail. Also, for a log with sequence numbers, failing to decode a log entry would cause the conversion to fail (not because of the failed decode, but because of the failure to write the error message). OTP-11453
2013-10-31Fix incorrect reporting of memory on OS X via memsup.Christopher Meiklejohn
Application memsup should be calculating free memory using the speculative pages, in the same manner that the Activity Monitor and top programs on OS X do. In addition, correct page size to 4096, based on verification of available memory between top, vm_stat and Activity Monitor.
2013-10-31Merge branch 'gomoripeti/pgo-cover-export-all/OTP-11439' into maintFredrik Gustafsson
* gomoripeti/pgo-cover-export-all/OTP-11439: tools: Fix compile_beam_opts testcase Take compiler options from beam in cover:compile_beam
2013-10-31fix private_key type documentation in ssh_server_key_apiTristan Sloughter
2013-10-31Remove extraneous dev debug code left in the close function.Ken Key
We do not need a traceback on every close in inet_tls_dist and this breaks using nodetool in control scripts on SSL clustered nodes
2013-10-30tools: Fix compile_beam_opts testcaseFredrik Gustafsson
2013-10-30Take compiler options from beam in cover:compile_beamPéter Gömöri
Similarly to cover compiling from source (in this case some user specified compiler options are allowed) when cover compiling from existing beam take a filtered list of compiler options from the beamfile. This way e.g. export_all can be preserved. See use case in eb02beb1c3
2013-10-29Merge branch 'hawk/regexp_marker/OTP-11442' into maintFredrik Gustafsson
* hawk/regexp_marker/OTP-11442: Add XML marker for regexp syntax
2013-10-29eldap: re-fixed earlier bug fix...Hans Nilsson
2013-10-28eldap: minor doc change after review.Hans Nilsson
2013-10-28eldap: DocHans Nilsson
2013-10-28eldap: Minor change (error code)Hans Nilsson
2013-10-28eldap: Changed instruction in test/READMEHans Nilsson
2013-10-28eldap: Add START_TLS (OTP-11336)Hans Nilsson
2013-10-28ssh: Add ssh:sockname/1 incl doc and testsHans Nilsson
OTP-11345, sto575, tsk374
2013-10-28ssh: Add function ssh:peername/1 with testHans Nilsson
OTP-11345, sto575, tsk374
2013-10-25Add XML marker for regexp syntaxHåkan Mattsson
2013-10-25Merge branch 'puzza007/emacs_iodata_nonempty_string_builtin_types/OTP-11394' ↵Fredrik Gustafsson
into maint * puzza007/emacs_iodata_nonempty_string_builtin_types/OTP-11394: Add iodata, nonempty_string to built-in type highlighting for emacs
2013-10-24Remove test_server_h from cover spec filePeter Andersson
2013-10-23Merge branch 'ates/sctp_errors_fix/OTP-11379' into maintFredrik Gustafsson
* ates/sctp_errors_fix/OTP-11379: Update primary bootstrap Add more SCTP errors as described in RFC 4960
2013-10-22tools: Add Erlang-specific compilation error regexp for erlang-eunitFredrik Gustafsson
This defvar was removed in a87a9699735b0a25f99397fba9576f5756da54d3 which made eunit fail on running tests in emacs.
2013-10-21Merge branch 'egil/orber/remove-old-ssl-test/OTP-11418' into maintBjörn-Egil Dahlberg
2013-10-21Merge branch 'mhssler/fix-doc-typos/OTP-11414' into maintFredrik Gustafsson
* mhssler/fix-doc-typos/OTP-11414: Fix ssh doc typos Fix gen_sctp doc typo Fix erts erlang.xml doc typo
2013-10-21Merge branch 'bjorn/asn1/fix-extensible-single-values/OTP-11415' into maintBjörn Gustavsson
* bjorn/asn1/fix-extensible-single-values/OTP-11415: PER/UPER: Correct encoding for single-value extensible constraints asn1ct_value: Handle named INTEGERs with constraints
2013-10-18Merge branch 'bjorn/asn1/fix-default-values/OTP-11319' into maintBjörn Gustavsson
* bjorn/asn1/fix-default-values/OTP-11319: Fix broken handling of default values for BIT STRINGs
2013-10-18common_test: Add terminate/1Fredrik Gustafsson
2013-10-17Merge branch 'bjorn/asn1/fix-dot-erlang-issue/OTP-11360' into maintBjörn Gustavsson
* bjorn/asn1/fix-dot-erlang-issue/OTP-11360: Cope with .erlang files that print to stdout
2013-10-16Merge branch 'robertoaloi/cth_fix_terminate/OTP-11401' into maintFredrik Gustafsson
* robertoaloi/cth_fix_terminate/OTP-11401: common_test: added code_change/3 for gen_event behaviour The gen_event callback module expects terminate/2, not terminate/1
2013-10-16Fix ssh doc typosMartin Hässler
ssh_rsa changed to 'ssh-rsa' and missing space added.
2013-10-16Fix gen_sctp doc typoMartin Hässler
'one-to-may' should be 'one-to-many'
2013-10-15Merge branch 'blt/gen_server-typo/OTP-11398' into maintFredrik Gustafsson
* blt/gen_server-typo/OTP-11398: Change 'recive' to 'receive' in gen_server.erl
2013-10-14Merge branch 'fenollp/treewide_remove_unexpected_0xff/OTP-11323' into maintFredrik Gustafsson
* fenollp/treewide_remove_unexpected_0xff/OTP-11323: Remove ^L characters hidden randomly in the code. Not those used in text files as delimiters.
2013-10-14Merge branch 'ia/inets/http-client-cancel-request/OTP-11312' into maintIngela Anderton Andin
* ia/inets/http-client-cancel-request/OTP-11312: inets: httpc - Remove dead error handling code inets: httpc make httpc_cancel_request/[1,2] asynchronous httpc: Enhanched error handling inets: httpc improve pipelining
2013-10-14Merge branch 'ia/ssl/ecc-gnutls/OTP-11370' into maintIngela Anderton Andin
* ia/ssl/ecc-gnutls/OTP-11370: ssl: Fix dialyzer spec ssl: Honor TLS client ECC extension
2013-10-14ssl: Fix dialyzer specIngela Anderton Andin
2013-10-14Merge remote branch 'origin/peppe/common_test/missing_error_reports' into maintPeter Andersson
* origin/peppe/common_test/missing_error_reports: Use normal- instead of scaled timeouts in test case
2013-10-14Merge branch 'kostis/dialyzer_R16B02_fixes/OTP-11374' into maintFredrik Gustafsson
* kostis/dialyzer_R16B02_fixes/OTP-11374: Fix crash when using remote types in the tail of list types Adopt a convention about unknown modules No reason for calls to unknown modules Use the modern version of is_subtype Adopt a convention about unknown modules Fix a comment Add some more comments about what the test does
2013-10-14ssl: Honor TLS client ECC extensionIngela Anderton Andin
Also the server should only send ECC point formats extension not ECC curve extension.
2013-10-12Change 'recive' to 'receive' in gen_server.erlBrian L. Troutwine
A small spelling correction merely; no functionality change.