aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-09-27Merge branch 'dev' into majorBjörn Gustavsson
* dev: Update preloaded modules erl_prim_loader: Eliminate dialyzer warning Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
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-26Update preloaded modulesBjörn Gustavsson
2011-09-26erl_prim_loader: Eliminate dialyzer warningBjörn Gustavsson
The concat/1 function is now only used to append lists when constructing filenames. Thus it is too general and the first clause (that handles characters) will never be used. We could just remove the clause that is never used, but then the name 'concat' would be misleading and someone could use misuse it. Therefore, replace concat/1 with the join/2 function that can only be used for joining filename components.
2011-09-26Merge branch 'dev' into majorLars Thorsen
* dev: [xmerl] Fix streaming bug in xmerl_scan (Thanks to Simon Cornish)
2011-09-26Merge branch 'major' of super:otp into majorMicael Karlberg
2011-09-26Merge branch 'lars/xmerl/continuation-error/OTP-9457' into devLars Thorsen
* lars/xmerl/continuation-error/OTP-9457: [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-26Merge branch 'lars/erl_docgen/fix-eix-files-for-specs/OTP-9562' into devLars Thorsen
* lars/erl_docgen/fix-eix-files-for-specs/OTP-9562: [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-26Merge branch 'lars/erl_docgen/pdf-menu/OTP-9576' into devLars Thorsen
* lars/erl_docgen/pdf-menu/OTP-9576: [erl_docgen] Missing header level in PDF bookmarks menu
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-24Merge branch 'rickard/aux-work-bug/OTP-9567' into devRickard Green
* rickard/aux-work-bug/OTP-9567: Fix lost wakeup of scheduler when enqueuing auxiliary work
2011-09-23Merge branch 'dev' into majorMicael Karlberg
2011-09-23Merge branch 'bmk/megaco/fix_version_and_notes/OTP-9550' into devMicael 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-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-22Merge branch 'lars/erl_docgen/fix-pdf-func-signatures/OTP-9563' into devLars Thorsen
* lars/erl_docgen/fix-pdf-func-signatures/OTP-9563: 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-22Fix lost wakeup of scheduler when enqueuing auxiliary workRickard Green
When auxiliary work was enqueued on a scheduler, the wakeup of the scheduler in order to handle this work could be lost. Wakeups in order to handle ordinary work were not effected by this bug. The bug only effected runtime systems with SMP support as follows: * Deallocation of some ETS data structures could be delayed. * On Linux systems not using the NPTL thread library (typically ancient systems with kernel versions prior to 2.6) and Windows systems, the {Port, {exit_status, Status}} message from a terminating port program could be delayed. That is, it only effected port programs which had been started by passing exit_status as an option to open_port/2.
2011-09-21Remove static ssl linking in crypto for otp_buildBjörn-Egil Dahlberg
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-21Merge branch 'ia/public_key/prepare-for-release' into devIngela Anderton Andin
* ia/public_key/prepare-for-release: 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/erts/support-macosx-lion/OTP-9547' into devBjörn Gustavsson
* bjorn/erts/support-macosx-lion/OTP-9547: 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