aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-04-22Merge branch 'hb/hipe/opaque_bugfix/OTP-12666'Hans Bolinder
* hb/hipe/opaque_bugfix/OTP-12666: hipe: Fix a bug in the handling of opaque types
2015-04-22Merge branch 'ia/pr/678/OTP-1267'Ingela Anderton Andin
* ia/pr/678/OTP-1267: Revert "Add workaround for problems with s_client defaults" ssl: Add unit test case ssl: Ignore signature_algorithm (TLS 1.2 extension) sent to TLS 1.0/1 server
2015-04-22Revert "Add workaround for problems with s_client defaults"Ingela Anderton Andin
This reverts commit a3cf4eb4cdd2ce178d81b62faa9f47485fd82331. This workaround is no longer needed as the, TLS-1.2 extension, signature_algorithm is now correctly ignored by previous TLS versions.
2015-04-21Merge branch 'sverk/etp-map'Sverker Eriksson
* sverk/etp-map: erts: Add map support to gdb etp command erts: Add etp_the_non_value
2015-04-21hipe: Fix a bug in the handling of opaque typesHans Bolinder
An opaque type ?opaque(_) was put in a list where #opaque{} was expected.
2015-04-21Merge branch 'mikpe/configure-linux-spelling'Zandra Hird
* mikpe/configure-linux-spelling: erts/configure.in: handle more 'linux' spellings
2015-04-21Merge branch 'vinoski/minor-erlang-el-fixes'Zandra Hird
* vinoski/minor-erlang-el-fixes: Minor fixes to emacs erlang-mode
2015-04-21Merge branch 'zandra/fix-ssl-obsolete-arity'Zandra Hird
* zandra/fix-ssl-obsolete-arity: add arity to obsolete_1(ssl, negotiated_next_protocol, 1)
2015-04-21Merge branch 'egil/fix-halfword-cmp'Björn-Egil Dahlberg
* egil/fix-halfword-cmp: erts: Fix halfword compare
2015-04-21ssl: Add unit test caseIngela Anderton Andin
2015-04-20Merge branch 'wmalik/slave-specs'Björn Gustavsson
* wmalik/slave-specs: Remove unused comments Fix Host and Name type in slave.erl
2015-04-20zip: Suppress a dialyzer warning for an unmatched returnBjörn Gustavsson
A warning for an unmatched return was introduced in aaa7c917. The caller of openzip_close/1 ignores the return value, which could be an error tuple. In this situation, handling a fatal error, it is OK to ignore the return value; thus, we only need to make it explicit that we are ignoring the return value.
2015-04-20ssl: Ignore signature_algorithm (TLS 1.2 extension) sent to TLS 1.0/1 serverAndreas Schultz
pre TLS 1.2 server should ignore the signature_algorithms extension. The server code would attempt to select the signature/hash algorithm even when using TLS 1.0 or 1.1. Instead it should simply use the default algorithm on those versions.
2015-04-20erts/configure.in: handle more 'linux' spellingsMikael Pettersson
The configuration code which canonicalizes the operating system name into OPSYS requires Linux to be spelled 'linux' or 'Linux'. This is a problem in some build environments, e.g. RPM, which supply --build and --host using the longer 'linux-gnu' spelling. The effect is that OPSYS becomes 'noopsys' and some checks in erts/configure.in do not work as expected, e.g. the auto-enabling of HiPE may not happen. Fixed by matching on 'linux*' not just 'linux'. On ARM there are even longer variants such as 'linux-gnueabi' and 'linux-gnueabihf': these are also correctly mapped to 'linux' now.
2015-04-20Minor fixes to emacs erlang-modeSteve Vinoski
Fix "Unbalanced parentheses" error when indenting particular map constructs. Add new test cases for this fix. To prevent infinite looping when the programmer mistakenly enters incorrect syntax, detect cases where erlang-partial-parse fails to advance when called within a loop, and raise an "Illegal syntax" error.
2015-04-20erts: Fix halfword compareBjörn-Egil Dahlberg
2015-04-20Merge branch 'ia/public_key/bitstring/OTP-12110'Ingela Anderton Andin
* ia/public_key/bitstring/OTP-12110: ssl: Adjust to public_key application removing legacy compact_bit_string switch public_key: Update vsn for OTP 18 public_key: Reject bad signatures as early as possible public_key: Remove legacy switch compact_bit_string
2015-04-20ssl: Adjust to public_key application removing legacy compact_bit_string switchIngela Anderton Andin
2015-04-20public_key: Update vsn for OTP 18Ingela Anderton Andin
2015-04-20public_key: Reject bad signatures as early as possibleIngela Anderton Andin
Erlang bitstring type only uses as many bits as required, and does not use padding to create complete bytes as ASN1 compact_bitstring did. crypto:verify/5 will now fail, for some incorrect signatures as it expects complete bytes which an incorrect signature may not have. Instead of catching the failing crypto function and then returning false we check the input and reject it right away.
2015-04-20public_key: Remove legacy switch compact_bit_stringIngela Anderton Andin
* E.I bitstrings will not be decode as {Unused, Binary}, they are now Erlang bitstrings. * Also the compact_bit_string implies the legacy_erlang_types switch - So removing the switch will also make OCTET STRING values be represented as binaries. - Undecoded open type will now be wrapped in a asn1_OPENTYPE tuple. We need to handle this in pubkey_pbe.erl, maybe this can be eliminated later by updating/refreshing ASN1-specs. This will change some values in records returned by the public_key API making this change a potentiall incompatibility.
2015-04-17Merge branch 'egil/cmp-immediate-optimization/OTP-12663'Björn-Egil Dahlberg
* egil/cmp-immediate-optimization/OTP-12663: erts: Optimize comparison operator for frequent immediates
2015-04-17Merge branch 'egil/fix-icount'Björn-Egil Dahlberg
* egil/fix-icount: erts: Assume counting opcodes are correctly generated erts: Remove instruction_count command option
2015-04-17Merge branch 'ia/ssl/inet-dep'Ingela Anderton Andin
* ia/ssl/inet-dep: ssl: Add runtime depenency due to commit 4e0a5e36b38e3f15ed8f7d700d26f2424a47111c
2015-04-16erts: Assume counting opcodes are correctly generatedBjörn-Egil Dahlberg
* Assertion is only removed because we are in icount mode.
2015-04-16erts: Remove instruction_count command optionBjörn-Egil Dahlberg
* We use compile directive icount instead
2015-04-16Merge branch 'egil/fix-percept/OTP-12662'Björn-Egil Dahlberg
* egil/fix-percept/OTP-12662: percept: Fix http server config
2015-04-16Merge branch 'egil/maps-refactor'Björn-Egil Dahlberg
* egil/maps-refactor: erts: Use make_small for size terms on flat maps Conflicts: erts/emulator/beam/erl_bif_guard.c
2015-04-16Update primary bootstrapBjörn Gustavsson
2015-04-16Merge branch 'bjorn/maps'Björn Gustavsson
* bjorn/maps: Document the new {badmap,Term} and {badkey,Key} exceptions Raise more descriptive error messages for failed map operations erl_term.h: Add is_not_map() macro Tigthen code for the i_get_map_elements/3 instruction Pre-compute hash values for the general get_map_elements instruction Teach the loader to pre-compute the hash value for single-key lookups Optimize use of i_get_map_element/4 beam_emu: Slightly optimize update_map_{assoc,exact} v3_codegen: Don't sort map keys in map creation/update beam_validator: No longer require strict literal term order Sort maps keys in the loader De-optimize the has_map_fields instructions erts/map_SUITE.erl: Add a test case that tests has_map_fields Fully evaluate is_map/1 for literals at load-time map_SUITE: Add tests of is_map/1 with literal maps Run a clone of map_SUITE without optimizations Remove the fail label operand of the new_map instruction Correct transformation of put_map_assoc to new_map Remove support for put_map_exact without a source map
2015-04-16ssl: Add runtime depenency due to commit ↵Ingela Anderton Andin
4e0a5e36b38e3f15ed8f7d700d26f2424a47111c
2015-04-16Merge branch 'egil/refactor-message-queue-probes'Björn-Egil Dahlberg
* egil/refactor-message-queue-probes: erts: Refactor dtrace call probes erts: Refactor erts_queue_message
2015-04-15Merge branch 'sverk/nlmills-pr653/efile-union-pwritev/OTP-12653'Sverker Eriksson
* sverk/nlmills-pr653/efile-union-pwritev/OTP-12653: erts: Cleanup code in invoke_pwritev Use the correct union member inside efile_drv
2015-04-15Merge branch 'sverk/crypto/rm-EVP_CIPHER_CTX_new'Sverker Eriksson
* sverk/crypto/rm-EVP_CIPHER_CTX_new: crypto: Fix undefined symbol EVP_CIPHER_CTX_new
2015-04-15Merge branch 'ia/ssh/channel-gracefull-shutdown/OTP-12648'Ingela Anderton Andin
* ia/ssh/channel-gracefull-shutdown/OTP-12648: ssh: Shutdown sftp channel gracefully
2015-04-15erts: Optimize comparison operator for frequent immediatesBjörn-Egil Dahlberg
* small integers * atoms
2015-04-15Document the new {badmap,Term} and {badkey,Key} exceptionsBjörn Gustavsson
2015-04-15Raise more descriptive error messages for failed map operationsBjörn Gustavsson
According to EEP-43 for maps, a 'badmap' exception should be generated when an attempt is made to update non-map term such as: <<>>#{a=>42} That was not implemented in the OTP 17. José Valim suggested that we should take the opportunity to improve the errors coming from map operations: http://erlang.org/pipermail/erlang-questions/2015-February/083588.html This commit implement better errors from map operations similar to his suggestion. When a map update operation (Map#{...}) or a BIF that expects a map is given a non-map term, the exception will be: {badmap,Term} This kind of exception is similar to the {badfun,Term} exception from operations that expect a fun. When a map operation requires a key that is not present in a map, the following exception will be raised: {badkey,Key} José Valim suggested that the exception should be {badkey,Key,Map}. We decided not to do that because the map could potentially be huge and cause problems if the error propagated through links to other processes. For BIFs, it could be argued that the exceptions could be simply 'badmap' and 'badkey', because the bad map and bad key can be found in the argument list for the BIF in the stack backtrace. However, for the map update operation (Map#{...}), the bad map or bad key will not be included in the stack backtrace, so that information must be included in the exception reason itself. For consistency, the BIFs should raise the same exceptions as update operation. If more than one key is missing, it is undefined which of keys that will be reported in the {badkey,Key} exception.
2015-04-14erts: Add map support to gdb etp commandSverker Eriksson
2015-04-14erts: Use make_small for size terms on flat mapsBjörn-Egil Dahlberg
2015-04-14percept: Fix http server configBjörn-Egil Dahlberg
The module mod_include no longer exists.
2015-04-14Merge branch 'egil/fix-maps-module-exceptions/OTP-12657'Björn-Egil Dahlberg
* egil/fix-maps-module-exceptions/OTP-12657: stdlib: Correct maps module exceptions upon errors
2015-04-14Merge branch 'egil/fix-maps-match_spec-return/OTP-12656'Björn-Egil Dahlberg
* egil/fix-maps-match_spec-return/OTP-12656: erts: Fix building of Map result from match_specs
2015-04-14Merge branch 'peppe/common_test/report_error_if_missing_suite'Peter Andersson
* peppe/common_test/report_error_if_missing_suite: Fix problem with suite compilation failures not being correctly reported OTP-10816
2015-04-14erts: Refactor dtrace call probesBjörn-Egil Dahlberg
2015-04-14erts: Refactor erts_queue_messageBjörn-Egil Dahlberg
2015-04-14ssh: Shutdown sftp channel gracefullyIngela Anderton Andin
If ssh_connection:subsystem/4 fails we do not want to crash but rather terminate gracefully.
2015-04-14Merge branch 'ia/inets/remove-ssi/OTP-12156'Ingela Anderton Andin
* ia/inets/remove-ssi/OTP-12156: inets: Remove SSI (Server Side Includes)
2015-04-14Merge branch 'hb/stdlib/fix_orddict_doc/OTP-12651'Hans Bolinder
* hb/stdlib/fix_orddict_doc/OTP-12651: stdlib: Correct orddict(3)
2015-04-14stdlib: Correct orddict(3)Hans Bolinder
fold() and map() handle elements in a well-defined order. Thanks to Rabbe Fogelholm for pointing out the bug.