aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2011-09-26Merge branch 'major' of super:otp into bmk/inets/inets58_integrationMicael Karlberg
2011-09-26Merge branch 'dev' into majorLukas
* dev: Add documentation for cth_log_redirect and built-in hooks Correct wrong match from lists:keyfind Update cth_log_redirect to wait for all error_logger events before ending test Force logging to framework log for parallel tests Add ct_log:ct_log funcion Add a hook for redirecting SASL and error_logger messages Add -enable_builtin_hooks <bool> config option Export write_events and add option to return a string
2011-09-26Merge branch 'lukas/common_test/system_logs_to_ct_log/OTP-9543' into devLukas
* lukas/common_test/system_logs_to_ct_log/OTP-9543: Add documentation for cth_log_redirect and built-in hooks Correct wrong match from lists:keyfind Update cth_log_redirect to wait for all error_logger events before ending test Force logging to framework log for parallel tests Add ct_log:ct_log funcion Add a hook for redirecting SASL and error_logger messages Add -enable_builtin_hooks <bool> config option Export write_events and add option to return a string
2011-09-26Merge branch 'dev' into majorLars Thorsen
* dev: [xmerl] Fix streaming bug in xmerl_scan (Thanks to Simon Cornish)
2011-09-26[xmerl] Fix streaming bug in xmerl_scan (Thanks to Simon Cornish)Lars Thorsen
2011-09-26Merge branch 'dev' into majorLars Thorsen
* dev: [erl_docgen] Fix eix file generation for new function spec references
2011-09-26[erl_docgen] Fix eix file generation for new function spec referencesLars Thorsen
2011-09-26Merge branch 'dev' into majorLars Thorsen
* dev: [erl_docgen] Missing header level in PDF bookmarks menu Fixed version, release notes and appup in prep for release. Fix lost wakeup of scheduler when enqueuing auxiliary work
2011-09-26[erl_docgen] Missing header level in PDF bookmarks menuLars Thorsen
The System documentation PDF file was missing a header level in the bookmarks menu and the copyright year generation for PDF's was not correct.
2011-09-23Merge branch 'bmk/megaco/fix_version_and_notes/OTP-9550' into devMicael Karlberg
2011-09-23Merge branch 'major' of super:otp into bmk/inets/inets58_integrationMicael Karlberg
2011-09-23Merge branch 'dev' into majorMicael Karlberg
Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src lib/inets/test/httpc_cookie_SUITE.erl lib/inets/vsn.mk
2011-09-23Merge branch 'egil/fix-ei-cover-case' into devBjörn-Egil Dahlberg
* egil/fix-ei-cover-case: ei: Add gcc link flags to port_call_SUITE Change static link test of ssl to dynamic Remove static ssl linking in crypto for otp_build
2011-09-23Merge branch 'dev' of super:otp into bmk/megaco/fix_version_and_notes/OTP-9550Micael Karlberg
2011-09-23Merge branch 'major' of super:otp into bmk/inets/inets58_integrationMicael Karlberg
2011-09-23[httpc] Parsing of a cookie expire date should be more forgiving.Micael Karlberg
That is, if the parsing fails, the date should be ignored. Also added support for (yet another) date format: "Tue Jan 01 08:00:01 2036 GMT". OTP-9433 [httpc] Rewrote cookie parsing. Among other things solving cookie processing from www.expedia.com. OTP-9434 [httpd] Fix httpd directory traversal on Windows. Directory traversal was possible on Windows where backward slash is used as directory separator. Andr�s Veres-Szentkir�lyi. OTP-9561 Merge branch 'bmk/inets/inets571_integration' into dev
2011-09-23[compiler] Used wrong variable name (for warnings-as-errors variable),Micael Karlberg
which caused the compiler to crash when using the snmpc (e)script. Also added the option --Werror for the SNMP MIB compiler (escript) frontend (to mimic erlc), which specifies whether warnings should be treated as errors. OTP-9447 [agent] Some very minor debugging improvements. OTP-9446 Merge branch 'bmk/snmp/snmp4211_integration' into dev
2011-09-23Merge branch 'dev' of super:otp into bmk/megaco/fix_version_and_notes/OTP-9550Micael Karlberg
2011-09-23Fixed version, release notes and appup in prep for release.Micael Karlberg
2011-09-23Merge branch 'dev' into majorLukas Larsson
* dev: Update ber_bin and ber_bin_v2 to return binaries
2011-09-23Merge branch 'lukas/asn1/fix_ber_other_testcase/OTP-9573' into devLukas Larsson
* lukas/asn1/fix_ber_other_testcase/OTP-9573: Update ber_bin and ber_bin_v2 to return binaries
2011-09-23Update ber_bin and ber_bin_v2 to return binariesLukas Larsson
2011-09-22Merge branch 'dev' into majorHenrik Nord
2011-09-22Merge branch 'hl/beam_disasm-no_attri_chunk' into devHenrik Nord
* hl/beam_disasm-no_attri_chunk: beam_disasm: Handle stripped BEAM files OTP-9571
2011-09-22ei: Add gcc link flags to port_call_SUITEBjörn-Egil Dahlberg
2011-09-22Merge branch 'dev' into majorLars Thorsen
* dev: Fix the formatting of function signatures in the pdf
2011-09-22Change static link test of ssl to dynamicBjörn-Egil Dahlberg
Only used for commercial builds
2011-09-22Fix the formatting of function signatures in the pdfLars Thorsen
2011-09-21Merge branch 'dev' into majorHenrik Nord
2011-09-21Merge branch 'ta/typer-quote-atoms' into devHenrik Nord
* ta/typer-quote-atoms: Update Dialyzer's reference results Quote atoms if necessary in types OTP-9560
2011-09-21Merge remote branch 'upstream/dev' into majorIngela Anderton Andin
* upstream/dev: Prepare for release
2011-09-21Prepare for releaseIngela Anderton Andin
Updates version and appup-file
2011-09-21beam_disasm: Handle stripped BEAM filesHaitao Li
beam_disasm:file/1 would crash if asked to disassemble a stripped BEAM file without an "Attr" chunk.
2011-09-21Merge branch 'dev' into majorDan Gudmundsson
2011-09-21Merge branch 'dgud/mnesia/leaking-log/OTP-9551' into devDan Gudmundsson
* dgud/mnesia/leaking-log/OTP-9551: [mnesia] Use api to log decisions.
2011-09-21Merge branch 'dgud/mnesia/cleartable-ded-api/OTP-9558' into devDan Gudmundsson
* dgud/mnesia/cleartable-ded-api/OTP-9558: [mnesia] Use dedicated api for clearing tables
2011-09-21Merge branch 'dgud/wx/virtual-listctrl/OTP-9415' into devDan Gudmundsson
* dgud/wx/virtual-listctrl/OTP-9415: Handle overloading callbacks the same as events Fix documentation and callback options in wxListCtrl:create/3 Add example and testcase Add wxListItemAttr Generated code of previous commit Add support for virtual listctrls Re-generated with new doxygen
2011-09-21Merge branch 'dev' into majorBjörn Gustavsson
* dev: erl_bif_types: Fix types for lists:key{search,find,member}/3 Fix build problems on MacOS 10.7 (Lion)
2011-09-21Merge branch 'bjorn/erl_bif_types/OTP-9496' into devBjörn Gustavsson
* bjorn/erl_bif_types/OTP-9496: erl_bif_types: Fix types for lists:key{search,find,member}/3
2011-09-21erl_bif_types: Fix types for lists:key{search,find,member}/3Björn Gustavsson
The types for lists:key{search,find,member}/3 was computed under the assumption that the key should be matched (=:=) to the keys in the list, while the actual implementation uses comparison (==). Thus erl_bif_types:types/4 would wrongly report that lists:keyfind(42, 1, [{42.0,a}]) would always return 'false'.
2011-09-20Add documentation for cth_log_redirect and built-in hooksLukas Larsson
OTP-9564
2011-09-20Correct wrong match from lists:keyfindLukas Larsson
2011-09-20Update cth_log_redirect to wait for all error_logger events before ending testLukas Larsson
2011-09-20Force logging to framework log for parallel testsLukas Larsson
When parallel tests are run all logs are redirected to use ct_logs:ct_log instead of ct_logs:tc_log.
2011-09-20Add ct_log:ct_log funcionLukas Larsson
This function is used to force logging to CT framework log instead of test case log.
2011-09-20Add a hook for redirecting SASL and error_logger messagesLukas Larsson
SASL and error_logger messaged can now be redirected to the common_test log using a hook which is bundled with common_test.
2011-09-20Add -enable_builtin_hooks <bool> config optionLukas Larsson
This option allows ct users to disable the default hooks which are installed when common_test is started. The builtin hooks themselved are listed in ct_hooks. OTP-9564
2011-09-20Export write_events and add option to return a stringLukas Larsson
2011-09-20Merge branch 'dev' into majorHenrik Nord
Conflicts: erts/aclocal.m4 erts/include/internal/ethread_header_config.h.in
2011-09-20Merge branch 'ac/fix-erl_interface-docs' into devHenrik Nord
* ac/fix-erl_interface-docs: Make comment reflect code in erl_interface/src/misc/ei_decode_term.c ei_decode_ei_term() returns 1 if index is incremented OTP-9559