aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-13Merge branch 'bmk/snmp/handling_corrupt_atl_when_converting/r16/OTP-11453' ↵Micael Karlberg
into bmk/snmp/snmp425_integration Conflicts: lib/snmp/src/misc/snmp_log.erl
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-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-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-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-04Merge branch 'Tonkpils/typo-fix/OTP-11455' into maintFredrik Gustafsson
* Tonkpils/typo-fix/OTP-11455: Update primary bootstrap Typo fix ambigous -> ambiguous
2013-11-01Update primary bootstrapFredrik Gustafsson
2013-11-01Typo fix ambigous -> ambiguousLeo Correa
2013-11-01Fix client_preferred_next_protocols documentationJulien Barbot
2013-11-01Merge branch 'lukas/erts/openbsd-posix-memalign-fix/OTP-11371' into maintLukas Larsson
* lukas/erts/openbsd-posix-memalign-fix/OTP-11371: erts: Add max alignment posix_memalign configure check
2013-11-01erts: Add max alignment posix_memalign configure checkLukas Larsson
On some OSs posix_memalign exists, but it does not allow for alignment greater than the current page size. So we have to do a runtime check for alignment size and also add cross compile options.
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-31Merge branch 'ksquaredkey/fix_inet_tls_dist/OTP-11447' into maintFredrik Gustafsson
* ksquaredkey/fix_inet_tls_dist/OTP-11447: Remove extraneous dev debug code left in the close function.
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-30Merge branch 'JakubOboza/update_install_md/OTP-11448' into maintFredrik Gustafsson
* JakubOboza/update_install_md/OTP-11448: Update INSTALL.md
2013-10-30Update INSTALL.mdJakub
Added info how to generate configure file if building from git.
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-29Merge branch 'hans/eldap/starttls/OTP-11336' into maintHans Nilsson
* hans/eldap/starttls/OTP-11336: eldap: re-fixed earlier bug fix...
2013-10-29eldap: re-fixed earlier bug fix...Hans Nilsson
2013-10-28Merge branch 'hans/eldap/starttls/OTP-11336' into maintHans Nilsson
* hans/eldap/starttls/OTP-11336: eldap: minor doc change after review. eldap: Doc eldap: Minor change (error code) eldap: Changed instruction in test/README eldap: Add START_TLS (OTP-11336)
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-28Merge branch 'hans/ssh/srcip/OTP-11339' into maintHans Nilsson
* hans/ssh/srcip/OTP-11339: ssh: Add ssh:sockname/1 incl doc and tests ssh: Add function ssh:peername/1 with test
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-24Merge branch 'peppe/common_test/cover_problem' into maintPeter Andersson
* peppe/common_test/cover_problem: Remove test_server_h from cover spec file
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-22Merge branch 'fredrik/tools/emacs_eunit_regexp/OTP-11417' into maintFredrik Gustafsson
* fredrik/tools/emacs_eunit_regexp/OTP-11417: tools: Add Erlang-specific compilation error regexp for erlang-eunit
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/fix-crashdump-pointer-crash/OTP-11420' into maintBjörn-Egil Dahlberg
* egil/fix-crashdump-pointer-crash/OTP-11420: erts: Fix segfaulting crashdump writing
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