aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-05-31Merge branch 'maint'Fredrik Gustafsson
2013-05-31Merge branch 'nox/fix-bs_put_string-renaming/OTP-11129' into maintFredrik Gustafsson
* nox/fix-bs_put_string-renaming/OTP-11129: Bootstrap Fix renaming of bs_put_string instructions
2013-05-31Merge branch 'maint'Lukas Larsson
* maint: Replace gc stat lock with sched spec data Conflicts: erts/preloaded/ebin/erlang.beam
2013-05-31Merge branch 'lukas/erts/gc_stat_contention/OTP-10271' into maintLukas Larsson
* lukas/erts/gc_stat_contention/OTP-10271: Replace gc stat lock with sched spec data
2013-05-31Replace gc stat lock with sched spec dataLukas Larsson
2013-05-30BootstrapFredrik Gustafsson
2013-05-30Merge branch 'maint'Fredrik Gustafsson
2013-05-30Merge branch 'sla/odbc_in_non_standard_location/OTP-11126' into maintFredrik Gustafsson
* sla/odbc_in_non_standard_location/OTP-11126: Fix checking for odbc in standard locations when "with-odbc" flag present.
2013-05-30Merge branch 'maint'Fredrik Gustafsson
2013-05-30Merge branch 'kla/armv6l-for-hipe-fixed/OTP-11125' into maintFredrik Gustafsson
* kla/armv6l-for-hipe-fixed/OTP-11125: add support for hipe on Raspberry Pi (armv6l)
2013-05-30Merge branch 'maint'Rickard Green
* maint: Introduce a better id allocation algorithm for PTabs
2013-05-30Merge branch 'rickard/ptab-id-alloc/OTP-11077' into maintRickard Green
* rickard/ptab-id-alloc/OTP-11077: Introduce a better id allocation algorithm for PTabs
2013-05-29Merge branch 'maint'Anders Svensson
2013-05-29Merge branch 'anders/diameter/watchdog_function_clause/OTP-11115' into maintAnders Svensson
* anders/diameter/watchdog_function_clause/OTP-11115: Fix watchdog function_clause
2013-05-29Merge branch 'maint'Anders Svensson
2013-05-29Merge branch 'anders/diameter/missed_5001/OTP-11087' into maintAnders Svensson
* anders/diameter/missed_5001/OTP-11087: Remove redundant integer type specifiers from binaries Fix recognition of 5001 on mandatory AVP's
2013-05-29Merge branch 'anders/diameter/avp_decode/OTP-11007' into maintAnders Svensson
* anders/diameter/avp_decode/OTP-11007: Detect all 5005 (MISSING_AVP) errors and don't reverse errors Adapt Failed-AVP setting to RFC 6733 Add spec to diameter_codec Add spec to diameter_gen Fix recognition of 5014 (INVALID_AVP_LENGTH) errors Ensure setting Failed-AVP is appropriate Correct AVP Length error testcases
2013-05-29Merge branch 'anders/diameter/avp_length_failure/OTP-11026' into maintAnders Svensson
* anders/diameter/avp_length_failure/OTP-11026: Fix decode failure when AVP Length < 8
2013-05-29Merge branch 'maint'Fredrik Gustafsson
2013-05-29Merge branch 'md/httpc-stream-once-fix/OTP-11122' into maintFredrik Gustafsson
* md/httpc-stream-once-fix/OTP-11122: Remove http_chunk:decode/4 as it is no longer used Fix {stream, {self, once}} in httpc
2013-05-29Remove redundant integer type specifiers from binariesAnders Svensson
2013-05-29Fix recognition of 5001 on mandatory AVP'sAnders Svensson
An AVP setting the M-bit was not regarded as erroneous if it was defined in the dictionary in question and its container (message or Grouped AVP) had an 'AVP' field. It's now regarded as a 5001 error (AVP_UNSUPPORTED), as in the case that the AVP is not defined.
2013-05-29Merge branch 'bjorn/stdlib/improve-ls/OTP-11108' into maintBjörn Gustavsson
* bjorn/stdlib/improve-ls/OTP-11108: Teach c:ls/1 to show non-directory files
2013-05-29Merge branch 'maint'Anders Svensson
2013-05-29Merge branch 'anders/diameter/timetraps/OTP-10914' into maintAnders Svensson
* anders/diameter/timetraps/OTP-10914: Add examples testcase to help identify timetrap failures Minor traffic suite fix Add gen_tcp suite Lighten up on suite timetraps Add more information to traffic suite timeout failures
2013-05-28Merge branch 'maint'Fredrik Gustafsson
2013-05-28Merge branch 'nox/fix-ignore/OTP-11117' into maintFredrik Gustafsson
* nox/fix-ignore/OTP-11117: Properly ignore os_mon and otp_mibs generated includes
2013-05-28Updated primary bootstrapFredrik Gustafsson
2013-05-28Merge branch 'avi/fix-os-cmd-win/OTP-11104' into maintFredrik Gustafsson
* avi/fix-os-cmd-win/OTP-11104: Add testcase to exported Added primary bootstrap for os.beam kernel: redefined deep_list_command test Remove unnecessary whitespaces in os.erl and os_SUITE.erl Fix deep list argument error under Windows in os:cmd/1
2013-05-28Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
Conflicts: bootstrap/lib/stdlib/ebin/beam_lib.beam lib/public_key/test/erl_make_certs.erl
2013-05-28Fix renaming of bs_put_string instructionsAnthony Ramine
The clause was formerly commented-out because at this point in the code, no bs_put_string instruction has been generated yet when compiling from Erlang. If an Erlang module is compiled to BEAM assembly and the result contains a bs_put_string instruction, the output can't be compiled to binary anymore and the compiler crashes with the following error: $ erlc prs.S Function: compress/1 prs.S:none: internal error in beam_block; crash reason: {{case_clause, {'EXIT', {function_clause, [{beam_utils,live_opt, [[{bs_put_string,1,{string,[0]}}, {bs_init, {f,0}, {bs_append,0,8,{field_flags,[]}}, 0, [{integer,8},{x,0}], {x,1}}, {label,2}], 2, {1,{1,1,nil,nil}}, [{block, [{'%live',2}, {set,[{x,0}],[{x,1}],move}, {'%live',1}]}, return]], [{file,"beam_utils.erl"},{line,639}]}, {beam_utils,live_opt,1, [{file,"beam_utils.erl"},{line,205}]}, {beam_block,function,2, [{file,"beam_block.erl"},{line,38}]}, {lists,mapfoldl,3, [{file,"lists.erl"},{line,1329}]}, {beam_block,module,2, [{file,"beam_block.erl"},{line,29}]}, {compile,'-select_passes/2-anonymous-2-',2, [{file,"compile.erl"},{line,476}]}, {compile,'-internal_comp/4-anonymous-1-',2, [{file,"compile.erl"},{line,276}]}, {compile,fold_comp,3, [{file,"compile.erl"},{line,294}]}]}}}, [{compile,'-select_passes/2-anonymous-2-',2, [{file,"compile.erl"},{line,476}]}, {compile,'-internal_comp/4-anonymous-1-',2, [{file,"compile.erl"},{line,276}]}, {compile,fold_comp,3,[{file,"compile.erl"},{line,294}]}, {compile,internal_comp,4,[{file,"compile.erl"},{line,278}]}, {compile,'-do_compile/2-anonymous-0-',2, [{file,"compile.erl"},{line,152}]}]}
2013-05-28Merge branch 'ia/ssl/public_key/crypto/elliptic_curve/OTP-11009' into maintIngela Anderton Andin
* ia/ssl/public_key/crypto/elliptic_curve/OTP-11009: (21 commits) ssl: Do not advertise EC ciphers if crypto support is insufficient crypto: Ctify tests and test new API crypto: Allow integer as srp_private arguments according to docs ssl: Remove unused `srp_parameters` type spec crypto, public_key & ssl: Make more functions accept integer keys snmp: Remove use of deprecated crypto functions crypto,ssh, netconf, inets: binary_to_integer -> bytes_to_integer netconf: Remove use of deprecated crypto functions crypto: Documentation fixes from review crypto: Change argument order of crypto:next_iv/3 crypto,public_key,ssl: Change return value of crypto:generate_key(ecdh,..) ssl, public_key, crypto: crypto:algorithms/0 -> crypto:supports/0 ssl, public_key & inets: Remove use of deprecated crypto functions from test code ssl: Remove use of deprecated crypto functions public_key: Remove use of deprecated crypto functions dialyzer: Remove use of deprecated crypto functions ssh & crypto: Remove use of deprecated crypto functions from ssh Update primary bootstrap common_test: Replace use of deprecated crypto functions beam_lib, compile: Replace use of deprecated crypto functions ...
2013-05-28ssl: Do not advertise EC ciphers if crypto support is insufficientIngela Anderton Andin
2013-05-28add support for hipe on Raspberry Pi (armv6l)Klaus Alfert
To enable hipe on a Raspberry Pi, configure has to detect the ARM processor correctly. On a Pi, uname detects the CPU as armv6l. Other CPU variants are already detected with ARCH=arm, so does now the armv6l of the Raspberry Pi.
2013-05-27Fix watchdog function_clauseAnders Svensson
Commit 0b7c87dc caused diameter_watchdog:restart/2 to start returning 'stop', so that a watchdog process for a listening transport that allowed multiple connections to the same peer would die one watchdog timeout after losing a connection. The new return value was supposed to be passed up to transition/2, but was instead passed to set_watchdog/1, resulting in a function_clause error. The resulting crash was harmless but unseemly. Not detected by dialyzer. Thanks to Aleksander Nycz.
2013-05-27crypto: Ctify tests and test new APIIngela Anderton Andin
Also fix bugs found by new tests
2013-05-27Merge branch 'maint'Raimo Niskanen
Conflicts: erts/preloaded/ebin/prim_inet.beam
2013-05-27Merge branch 'raimo/race-in-prim_inet-close/OTP-10497' into maintRaimo Niskanen
* raimo/race-in-prim_inet-close/OTP-10497: Do not unlink before closing port
2013-05-27Merge branch 'maint'Siri Hansen
2013-05-27Merge branch 'siri/ct_telnet/no-more-after-timetrap/OTP-10648' into maintSiri Hansen
* siri/ct_telnet/no-more-after-timetrap/OTP-10648: [common_test] Unregister connection if killed
2013-05-24crypto: Allow integer as srp_private arguments according to docsSverker Eriksson
2013-05-24ssl: Remove unused `srp_parameters` type specKlaus Trainer
As the file 'lib/ssl/src/ssl_srp_primes.hrl' only contains a specification of a `srp_parameters` type that isn't exported and also isn't referenced anywhere (neither in the code nor in the documentation), the type specification (and hence the file as well) can be removed.
2013-05-24crypto, public_key & ssl: Make more functions accept integer keysSverker Eriksson
2013-05-24snmp: Remove use of deprecated crypto functionsIngela Anderton Andin
2013-05-24[common_test] Unregister connection if killedSiri Hansen
The symptom of this bug was that a (named) telnet connection which was open and hanging during a timetrap timeout could no longer be opened again in subsequent test cases. Since the connection was hanging, ct_telnet:close/1 which was called during end_per_testcase would fail (timeout) and cause common_test to brutally kill the connection. The bug was that the connection was not unregistered at this point. When trying to open the connection again in the next testcase, common_test attempted to reuse the same connection since it had not been unregistered. This failed since the connection in fact was dead.
2013-05-24Merge branch 'maint'Fredrik Gustafsson
2013-05-24Merge branch 'nox/fix-silent-rules/OTP-11111' into maintFredrik Gustafsson
* nox/fix-silent-rules/OTP-11111: Fix some Makefile rules that didn't support silent rules
2013-05-24Do not unlink before closing portRaimo Niskanen
2013-05-23Properly ignore os_mon and otp_mibs generated includesAnthony Ramine
2013-05-22Merge branch 'maint'Sverker Eriksson