aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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' 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-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
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-20Fix build problems on MacOS 10.7 (Lion)Björn Gustavsson
On MacOS 10.7 (Lion) with Xcode 4.1 installed, the default C compiler is llvm-gcc-4.2. That compiler compiles beam_emu.c incorrectly, resulting in an emulator that will not start. The problem can be worked around by turning off all optimizations, but that will significantly degrade the performance of the run-time system. The problem can also be worked around manually like this: CC=gcc-4.2 ./configure To allow a working system to be built "out of the box", have the configure script set up the emulator Makefile so that gcc-4.2 will be used to compile beam_emu.c if the default compiler is llvm-based. All other C files will still be compiled with the default compiler.
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
2011-09-20Merge branch 'cr/cppcheck' into devHenrik Nord
* cr/cppcheck: Changes inspired by running cppcheck(1) OTP-9557
2011-09-20Merge branch 'pg/fix-hipe-bs_get_float2' into devHenrik Nord
* pg/fix-hipe-bs_get_float2: Fix bug with binary pattern matching of floats of variable size OTP-9556
2011-09-20Merge branch 'ta/docs-fixes' into devHenrik Nord
* ta/docs-fixes: Fix misspelling of intermediate Fix typos in erts/preloaded/src Fix more misspellings of compatibility Fix misspelling of kept Fix misspelling of compatibility in ssl_basic_SUITE Fix misspelling of compatibility Fix misspelling of accommodate Fix misspelling of exceed Fix misspelling of accidentally Fix misspelling of erroneous in xmerl_xsd Fix misspelling of erroneous Fix misspelling of successful Fix typos in instrument(3) Fix typos in dbg(3) dialyzer: fix a small typo in list_to_bitstring test Fix typos in cover.erl Fix typos (variable name) in erl_nif(3) Fix typos in mod_esi(3) Fix trivial typos in erlang(3) OTP-9555
2011-09-20Merge branch 'cr/md2-With-RSA-Encryption' into devHenrik Nord
* cr/md2-With-RSA-Encryption: Document crypto:sha_mac_96/2 to compute an SHA MAC, not MD5 Support md2WithRSAEncryption certificates in public_key Support 'md2' hash in crypto:rsa_sign/3 and crypto:rsa_verify/4 OTP-9554
2011-09-20Merge branch 'dj/xmerl_ucs-latin9-support' into devHenrik Nord
* dj/xmerl_ucs-latin9-support: Add latin9 (iso-8859-15) support in xmerl_ucs OTP-9552
2011-09-20Merge branch 'jw/release_handler_1' into devHenrik Nord
* jw/release_handler_1: General improvements to release_handler_1:get_supervised_procs Conflicts: lib/sasl/src/release_handler_1.erl lib/sasl/test/release_handler_SUITE.erl OTP-9546
2011-09-20Merge branch 'mp/xmerl-ucs2-fix' into devHenrik Nord
* mp/xmerl-ucs2-fix: Fixed xmerl_ucs UCS2 little endian en/decoding OTP-9548
2011-09-19Merge branch 'bmk/inets/httpd/windows_dir_traversal/OTP-OTP-9561' into ↵Micael Karlberg
bmk/inets/inets571_integration Conflicts: lib/inets/doc/src/notes.xml
2011-09-19Merge branch 'dev' of super:otp into bmk/inets/inets571_integrationMicael Karlberg
2011-09-19Fixed release notes, version and cosmetics in source.Micael Karlberg
2011-09-19Merge branch 'va/http-win-dir-traversal' into ↵Micael Karlberg
bmk/inets/httpd/windows_dir_traversal/OTP-OTP-9561
2011-09-19[mnesia] Use dedicated api for clearing tablesDan Gudmundsson
Mainly to correctly clear dets tables. It may also be faster to use the dedicated functions.
2011-09-19Update Dialyzer's reference resultsStavros Aronis
2011-09-19[mnesia] Use api to log decisions.Dan Gudmundsson
Instead of just appending decisions to the log, use mnesia_log:log(Decision), it will increment the counter which causes the log to be dumped even if no actual commits are stored on this node. This fixed a bug where the LATEST.log would grow forever on a node which had the schema on disc, but where not involved in any commits.
2011-09-19Merge branch 'dev' into majorAnders Svensson
2011-09-19Merge branch 'anders/diameter/unhandled_gen_sctp_events/OTP-9538' into devAnders Svensson
* anders/diameter/unhandled_gen_sctp_events/OTP-9538: Handle #sctp_paddr_change and #sctp_pdapi_event from gen_sctp.
2011-09-19Merge branch 'dev' into majorBjörn Gustavsson
* dev: tar_SUITE: Work around limited pathname length on Windows Merge the fourth bootstrap stage into the third bootstrap stage Remove unused lib/orber/include/Makefile Remove lib/orber/include/* from the primary bootstrap otp_build update_primary: Don't commit generated source files primary bootstrap: Remove source files Conflicts: Makefile.in bootstrap/bin/start.script bootstrap/bin/start_clean.script bootstrap/lib/compiler/ebin/compiler.app bootstrap/lib/compiler/egen/beam_opcodes.erl bootstrap/lib/compiler/egen/core_parse.erl bootstrap/lib/kernel/ebin/kernel.app bootstrap/lib/kernel/ebin/kernel.appup bootstrap/lib/orber/include/Makefile bootstrap/lib/orber/include/corba.hrl bootstrap/lib/orber/include/orber_pi.hrl bootstrap/lib/stdlib/ebin/stdlib.app bootstrap/lib/stdlib/ebin/stdlib.appup bootstrap/lib/stdlib/egen/erl_parse.erl
2011-09-19Merge branch 'bjorn/stdlib/fix-tar_SUITE' into devBjörn Gustavsson
* bjorn/stdlib/fix-tar_SUITE: tar_SUITE: Work around limited pathname length on Windows